diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-07 22:32:34 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 13:08:10 +0200 |
| commit | 8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0 (patch) | |
| tree | 1b5f2140cbb94af6831dad149865578482810ffd /pkgs/servers/monitoring | |
| parent | 734d15297721cf241df361d4a98be58c13fc75af (diff) | |
| download | nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.tar nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.tar.gz nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.tar.bz2 nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.tar.lz nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.tar.xz nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.tar.zst nixlib-8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0.zip | |
buildGoPackage: use Go 1.6 by default
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/consul-alerts/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 01848e93b257..ad840dfd607f 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, buildGo16Package, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: -buildGo16Package rec { +buildGoPackage rec { name = "consul-alerts-${version}"; version = "0.3.3"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index fc204fc3f152..330a528ef2f5 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -17,10 +17,6 @@ buildGoPackage rec { # Tests exist, but seem to clash with the firewall. doCheck = false; - preBuild = '' - export GO15VENDOREXPERIMENT=1 - ''; - buildFlagsArray = let t = "${goPackagePath}/version"; in '' -ldflags= -X ${t}.Version=${version} diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 1345914c4f5f..1fbcd50d733e 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { docheck = true; - preBuild = '' - export GO15VENDOREXPERIMENT=1 - ''; - buildFlagsArray = let t = "${goPackagePath}/version"; in '' -ldflags= -X ${t}.Version=${version} |