git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #133071 from qowoz/go-tags
commit6d84ed4252003f4efb3f16105fb2b80bb27e9e4d authorSandro <sandro.jaeckel@gmail.com> dateSun 8 Aug 2021, 04:46 (5 years ago) parent7c46d3db2fe475
4 files changed+12−18
pkgs/applications/version-management/gogs/default.nix+1−3 pkgs/development/tools/continuous-integration/drone/default.nix+1−3 pkgs/servers/monitoring/prometheus/default.nix+9−11 pkgs/servers/monitoring/prometheus/postfix-exporter.nix+1−1
pkgs/applications/version-management/gogs/default.nix+1−3
@@ -29,9 +29,7 @@ buildGoModule rec {
2929
3030 buildInputs = optional pamSupport pam;
3131
32− buildFlags = [ "-tags" ];
33−
34− buildFlagsArray =
32+ tags =
3533 ( optional sqliteSupport "sqlite"
3634 ++ optional pamSupport "pam");
3735
pkgs/development/tools/continuous-integration/drone/default.nix+1−3
@@ -16,9 +16,7 @@ buildGoModule rec {
1616 sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI=";
1717 };
1818
19− preBuild = ''
20− buildFlagsArray+=( "-tags" "${lib.optionalString (!enableUnfree) "oss nolimit"}" )
21− '';
19+ tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ];
2220
2321 meta = with lib; {
2422 maintainers = with maintainers; [ elohmeier vdemeester ];
pkgs/servers/monitoring/prometheus/default.nix+9−11
@@ -47,21 +47,19 @@ buildGoModule rec {
4747 ln -s ${webui} web/ui/static/react
4848 '';
4949
50− buildFlags = "-tags=builtinassets";
51− buildFlagsArray =
50+ tags = [ "builtinassets" ];
51+
52+ ldflags =
5253 let
5354 t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
5455 in
5556 [
56− ''
57− -ldflags=
58− -X ${t}.Version=${version}
59− -X ${t}.Revision=unknown
60− -X ${t}.Branch=unknown
61− -X ${t}.BuildUser=nix@nixpkgs
62− -X ${t}.BuildDate=unknown
63− -X ${t}.GoVersion=${lib.getVersion go}
64− ''
57+ "-X ${t}.Version=${version}"
58+ "-X ${t}.Revision=unknown"
59+ "-X ${t}.Branch=unknown"
60+ "-X ${t}.BuildUser=nix@nixpkgs"
61+ "-X ${t}.BuildDate=unknown"
62+ "-X ${t}.GoVersion=${lib.getVersion go}"
6563 ];
6664
6765 # only run this in the real build, not during the vendor build
pkgs/servers/monitoring/prometheus/postfix-exporter.nix+1−1
@@ -18,7 +18,7 @@ buildGoPackage rec {
1818
1919 nativeBuildInputs = optional withSystemdSupport makeWrapper;
2020 buildInputs = optional withSystemdSupport systemd;
21− buildFlags = optional (!withSystemdSupport) "-tags nosystemd";
21+ tags = optional (!withSystemdSupport) "nosystemd";
2222
2323 goDeps = ./postfix-exporter-deps.nix;
2424 extraSrcs = optionals withSystemdSupport [