BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

go_bootstrap: remove top-level attribute (#113113)

Browse source 
this package should only be used internally for go_*
This commit is contained in:
zowoq 2021-02-16 04:06:35 +10:00 committed by GitHub
parent 274109a8d6
commit d9be3c767c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/compilers/go/1.14.nix
View file

@ -4,15 +4,20 @@
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
, callPackage
}: }:
let let
inherit (lib) optionals optionalString; inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
goBootstrap = runCommand "go-bootstrap" {} '' goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out mkdir $out
cp -rf ${buildPackages.go_bootstrap}/* $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/

7
pkgs/development/compilers/go/1.15.nix
View file

@ -4,15 +4,20 @@
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
, callPackage
}: }:
let let
inherit (lib) optionals optionalString; inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
goBootstrap = runCommand "go-bootstrap" {} '' goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out mkdir $out
cp -rf ${buildPackages.go_bootstrap}/* $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/

7
pkgs/development/compilers/go/2-dev.nix
View file

@ -4,15 +4,20 @@
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
, callPackage
}: }:
let let
inherit (lib) optionals optionalString; inherit (lib) optionals optionalString;
go_bootstrap = callPackage ./bootstrap.nix {
inherit Security;
};
goBootstrap = runCommand "go-bootstrap" {} '' goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out mkdir $out
cp -rf ${buildPackages.go_bootstrap}/* $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/

17
pkgs/development/compilers/go/bootstrap.nix Normal file
View file

@ -0,0 +1,17 @@
{ stdenv, srcOnly, fetchurl, callPackage, Security }:
let
go_bootstrap = if stdenv.isAarch64 then
srcOnly {
name = "go-1.8-linux-arm64-bootstrap";
src = fetchurl {
url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz";
sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6";
};
}
else
callPackage ./1.4.nix {
inherit Security;
};
in
go_bootstrap

13
pkgs/top-level/all-packages.nix
View file

@ -10143,19 +10143,6 @@ in
glslang = callPackage ../development/compilers/glslang { }; glslang = callPackage ../development/compilers/glslang { };
go_bootstrap = if stdenv.isAarch64 then
srcOnly {
name = "go-1.8-linux-arm64-bootstrap";
src = fetchurl {
url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz";
sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6";
};
}
else
callPackage ../development/compilers/go/1.4.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ go_1_14 = callPackage ../development/compilers/go/1.14.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation; inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs stdenv.isAarch64 { } // lib.optionalAttrs stdenv.isAarch64 {