Merge pull request #35330 from Mic92/go

go_1_10: init at 1.10 and set as default

Changed files
+240 -14
pkgs
+185
pkgs/development/compilers/go/1.10.nix
···
+
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
+
, perl, which, pkgconfig, patch, procps
+
, pcre, cacert, llvm
+
, Security, Foundation, bash
+
, makeWrapper, git, subversion, mercurial, bazaar }:
+
+
let
+
+
inherit (stdenv.lib) optional optionals optionalString;
+
+
clangHack = writeScriptBin "clang" ''
+
#!${stdenv.shell}
+
exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
+
'';
+
+
goBootstrap = runCommand "go-bootstrap" {} ''
+
mkdir $out
+
cp -rf ${go_bootstrap}/* $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.10";
+
+
src = fetchFromGitHub {
+
owner = "golang";
+
repo = "go";
+
rev = "go${version}";
+
sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l";
+
};
+
+
# perl is used for testing go vet
+
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
+
++ optionals stdenv.isLinux [ procps ];
+
buildInputs = [ cacert pcre ]
+
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
+
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
+
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+
+
hardeningDisable = [ "all" ];
+
+
prePatch = ''
+
patchShebangs ./ # replace /bin/bash
+
+
# This source produces shell script at run time,
+
# and thus it is not corrected by patchShebangs.
+
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
+
--replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
+
+
# 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
+
# Remove the timezone naming test
+
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
+
# Remove disable setgid test
+
sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
+
# Remove cert tests that conflict with NixOS's cert resolution
+
sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_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
+
+
# Disable cgo lookup tests not works, they depend on resolver
+
rm src/net/cgo_unix_test.go
+
+
'' + optionalString stdenv.isLinux ''
+
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+
'' + optionalString stdenv.isArm ''
+
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+
echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
+
'' + 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 '/TestChdirAndGetwd/areturn' src/os/os_test.go
+
sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
+
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
+
sed -i '/TestRead0/areturn' src/os/os_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
+
+
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+
+
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+
'';
+
+
patches = [
+
./remove-tools-1.9.patch
+
./ssl-cert-file-1.9.patch
+
./remove-test-pie.patch
+
./creds-test.patch
+
./go-1.9-skip-flaky-19608.patch
+
./go-1.9-skip-flaky-20072.patch
+
];
+
+
postPatch = optionalString stdenv.isDarwin ''
+
echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
+
substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
+
'';
+
+
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 if stdenv.isAarch64 then "arm64"
+
else throw "Unsupported system";
+
GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
+
GO386 = 387; # from Arch: don't assume sse2 on i686
+
CGO_ENABLED = 1;
+
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
# Hopefully avoids test timeouts on Hydra
+
GO_TEST_TIMEOUT_SCALE = 3;
+
+
# 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";
+
+
configurePhase = ''
+
mkdir -p $out/share/go/bin
+
export GOROOT=$out/share/go
+
export GOBIN=$GOROOT/bin
+
export PATH=$GOBIN:$PATH
+
ulimit -a
+
'';
+
+
postConfigure = optionalString stdenv.isDarwin ''
+
export PATH=${clangHack}/bin:$PATH
+
'';
+
+
installPhase = ''
+
cp -r . $GOROOT
+
( cd $GOROOT/src && ./all.bash )
+
+
# (https://github.com/golang/go/wiki/GoGetTools)
+
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
+
'';
+
+
preFixup = ''
+
rm -r $out/share/go/pkg/bootstrap
+
ln -s $out/share/go/bin $out/bin
+
'';
+
+
setupHook = ./setup-hook.sh;
+
+
disallowedReferences = [ go_bootstrap ];
+
+
meta = with stdenv.lib; {
+
branch = "1.9";
+
homepage = http://golang.org/;
+
description = "The Go Programming language";
+
license = licenses.bsd3;
+
maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
+
platforms = platforms.linux ++ platforms.darwin;
+
};
+
}
+1 -1
pkgs/development/compilers/go/1.9.nix
···
patches =
[ ./remove-tools-1.9.patch
./ssl-cert-file-1.9.patch
-
./creds-test.patch
+
./creds-test-1.9.patch
./remove-test-pie-1.9.patch
./go-1.9-skip-flaky-19608.patch
./go-1.9-skip-flaky-20072.patch
+14
pkgs/development/compilers/go/creds-test-1.9.patch
···
+
diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go
+
--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
+
+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100
+
@@ -62,8 +62,8 @@
+
if sys, ok := err.(*os.SyscallError); ok {
+
err = sys.Err
+
}
+
- if err != syscall.EPERM {
+
- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
+
+ if err != syscall.EPERM && err != syscall.EINVAL {
+
+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
+
}
+
}
+
+11 -12
pkgs/development/compilers/go/creds-test.patch
···
-
diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go
-
--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
-
+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100
-
@@ -62,8 +62,8 @@
-
if sys, ok := err.(*os.SyscallError); ok {
-
err = sys.Err
+
--- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
+
+++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000
+
@@ -76,8 +76,8 @@
+
if sys, ok := err.(*os.SyscallError); ok {
+
err = sys.Err
+
}
+
- if err != syscall.EPERM {
+
- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
+
+ if err != syscall.EPERM && err != syscall.EINVAL {
+
+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
+
}
}
-
- if err != syscall.EPERM {
-
- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
-
+ if err != syscall.EPERM && err != syscall.EINVAL {
-
+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
-
}
-
}
+24
pkgs/development/compilers/go/remove-test-pie.patch
···
+
--- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000
+
+++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000
+
@@ -526,21 +526,6 @@
+
})
+
}
+
+
- // Test internal linking of PIE binaries where it is supported.
+
- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() {
+
- // Issue 18243: We don't have a way to set the default
+
- // dynamic linker used in internal linking mode. So
+
- // this test is skipped on Alpine.
+
- t.tests = append(t.tests, distTest{
+
- name: "pie_internal",
+
- heading: "internal linking of -buildmode=pie",
+
- fn: func(dt *distTest) error {
+
- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
+
- return nil
+
- },
+
- })
+
- }
+
-
+
// sync tests
+
t.tests = append(t.tests, distTest{
+
name: "sync_cpu",
+5 -1
pkgs/top-level/all-packages.nix
···
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
-
go = go_1_9;
+
go_1_10 = callPackage ../development/compilers/go/1.10.nix {
+
inherit (darwin.apple_sdk.frameworks) Security Foundation;
+
};
+
+
go = go_1_10;
go-repo-root = callPackage ../development/tools/go-repo-root { };