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

go_1_4: rename to go_bootstrap and remove refs

Browse Source 
This has cgo disabled, so only use this for bootstrapping.
This commit is contained in:
Robin Gloster 2016-08-29 01:48:55 +00:00
parent 06d63f6652
commit f81b2da3d4
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/go/1.6.nix
View File

@ -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 , perl, which, pkgconfig, patch, fetchpatch
, pcre , pcre
, Security, Foundation, bash }: , Security, Foundation, bash }:
@ -6,7 +6,7 @@
let let
goBootstrap = runCommand "go-bootstrap" {} '' goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out mkdir $out
cp -rf ${go_1_4}/* $out/ cp -rf ${go_bootstrap}/* $out/
chmod -R u+w $out chmod -R u+w $out
find $out -name "*.c" -delete find $out -name "*.c" -delete
cp -rf $out/bin/* $out/share/go/bin/ cp -rf $out/bin/* $out/share/go/bin/
@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
disallowedReferences = [ go_1_4 ]; disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
branch = "1.6"; branch = "1.6";

6
pkgs/development/compilers/go/1.7.nix
View File

@ -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 , perl, which, pkgconfig, patch, fetchpatch
, pcre , pcre
, Security, Foundation, bash }: , Security, Foundation, bash }:
@ -6,7 +6,7 @@
let let
goBootstrap = runCommand "go-bootstrap" {} '' goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out mkdir $out
cp -rf ${go_1_4}/* $out/ cp -rf ${go_bootstrap}/* $out/
chmod -R u+w $out chmod -R u+w $out
find $out -name "*.c" -delete find $out -name "*.c" -delete
cp -rf $out/bin/* $out/share/go/bin/ cp -rf $out/bin/* $out/share/go/bin/
@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
disallowedReferences = [ go_1_4 ]; disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
branch = "1.7"; branch = "1.7";

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

@ -4725,7 +4725,7 @@ in
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
go_1_4 = callPackage ../development/compilers/go/1.4.nix { go_bootstrap = callPackage ../development/compilers/go/1.4.nix {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
@ -9970,10 +9970,6 @@ in
### DEVELOPMENT / GO MODULES ### DEVELOPMENT / GO MODULES
buildGo14Package = callPackage ../development/go-modules/generic {
go = go_1_4;
};
buildGo16Package = callPackage ../development/go-modules/generic { buildGo16Package = callPackage ../development/go-modules/generic {
go = go_1_6; go = go_1_6;
}; };