From 60ca07fadc10e10bd382668717c9a2a5964450f2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:11:16 +1000 Subject: [PATCH 1/4] gogs: buildFlags{,Array} -> tags --- pkgs/applications/version-management/gogs/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index c0b0021f8cb..f7b7305b109 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -29,9 +29,7 @@ buildGoModule rec { buildInputs = optional pamSupport pam; - buildFlags = [ "-tags" ]; - - buildFlagsArray = + tags = ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); From 7b2efac5ac983c369adce1258c9807165c7ad18d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:11:16 +1000 Subject: [PATCH 2/4] drone: buildFlagsArray -> tags --- .../tools/continuous-integration/drone/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 46ee41d37df..0f36f8dc027 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -16,9 +16,7 @@ buildGoModule rec { sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI="; }; - preBuild = '' - buildFlagsArray+=( "-tags" "${lib.optionalString (!enableUnfree) "oss nolimit"}" ) - ''; + tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; meta = with lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; From 4db0983ae49122e31b6eb8387154e397b4269d12 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:11:16 +1000 Subject: [PATCH 3/4] prometheus: buildFlags{,Array} -> ldflags, tags --- .../servers/monitoring/prometheus/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index f4ad8a8e7b9..19136a39778 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -47,21 +47,19 @@ buildGoModule rec { ln -s ${webui} web/ui/static/react ''; - buildFlags = "-tags=builtinassets"; - buildFlagsArray = + tags = [ "builtinassets" ]; + + ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ - '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - '' + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" ]; # only run this in the real build, not during the vendor build From b2fe4752a4e074a336512356ccc726528c9dac91 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:11:16 +1000 Subject: [PATCH 4/4] prometheus-postfix-exporter: buildFlags -> tags --- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index a24edd2fbb0..8f71c0123dc 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = optional withSystemdSupport makeWrapper; buildInputs = optional withSystemdSupport systemd; - buildFlags = optional (!withSystemdSupport) "-tags nosystemd"; + tags = optional (!withSystemdSupport) "nosystemd"; goDeps = ./postfix-exporter-deps.nix; extraSrcs = optionals withSystemdSupport [