diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-29 01:48:55 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-29 01:48:55 +0000 |
| commit | f81b2da3d4f0ece6fc33d8d2ec0eda87437202df (patch) | |
| tree | dd744fe6013c02d1afa133a5f18cbd905dfc780c /pkgs/development | |
| parent | 06d63f6652863e492838f8f2aed8c380e559a4ee (diff) | |
| download | nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.tar nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.tar.gz nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.tar.bz2 nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.tar.lz nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.tar.xz nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.tar.zst nixpkgs-f81b2da3d4f0ece6fc33d8d2ec0eda87437202df.zip | |
go_1_4: rename to go_bootstrap and remove refs
This has cgo disabled, so only use this for bootstrapping.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/go/1.6.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.7.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index bbf2a946ece..38b114d8d07 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand +{ stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand , perl, which, pkgconfig, patch, fetchpatch , pcre , Security, Foundation, bash }: @@ -6,7 +6,7 @@ let goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${go_1_4}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - disallowedReferences = [ go_1_4 ]; + disallowedReferences = [ go_bootstrap ]; meta = with stdenv.lib; { branch = "1.6"; diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 89f56a2438c..bc298924eb8 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_1_4, runCommand +{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand , perl, which, pkgconfig, patch, fetchpatch , pcre , Security, Foundation, bash }: @@ -6,7 +6,7 @@ let goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${go_1_4}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - disallowedReferences = [ go_1_4 ]; + disallowedReferences = [ go_bootstrap ]; meta = with stdenv.lib; { branch = "1.7"; |