diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix deleted file mode 100644 index 77b3fd9d0b91..000000000000 --- a/pkgs/development/compilers/go/1.17.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, iana-etc -, perl -, which -, pkg-config -, procps -, pcre -, cacert -, Security -, Foundation -, xcbuild -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, threadsCross -}: - -let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation rec { - pname = "go"; - version = "1.17.13"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-oaSLI6+yBvlee7qpuJjZZfkIJvbx0fwMHXhK2gzTAP0="; - }; - - strictDeps = true; - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; - - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; - - 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' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # 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 - # Fails on aarch64 - sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go - # Skip this test since ssl patches mess it up. - sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # Disable another PIE test which breaks. - sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go - # Disable the BuildModePie test - sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' 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/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_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 - - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + 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 '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.16.patch - ./remove-test-pie-1.15.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./skip-chown-tests-1.16.patch - ./skip-external-network-tests-1.16.patch - ./skip-nohup-tests.patch - ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks-1.16.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap; - }; - - meta = with lib; { - description = "The Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; - }; -} diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch deleted file mode 100644 index 6a18e6cc42e8..000000000000 --- a/pkgs/development/compilers/go/creds-test.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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) - } - } - diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch b/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch deleted file mode 100644 index a4d9f0674791..000000000000 --- a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go -index 7137599..43cca2e 100644 ---- a/src/net/http/serve_test.go -+++ b/src/net/http/serve_test.go -@@ -5361,6 +5361,7 @@ func testServerKeepAlivesEnabled(t *testing.T, h2 bool) { - // the server's doing its 1-byte background read between requests, - // waiting for the connection to maybe close. - func TestServerCancelsReadTimeoutWhenIdle(t *testing.T) { -+ testenv.SkipFlaky(t, 19608) - setParallel(t) - defer afterTest(t) - const timeout = 250 * time.Millisecond diff --git a/pkgs/development/compilers/go/remove-test-pie-1.15.patch b/pkgs/development/compilers/go/remove-test-pie-1.15.patch deleted file mode 100644 index f00685feba90..000000000000 --- a/pkgs/development/compilers/go/remove-test-pie-1.15.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index e1cd4965c3..66bf980fc6 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -584,29 +584,6 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if t.internalLinkPIE() { -- 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 -- }, -- }) -- // Also test a cgo package. -- if t.cgoEnabled && t.internalLink() { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal_cgo", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- } -- } -- - // sync tests - if goos != "js" { // js doesn't support -cpu=10 - t.tests = append(t.tests, distTest{ diff --git a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch b/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch deleted file mode 100644 index 945d3ef8d126..000000000000 --- a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index e1cd4965c3..0980d044df 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -1136,7 +1136,7 @@ func (t *tester) cgoTest(dt *distTest) error { - t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal") - } - t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie") -- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") -+ //t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") - } - } - } diff --git a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch b/pkgs/development/compilers/go/skip-chown-tests-1.16.patch deleted file mode 100644 index 783446cdf317..000000000000 --- a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9a6718a6355d89b73011fbd1eb1bba8dcfa021e6 Mon Sep 17 00:00:00 2001 -From: regnat -Date: Wed, 3 Nov 2021 10:17:28 +0100 -Subject: [PATCH] Disable the chown tests - -See https://github.com/golang/go/issues/42525 and -https://github.com/NixOS/nix/issues/3245 ---- - os/os_unix_test.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/os/os_unix_test.go b/os/os_unix_test.go -index 51693fd..0936542 100644 ---- a/src/os/os_unix_test.go -+++ b/src/os/os_unix_test.go -@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) { - } - - func TestChown(t *testing.T) { -+ t.Skipf("https://github.com/golang/go/issues/42525") - // Use TempDir() to make sure we're on a local file system, - // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are -@@ -83,6 +84,7 @@ func TestChown(t *testing.T) { - } - - func TestFileChown(t *testing.T) { -+ t.Skipf("https://github.com/golang/go/issues/42525") - // Use TempDir() to make sure we're on a local file system, - // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are -@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) { - } - - func TestLchown(t *testing.T) { -+ t.Skipf("https://github.com/golang/go/issues/42525") - // Use TempDir() to make sure we're on a local file system, - // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are --- -2.31.1 - diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch deleted file mode 100644 index 8f1eb6be7bb8..000000000000 --- a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go -index c902b1404f..66016088a2 100644 ---- a/src/internal/testenv/testenv.go -+++ b/src/internal/testenv/testenv.go -@@ -163,13 +163,15 @@ func MustHaveExecPath(t testing.TB, path string) { - // HasExternalNetwork reports whether the current system can use - // external (non-localhost) networks. - func HasExternalNetwork() bool { -- return !testing.Short() && runtime.GOOS != "js" -+ // Nix sandbox does not external network in sandbox -+ return false - } - - // MustHaveExternalNetwork checks that the current system can use - // external (non-localhost) networks. - // If not, MustHaveExternalNetwork calls t.Skip with an explanation. - func MustHaveExternalNetwork(t testing.TB) { -+ t.Skipf("Nix sandbox does not have networking") - if runtime.GOOS == "js" { - t.Skipf("skipping test: no external network on %s", runtime.GOOS) - } -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 57cf5554ad..d00be53b2c 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -990,6 +990,7 @@ func TestDialerControl(t *testing.T) { - // except that it won't skip testing on non-mobile builders. - func mustHaveExternalNetwork(t *testing.T) { - t.Helper() -+ t.Skipf("Nix sandbox does not have networking") - mobile := runtime.GOOS == "android" || runtime.GOOS == "ios" - if testenv.Builder() == "" || mobile { - testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/skip-nohup-tests.patch b/pkgs/development/compilers/go/skip-nohup-tests.patch deleted file mode 100644 index 1da07407d049..000000000000 --- a/pkgs/development/compilers/go/skip-nohup-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go -index 3d79c7a..6e0f7b4 100644 ---- a/src/os/signal/signal_test.go -+++ b/src/os/signal/signal_test.go -@@ -217,6 +217,8 @@ var checkSighupIgnored = flag.Bool("check_sighup_ignored", false, "if true, Test - - // Test that Ignored(SIGHUP) correctly detects whether it is being run under nohup. - func TestDetectNohup(t *testing.T) { -+ t.Skip("Fails in nix build environment") -+ - if *checkSighupIgnored { - if !Ignored(syscall.SIGHUP) { - t.Fatal("SIGHUP is not ignored.") -@@ -306,6 +308,8 @@ func TestStop(t *testing.T) { - // Test that when run under nohup, an uncaught SIGHUP does not kill the program, - // but a - func TestNohup(t *testing.T) { -+ t.Skip("Fails in nix build environment") -+ - // Ugly: ask for SIGHUP so that child will not have no-hup set - // even if test is running under nohup environment. - // We have no intention of reading from c. diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch deleted file mode 100644 index ab681826499a..000000000000 --- a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go -index dce66c5c2e..2532224376 100644 ---- a/src/os/exec/exec_test.go -+++ b/src/os/exec/exec_test.go -@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) { - t.Skipf("skipping test on %q", runtime.GOOS) - } - -+ if runtime.GOOS == "linux" && runtime.GOARCH == "386" { -+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) -+ } -+ - // Force network usage, to verify the epoll (or whatever) fd - // doesn't leak to the child, - ln, err := net.Listen("tcp", "127.0.0.1:0") diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch deleted file mode 100644 index 5251882fce83..000000000000 --- a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go -index dce66c5c2e..2532224376 100644 ---- a/src/os/exec/exec_test.go -+++ b/src/os/exec/exec_test.go -@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) { - t.Skipf("skipping test on %q", runtime.GOOS) - } - -+ if runtime.GOOS == "linux" && runtime.GOARCH == "arm" { -+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) -+ } -+ - // Force network usage, to verify the epoll (or whatever) fd - // doesn't leak to the child, - ln, err := net.Listen("tcp", "127.0.0.1:0") diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch b/pkgs/development/compilers/go/ssl-cert-file-1.16.patch deleted file mode 100644 index f4bc16e5b8cb..000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/crypto/x509/root.go b/src/crypto/x509/root.go -index ac92915128..fb1d70c735 100644 ---- a/src/crypto/x509/root.go -+++ b/src/crypto/x509/root.go -@@ -6,7 +6,11 @@ package x509 - - //go:generate go run root_ios_gen.go -version 55161.140.3 - --import "sync" -+import ( -+ "io/ioutil" -+ "os" -+ "sync" -+) - - var ( - once sync.Once -@@ -20,6 +24,16 @@ func systemRootsPool() *CertPool { - } - - func initSystemRoots() { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ systemRoots = roots -+ return -+ } -+ } -+ - systemRoots, systemRootsErr = loadSystemRoots() - if systemRootsErr != nil { - systemRoots = nil diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07f5720720c1..99f7c3ce2391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23269,19 +23269,6 @@ with pkgs; buildGoModule = buildGo119Module; buildGoPackage = buildGo119Package; - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ - inherit (darwin.apple_sdk.frameworks) Foundation Security; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - buildGo117Module = callPackage ../build-support/go/module.nix { - go = buildPackages.go_1_17; - }; - buildGo117Package = callPackage ../build-support/go/package.nix { - go = buildPackages.go_1_17; - }; - # requires a newer Apple SDK go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;