Merge pull request #13084 from nathan7/go-1.6
go: add 1.6 compiler and packages
This commit is contained in:
commit
eb905c2d76
141
pkgs/development/compilers/go/1.6.nix
Normal file
141
pkgs/development/compilers/go/1.6.nix
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
|
||||||
|
, perl, which, pkgconfig, patch
|
||||||
|
, pcre
|
||||||
|
, Security, Foundation }:
|
||||||
|
|
||||||
|
let
|
||||||
|
goBootstrap = runCommand "go-bootstrap" {} ''
|
||||||
|
mkdir $out
|
||||||
|
cp -rf ${go_1_4}/* $out/
|
||||||
|
chmod -R u+w $out
|
||||||
|
find $out -name "*.c" -delete
|
||||||
|
cp -rf $out/bin/* $out/share/go/bin/
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "go-${version}";
|
||||||
|
version = "1.6";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
|
||||||
|
sha256 = "04g7w34qamgy9gqpy75xm03s8xbbslv1735iv1a06z8sphpkgs7m";
|
||||||
|
};
|
||||||
|
|
||||||
|
# perl is used for testing go vet
|
||||||
|
nativeBuildInputs = [ perl which pkgconfig patch ];
|
||||||
|
buildInputs = [ pcre ];
|
||||||
|
propagatedBuildInputs = lib.optionals stdenv.isDarwin [
|
||||||
|
Security Foundation
|
||||||
|
];
|
||||||
|
|
||||||
|
# I'm not sure what go wants from its 'src', but the go installation manual
|
||||||
|
# describes an installation keeping the src.
|
||||||
|
preUnpack = ''
|
||||||
|
mkdir -p $out/share
|
||||||
|
cd $out/share
|
||||||
|
'';
|
||||||
|
|
||||||
|
prePatch = ''
|
||||||
|
# Ensure that the source directory is named go
|
||||||
|
cd ..
|
||||||
|
if [ ! -d go ]; then
|
||||||
|
mv * go
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd go
|
||||||
|
patchShebangs ./ # replace /bin/bash
|
||||||
|
|
||||||
|
# Disabling the 'os/http/net' tests (they want files not available in
|
||||||
|
# chroot builds)
|
||||||
|
rm src/net/{listen,parse}_test.go
|
||||||
|
rm src/syscall/exec_linux_test.go
|
||||||
|
# !!! substituteInPlace does not seems to be effective.
|
||||||
|
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
|
||||||
|
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
|
||||||
|
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
|
||||||
|
# Disable the unix socket test
|
||||||
|
sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
|
||||||
|
# Disable the hostname test
|
||||||
|
sed -i '/TestHostname/areturn' src/os/os_test.go
|
||||||
|
# ParseInLocation fails the test
|
||||||
|
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
|
||||||
|
# Remove the api check as it never worked
|
||||||
|
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
|
||||||
|
# Remove the coverage test as we have removed this utility
|
||||||
|
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
|
||||||
|
|
||||||
|
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
|
||||||
|
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
|
||||||
|
'' + lib.optionalString stdenv.isLinux ''
|
||||||
|
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
|
||||||
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
substituteInPlace src/race.bash --replace \
|
||||||
|
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
|
||||||
|
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
|
||||||
|
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
|
||||||
|
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||||
|
sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go
|
||||||
|
sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
|
||||||
|
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||||
|
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
|
||||||
|
sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
|
||||||
|
|
||||||
|
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
|
||||||
|
sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
|
||||||
|
|
||||||
|
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
|
||||||
|
|
||||||
|
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||||
|
'';
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./cacert-1.5.patch
|
||||||
|
./remove-tools-1.5.patch
|
||||||
|
]
|
||||||
|
# -ldflags=-s is required to compile on Darwin, see
|
||||||
|
# https://github.com/golang/go/issues/11994
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin ./strip.patch;
|
||||||
|
|
||||||
|
GOOS = if stdenv.isDarwin then "darwin" else "linux";
|
||||||
|
GOARCH = if stdenv.isDarwin then "amd64"
|
||||||
|
else if stdenv.system == "i686-linux" then "386"
|
||||||
|
else if stdenv.system == "x86_64-linux" then "amd64"
|
||||||
|
else if stdenv.isArm then "arm"
|
||||||
|
else throw "Unsupported system";
|
||||||
|
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
|
||||||
|
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||||
|
CGO_ENABLED = 1;
|
||||||
|
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||||
|
|
||||||
|
# The go build actually checks for CC=*/clang and does something different, so we don't
|
||||||
|
# just want the generic `cc` here.
|
||||||
|
CC = if stdenv.isDarwin then "clang" else "cc";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p "$out/bin"
|
||||||
|
export GOROOT="$(pwd)/"
|
||||||
|
export GOBIN="$out/bin"
|
||||||
|
export PATH="$GOBIN:$PATH"
|
||||||
|
cd ./src
|
||||||
|
echo Building
|
||||||
|
./all.bash
|
||||||
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
rm -r $out/share/go/pkg/bootstrap
|
||||||
|
'';
|
||||||
|
|
||||||
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
|
disallowedReferences = [ go_1_4 ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
branch = "1.6";
|
||||||
|
homepage = http://golang.org/;
|
||||||
|
description = "The Go Programming language";
|
||||||
|
license = licenses.bsd3;
|
||||||
|
maintainers = with maintainers; [ cstrahan wkennington ];
|
||||||
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
};
|
||||||
|
}
|
|
@ -4303,6 +4303,10 @@ let
|
||||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
go_1_6 = callPackage ../development/compilers/go/1.6.nix {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||||
|
};
|
||||||
|
|
||||||
go = go_1_5;
|
go = go_1_5;
|
||||||
|
|
||||||
go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
|
go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
|
||||||
|
@ -9134,6 +9138,15 @@ let
|
||||||
overrides = (config.goPackageOverrides or (p: {})) pkgs;
|
overrides = (config.goPackageOverrides or (p: {})) pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
go16Packages = callPackage ./go-packages.nix {
|
||||||
|
go = go_1_6;
|
||||||
|
buildGoPackage = callPackage ../development/go-modules/generic {
|
||||||
|
go = go_1_6;
|
||||||
|
govers = go16Packages.govers.bin;
|
||||||
|
};
|
||||||
|
overrides = (config.goPackageOverrides or (p: {})) pkgs;
|
||||||
|
};
|
||||||
|
|
||||||
goPackages = go15Packages;
|
goPackages = go15Packages;
|
||||||
|
|
||||||
### DEVELOPMENT / LISP MODULES
|
### DEVELOPMENT / LISP MODULES
|
||||||
|
|
Loading…
Reference in a new issue