buildGoPackage: use Go 1.6 by default

11 files changed, 15 insertions, 25 deletions

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 803bf1e95cce..1ce86cac5c5f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "terraform-${version}";
   version = "0.6.15";
   rev = "v${version}";
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 3de4133e7945..83e5f2bd3289 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     mkdir -p src/github.com/syncthing
     ln -s $(pwd) src/github.com/syncthing/syncthing
     export GOPATH=$(pwd)
-    # Required for Go 1.5, can be removed for Go 1.6+
-    export GO15VENDOREXPERIMENT=1
 
     # Syncthing's build.go script expects this working directory
     cd src/github.com/syncthing/syncthing
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 8378f9eabf4f..c3d9104018df 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "glide-${version}";
   version = "0.10.2";
   rev = "${version}";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 774e57fc8911..68ce9440f4f4 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "caddy-${version}";
   version = "0.8.3";
   rev = "e2234497b79603388b58ba226abb157aa4aaf065";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 7dfd8b2a32ed..5254aa8e94b4 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, consul-ui, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "consul-${version}";
   version = "0.6.4";
   rev = "v${version}";
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}
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 5aeefa980185..1197c840fc9a 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "vault-${version}";
   version = "0.5.2";
   rev = "v${version}";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 9e4e220d052c..772c7e6d34b3 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "consul-template-${version}";
   version = "0.14.0";
   rev = "v${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9545ce0eb85b..51f4ada13743 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9607,7 +9607,7 @@ in
     go = go_1_6;
   };
 
-  buildGoPackage = buildGo15Package;
+  buildGoPackage = buildGo16Package;
 
   go2nix = callPackage ../development/tools/go2nix { };