buildGoModule: warn if buildFlagsArray is used

launchpad/nixpkgs/master
zowoq 3 years ago
parent 13ea123c74
commit 3360a376cb
  1. 4
      pkgs/applications/networking/cluster/popeye/default.nix
  2. 4
      pkgs/applications/networking/cluster/qbec/default.nix
  3. 4
      pkgs/applications/networking/cluster/velero/default.nix
  4. 7
      pkgs/development/go-modules/generic/default.nix
  5. 4
      pkgs/servers/monitoring/prometheus/redis-exporter.nix

@ -11,11 +11,11 @@ buildGoModule rec {
sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c=";
};
ldflags = ''
ldflags = [
"-s" "-w"
"-X github.com/derailed/popeye/cmd.version=${version}"
"-X github.com/derailed/popeye/cmd.commit=${version}"
'';
];
vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";

@ -15,12 +15,12 @@ buildGoModule rec {
doCheck = false;
ldflags = ''
ldflags = [
"-s" "-w"
"-X github.com/splunk/qbec/internal/commands.version=${version}"
"-X github.com/splunk/qbec/internal/commands.commit=${src.rev}"
"-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}"
'';
];
meta = with lib; {
description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";

@ -14,12 +14,12 @@ buildGoModule rec {
sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk=";
};
ldflags = ''
ldflags = [
"-s" "-w"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
'';
];
vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU=";

@ -46,8 +46,9 @@
# Not needed with buildGoModule
, goPackagePath ? ""
# needed for buildFlags warning
# needed for buildFlags{,Array} warning
, buildFlags ? ""
, buildFlagsArray ? ""
, ... }@args':
@ -271,6 +272,6 @@ let
};
});
in
lib.warnIf (buildFlags != "")
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
package

@ -13,11 +13,11 @@ buildGoModule rec {
vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga";
ldflags = ''
ldflags = [
"-X main.BuildVersion=${version}"
"-X main.BuildCommitSha=unknown"
"-X main.BuildDate=unknown"
'';
];
# needs a redis server
doCheck = false;

Loading…
Cancel
Save