diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-08-26 13:31:57 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-08-26 15:43:28 +1000 |
commit | e6494966dd6a8dcd6d4cb5663f093a57bcc2593e (patch) | |
tree | 118b30b346e74d9480a58d316f0817a42367350f /pkgs/servers | |
parent | e3cdd952fdcbf2ff6181fd32d69d32a2ccb1daef (diff) | |
download | nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.gz nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.bz2 nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.lz nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.xz nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.zst nixlib-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.zip |
treewide: buildFlagsArray -> ldflags
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/cayley/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/gotify/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/mailhog/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/mattermost/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/alertmanager.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/openldap-exporter.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/pushgateway.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/tegola/default.nix | 2 |
9 files changed, 33 insertions, 38 deletions
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index c9d06d497714..13bf9326c22b 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -15,10 +15,9 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ''; + ldflags = [ + "-X=main.Version=${version}" + ]; meta = { homepage = "https://cayley.io/"; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index d0a3d9c10a20..8f3739b4ebfb 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -45,8 +45,8 @@ buildGoModule rec { # produce binaries which panic when executed and are not interesting at all subPackages = [ "." ]; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Mode=prod" + ldflags = [ + "-X main.Version=${version}" "-X main.Mode=prod" ]; meta = with lib; { diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 0032c4a630e9..d4c358ec47f5 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Web and API based SMTP testing"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 6a7ba06df885..14996cecc659 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -16,10 +16,9 @@ let goPackagePath = "github.com/mattermost/mattermost-server"; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version} - ''; + ldflags = [ + "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}" + ]; }; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index bc3cf7539ece..251c977bd4df 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -14,15 +14,14 @@ buildGoPackage rec { sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; }; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=${src.rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - ''; + ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${src.rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 65206256194a..8b39915193ef 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -6,8 +6,8 @@ buildGoPackage rec { goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; - buildFlagsArray = [ - "-ldflags=" "-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index a439c84bca9b..84cb7a62f243 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -11,12 +11,11 @@ buildGoPackage rec { sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/tomcz/openldap_exporter.tag=v${version} - -X github.com/tomcz/openldap_exporter.commit=unknown - ''; + ldflags = [ + "-s" "-w" + "-X github.com/tomcz/openldap_exporter.tag=v${version}" + "-X github.com/tomcz/openldap_exporter.commit=unknown" + ]; goPackagePath = "github.com/tomcz/openldap_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0bdb0680ae9d..f14ceec44e21 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -17,15 +17,14 @@ buildGoPackage rec { buildUser = "nix@nixpkgs"; buildDate = "19700101-00:00:00"; - buildFlagsArray = '' - -ldflags= - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} - -X main.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}" + "-X main.goVersion=${lib.getVersion go}" + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 5e3aa2d0ef67..d94f97baf865 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ="; }; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; excludedPackages = [ "example" ]; |