colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildGoPackage: use Go 1.6 by default

Browse Source
This commit is contained in:
Kamil Chmielewski 2016-06-07 22:32:34 +02:00
parent 734d152977
commit 8cd1d4cda5
11 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -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}";

2
pkgs/applications/networking/syncthing/default.nix
View File

@ -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

4
pkgs/development/tools/glide/default.nix
View File

@ -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}";

4
pkgs/servers/caddy/default.nix
View File

@ -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";

4
pkgs/servers/consul/default.nix
View File

@ -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}";

4
pkgs/servers/monitoring/consul-alerts/default.nix
View File

@ -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}";

4
pkgs/servers/monitoring/prometheus/alertmanager.nix
View File

@ -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}

4
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -16,10 +16,6 @@ buildGoPackage rec {
docheck = true;
preBuild = ''
export GO15VENDOREXPERIMENT=1
'';
buildFlagsArray = let t = "${goPackagePath}/version"; in ''
-ldflags=
-X ${t}.Version=${version}

4
pkgs/tools/security/vault/default.nix
View File

@ -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}";

4
pkgs/tools/system/consul-template/default.nix
View File

@ -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}";

2
pkgs/top-level/all-packages.nix
View File

@ -9607,7 +9607,7 @@ in
go = go_1_6;
};
buildGoPackage = buildGo15Package;
buildGoPackage = buildGo16Package;
go2nix = callPackage ../development/tools/go2nix { };