go_1_6: Go 1.6 is EOL
This commit is contained in:
adisbladis
parent
9ea5a00a4b
commit
804a21ea00
@ -1,168 +0,0 @@
|
|||||||
{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand
|
|
||||||
, perl, which, pkgconfig, patch, fetchpatch
|
|
||||||
, pcre
|
|
||||||
, Security, Foundation, bash }:
|
|
||||||
|
|
||||||
let
|
|
||||||
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.6.4";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
|
|
||||||
sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9";
|
|
||||||
};
|
|
||||||
|
|
||||||
# perl is used for testing go vet
|
|
||||||
nativeBuildInputs = [ perl which pkgconfig patch ];
|
|
||||||
buildInputs = [ pcre ];
|
|
||||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [
|
|
||||||
Security Foundation
|
|
||||||
];
|
|
||||||
|
|
||||||
hardeningDisable = [ "all" ];
|
|
||||||
|
|
||||||
# I'm not sure what go wants from its 'src', but the go installation manual
|
|
||||||
# describes an installation keeping the src.
|
|
||||||
preUnpack = ''
|
|
||||||
topdir=$PWD
|
|
||||||
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
|
|
||||||
|
|
||||||
# This script produces another script at run time,
|
|
||||||
# and thus it is not corrected by patchShebangs.
|
|
||||||
substituteInPlace misc/cgo/testcarchive/test.bash \
|
|
||||||
--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
|
|
||||||
|
|
||||||
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
|
|
||||||
rm src/crypto/x509/root_darwin_test.go src/crypto/x509/verify_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
|
|
||||||
|
|
||||||
sed -i '1 a\exit 0' misc/cgo/errors/test.bash
|
|
||||||
|
|
||||||
mkdir $topdir/dirtyhacks
|
|
||||||
cat <<EOF > $topdir/dirtyhacks/clang
|
|
||||||
#!${bash}/bin/bash
|
|
||||||
$(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
|
|
||||||
exit $?
|
|
||||||
EOF
|
|
||||||
chmod +x $topdir/dirtyhacks/clang
|
|
||||||
PATH=$topdir/dirtyhacks:$PATH
|
|
||||||
'';
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./remove-tools-1.5.patch
|
|
||||||
./creds-test.patch
|
|
||||||
./fix-systime-1.6.patch
|
|
||||||
|
|
||||||
# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
|
|
||||||
# actually works on old versions too.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
|
|
||||||
sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
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 = 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_bootstrap ];
|
|
||||||
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s
|
|
||||||
index e09b906ba5..fa8ff2f65c 100644
|
|
||||||
--- a/src/runtime/sys_darwin_amd64.s
|
|
||||||
+++ b/src/runtime/sys_darwin_amd64.s
|
|
||||||
@@ -157,6 +157,7 @@ systime:
|
|
||||||
// Fall back to system call (usually first call in this thread).
|
|
||||||
MOVQ SP, DI
|
|
||||||
MOVQ $0, SI
|
|
||||||
+ MOVQ $0, DX // required as of Sierra; Issue 16570
|
|
||||||
MOVL $(0x2000000+116), AX
|
|
||||||
SYSCALL
|
|
||||||
CMPQ AX, $0
|
|
||||||
diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
|
|
||||||
index 70b53b87f4..79083117b6 100644
|
|
||||||
--- a/src/syscall/syscall_darwin_amd64.go
|
|
||||||
+++ b/src/syscall/syscall_darwin_amd64.go
|
|
||||||
@@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
|
|
||||||
}
|
|
||||||
|
|
||||||
//sysnb gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
|
|
||||||
-func Gettimeofday(tv *Timeval) (err error) {
|
|
||||||
- // The tv passed to gettimeofday must be non-nil
|
|
||||||
- // but is otherwise unused. The answers come back
|
|
||||||
- // in the two registers.
|
|
||||||
+func Gettimeofday(tv *Timeval) error {
|
|
||||||
+ // The tv passed to gettimeofday must be non-nil.
|
|
||||||
+ // Before macOS Sierra (10.12), tv was otherwise unused and
|
|
||||||
+ // the answers came back in the two registers.
|
|
||||||
+ // As of Sierra, gettimeofday return zeros and populates
|
|
||||||
+ // tv itself.
|
|
||||||
sec, usec, err := gettimeofday(tv)
|
|
||||||
- tv.Sec = sec
|
|
||||||
- tv.Usec = usec
|
|
||||||
- return err
|
|
||||||
+ if err != nil {
|
|
||||||
+ return err
|
|
||||||
+ }
|
|
||||||
+ if sec != 0 || usec != 0 {
|
|
||||||
+ tv.Sec = sec
|
|
||||||
+ tv.Usec = usec
|
|
||||||
+ }
|
|
||||||
+ return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetKevent(k *Kevent_t, fd, mode, flags int) {
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
|
|
||||||
index 61e3d8d..b8422ad 100644
|
|
||||||
--- a/src/cmd/go/pkg.go
|
|
||||||
+++ b/src/cmd/go/pkg.go
|
|
||||||
@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{
|
|
||||||
"cmd/trace": toTool,
|
|
||||||
"cmd/vet": toTool,
|
|
||||||
"cmd/yacc": toTool,
|
|
||||||
- "golang.org/x/tools/cmd/godoc": toBin,
|
|
||||||
+ "nixos.org/x/tools/cmd/godoc": toBin,
|
|
||||||
"code.google.com/p/go.tools/cmd/cover": stalePath,
|
|
||||||
"code.google.com/p/go.tools/cmd/godoc": stalePath,
|
|
||||||
"code.google.com/p/go.tools/cmd/vet": stalePath,
|
|
||||||
diff --git a/src/go/build/build.go b/src/go/build/build.go
|
|
||||||
index 496fe11..8c81dbd 100644
|
|
||||||
--- a/src/go/build/build.go
|
|
||||||
+++ b/src/go/build/build.go
|
|
||||||
@@ -1388,7 +1388,7 @@ func init() {
|
|
||||||
}
|
|
||||||
|
|
||||||
// ToolDir is the directory containing build tools.
|
|
||||||
-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
|
||||||
+var ToolDir = runtime.GOTOOLDIR()
|
|
||||||
|
|
||||||
// IsLocalImport reports whether the import path is
|
|
||||||
// a local import path, like ".", "..", "./foo", or "../foo".
|
|
||||||
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
|
|
||||||
index d346362..fb22b6e 100644
|
|
||||||
--- a/src/runtime/extern.go
|
|
||||||
+++ b/src/runtime/extern.go
|
|
||||||
@@ -194,6 +194,17 @@ func GOROOT() string {
|
|
||||||
return defaultGoroot
|
|
||||||
}
|
|
||||||
|
|
||||||
+// GOTOOLDIR returns the root of the Go tree.
|
|
||||||
+// It uses the GOTOOLDIR environment variable, if set,
|
|
||||||
+// or else the root used during the Go build.
|
|
||||||
+func GOTOOLDIR() string {
|
|
||||||
+ s := gogetenv("GOTOOLDIR")
|
|
||||||
+ if s != "" {
|
|
||||||
+ return s
|
|
||||||
+ }
|
|
||||||
+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
// Version returns the Go tree's version string.
|
|
||||||
// It is either the commit hash and date at the time of the build or,
|
|
||||||
// when possible, a release tag like "go1.3".
|
|
||||||
@ -6200,10 +6200,6 @@ with pkgs;
|
|||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
|
||||||
go_1_6 = callPackage ../development/compilers/go/1.6.nix {
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
|
||||||
};
|
|
||||||
|
|
||||||
go_1_7 = callPackage ../development/compilers/go/1.7.nix {
|
go_1_7 = callPackage ../development/compilers/go/1.7.nix {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||||
};
|
};
|
||||||
@ -11854,10 +11850,6 @@ with pkgs;
|
|||||||
|
|
||||||
### DEVELOPMENT / GO MODULES
|
### DEVELOPMENT / GO MODULES
|
||||||
|
|
||||||
buildGo16Package = callPackage ../development/go-modules/generic {
|
|
||||||
go = go_1_6;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildGo17Package = callPackage ../development/go-modules/generic {
|
buildGo17Package = callPackage ../development/go-modules/generic {
|
||||||
go = go_1_7;
|
go = go_1_7;
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user