mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
go_1_14: remove
This commit is contained in:
zowoq
parent
9adeb2b8ad
commit
2a23aa28d6
6 changed files with 0 additions and 444 deletions
|
|
@ -1,284 +0,0 @@
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchurl
|
|
||||||
, tzdata
|
|
||||||
, iana-etc
|
|
||||||
, runCommand
|
|
||||||
, perl
|
|
||||||
, which
|
|
||||||
, pkg-config
|
|
||||||
, patch
|
|
||||||
, procps
|
|
||||||
, pcre
|
|
||||||
, cacert
|
|
||||||
, Security
|
|
||||||
, Foundation
|
|
||||||
, mailcap
|
|
||||||
, runtimeShell
|
|
||||||
, buildPackages
|
|
||||||
, pkgsBuildTarget
|
|
||||||
, fetchpatch
|
|
||||||
, callPackage
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
|
|
||||||
|
|
||||||
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/
|
|
||||||
'';
|
|
||||||
|
|
||||||
goarch = platform: {
|
|
||||||
"i686" = "386";
|
|
||||||
"x86_64" = "amd64";
|
|
||||||
"aarch64" = "arm64";
|
|
||||||
"arm" = "arm";
|
|
||||||
"armv5tel" = "arm";
|
|
||||||
"armv6l" = "arm";
|
|
||||||
"armv7l" = "arm";
|
|
||||||
"powerpc64le" = "ppc64le";
|
|
||||||
"mips" = "mips";
|
|
||||||
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
|
|
||||||
|
|
||||||
# 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;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "go";
|
|
||||||
version = "1.14.15";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
|
||||||
sha256 = "0jci03f5z09xibbdqg4lnv2k3crhal1phzwr6lc4ajp514i3plby";
|
|
||||||
};
|
|
||||||
|
|
||||||
# perl is used for testing go vet
|
|
||||||
nativeBuildInputs = [ perl which pkg-config patch procps ];
|
|
||||||
buildInputs = [ cacert pcre ]
|
|
||||||
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
|
||||||
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
|
||||||
|
|
||||||
depsTargetTargetPropagated = lib.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' '#!${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
|
|
||||||
# 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
|
|
||||||
|
|
||||||
'' + lib.optionalString stdenv.isLinux ''
|
|
||||||
# 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.13.patch
|
|
||||||
./remove-test-pie-1.14.patch
|
|
||||||
./creds-test.patch
|
|
||||||
./go-1.9-skip-flaky-19608.patch
|
|
||||||
./go-1.9-skip-flaky-20072.patch
|
|
||||||
./skip-external-network-tests.patch
|
|
||||||
./skip-nohup-tests.patch
|
|
||||||
./go_no_vendor_checks-1_14.patch
|
|
||||||
|
|
||||||
# support TZ environment variable starting with colon
|
|
||||||
(fetchpatch {
|
|
||||||
name = "tz-support-colon.patch";
|
|
||||||
url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch";
|
|
||||||
sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f";
|
|
||||||
})
|
|
||||||
|
|
||||||
# fix rare TestDontCacheBrokenHTTP2Conn failure
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/golang/go/commit/ea1437a8cdf6bb3c2d2447833a5d06dbd75f7ae4.patch";
|
|
||||||
sha256 = "1lyzy4nf8c34a966vw45j3j7hzpvncq2gqspfxffzkyh17xd8sgy";
|
|
||||||
})
|
|
||||||
] ++ [
|
|
||||||
# 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 (stdenv.buildPlatform != stdenv.targetPlatform) then
|
|
||||||
"${targetCC}/bin/${targetCC.targetPrefix}cc"
|
|
||||||
else
|
|
||||||
null;
|
|
||||||
CXX_FOR_TARGET =
|
|
||||||
if (stdenv.buildPlatform != stdenv.targetPlatform) then
|
|
||||||
"${targetCC}/bin/${targetCC.targetPrefix}c++"
|
|
||||||
else
|
|
||||||
null;
|
|
||||||
|
|
||||||
GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
|
|
||||||
GO386 = 387; # 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 (stdenv.buildPlatform != stdenv.targetPlatform) ''
|
|
||||||
# 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 ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "http://golang.org/";
|
|
||||||
description = "The Go Programming language";
|
|
||||||
license = licenses.bsd3;
|
|
||||||
maintainers = teams.golang.members;
|
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
|
||||||
knownVulnerabilities = [
|
|
||||||
"Support for Go 1.14 ended with the release of Go 1.16: https://golang.org/doc/devel/release.html#policy"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
|
|
||||||
and replacements listed in the main module go.mod file, and it is a hard failure if
|
|
||||||
vendor/modules.txt is missing.
|
|
||||||
|
|
||||||
Relax module consistency checks and switch back to pre go1.14 behaviour if
|
|
||||||
vendor/modules.txt is missing regardless of go version requirement in go.mod.
|
|
||||||
|
|
||||||
This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
|
|
||||||
See https://github.com/golang/go/issues/37948 for discussion.
|
|
||||||
|
|
||||||
diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go
|
|
||||||
index 71f68efbcc..3c566d04dd 100644
|
|
||||||
--- a/src/cmd/go/internal/modload/init.go
|
|
||||||
+++ b/src/cmd/go/internal/modload/init.go
|
|
||||||
@@ -133,7 +133,7 @@ func checkVendorConsistency() {
|
|
||||||
readVendorList()
|
|
||||||
|
|
||||||
pre114 := false
|
|
||||||
- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 {
|
|
||||||
+ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
|
|
||||||
// Go versions before 1.14 did not include enough information in
|
|
||||||
// vendor/modules.txt to check for consistency.
|
|
||||||
// If we know that we're on an earlier version, relax the consistency check.
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
|
|
||||||
index 56bdfcac19..d7d67ab94d 100644
|
|
||||||
--- a/src/cmd/dist/test.go
|
|
||||||
+++ b/src/cmd/dist/test.go
|
|
||||||
@@ -580,29 +580,6 @@ func (t *tester) registerTests() {
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
- // Test internal linking of PIE binaries where it is supported.
|
|
||||||
- if goos == "linux" && (goarch == "amd64" || goarch == "arm64") {
|
|
||||||
- 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{
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
|
|
||||||
index 85cae90..94b4edd 100644
|
|
||||||
--- a/src/cmd/go/go_test.go
|
|
||||||
+++ b/src/cmd/go/go_test.go
|
|
||||||
@@ -4946,6 +4946,8 @@ func TestBuildmodePIE(t *testing.T) {
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestExecBuildX(t *testing.T) {
|
|
||||||
+ t.Skipf("skipping, test requires networking")
|
|
||||||
+
|
|
||||||
tooSlow(t)
|
|
||||||
if !canCgo {
|
|
||||||
t.Skip("skipping because cgo not enabled")
|
|
||||||
diff --git a/src/net/dial_test.go b/src/net/dial_test.go
|
|
||||||
index 00a84d1..27f9ec9 100644
|
|
||||||
--- a/src/net/dial_test.go
|
|
||||||
+++ b/src/net/dial_test.go
|
|
||||||
@@ -968,6 +968,8 @@ func TestDialerControl(t *testing.T) {
|
|
||||||
// mustHaveExternalNetwork is like testenv.MustHaveExternalNetwork
|
|
||||||
// except that it won't skip testing on non-iOS builders.
|
|
||||||
func mustHaveExternalNetwork(t *testing.T) {
|
|
||||||
+ t.Skipf("Nix sandbox does not have networking")
|
|
||||||
+
|
|
||||||
t.Helper()
|
|
||||||
ios := runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64")
|
|
||||||
if testenv.Builder() == "" || ios {
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
|
|
||||||
index 255a8d3525..a467255a54 100644
|
|
||||||
--- a/src/crypto/x509/root_cgo_darwin.go
|
|
||||||
+++ b/src/crypto/x509/root_cgo_darwin.go
|
|
||||||
@@ -280,6 +280,8 @@ int CopyPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots, bool debugDa
|
|
||||||
import "C"
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
+ "io/ioutil"
|
|
||||||
+ "os"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
@@ -295,6 +297,13 @@ func loadSystemRoots() (*CertPool, error) {
|
|
||||||
buf := C.GoBytes(unsafe.Pointer(C.CFDataGetBytePtr(data)), C.int(C.CFDataGetLength(data)))
|
|
||||||
roots := NewCertPool()
|
|
||||||
roots.AppendCertsFromPEM(buf)
|
|
||||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
|
||||||
+ data, err := ioutil.ReadFile(file)
|
|
||||||
+ if err == nil {
|
|
||||||
+ roots.AppendCertsFromPEM(data)
|
|
||||||
+ return roots, nil
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if C.CFDataGetLength(untrustedData) == 0 {
|
|
||||||
return roots, nil
|
|
||||||
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
|
|
||||||
index 2f6a8b8d60..b81889fe69 100644
|
|
||||||
--- a/src/crypto/x509/root_darwin.go
|
|
||||||
+++ b/src/crypto/x509/root_darwin.go
|
|
||||||
@@ -92,6 +92,14 @@ func execSecurityRoots() (*CertPool, error) {
|
|
||||||
verifyCh = make(chan rootCandidate)
|
|
||||||
)
|
|
||||||
|
|
||||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
|
||||||
+ data, err := ioutil.ReadFile(file)
|
|
||||||
+ if err == nil {
|
|
||||||
+ roots.AppendCertsFromPEM(data)
|
|
||||||
+ return roots, nil
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
// Using 4 goroutines to pipe into verify-cert seems to be
|
|
||||||
// about the best we can do. The verify-cert binary seems to
|
|
||||||
// just RPC to another server with coarse locking anyway, so
|
|
||||||
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
|
|
||||||
index 48de50b4ea..750e12c6b4 100644
|
|
||||||
--- a/src/crypto/x509/root_unix.go
|
|
||||||
+++ b/src/crypto/x509/root_unix.go
|
|
||||||
@@ -38,6 +38,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
|
|
||||||
|
|
||||||
func loadSystemRoots() (*CertPool, error) {
|
|
||||||
roots := NewCertPool()
|
|
||||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
|
||||||
+ data, err := ioutil.ReadFile(file)
|
|
||||||
+ if err == nil {
|
|
||||||
+ roots.AppendCertsFromPEM(data)
|
|
||||||
+ return roots, nil
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
files := certFiles
|
|
||||||
if f := os.Getenv(certFileEnv); f != "" {
|
|
||||||
|
|
@ -11495,13 +11495,6 @@ with pkgs;
|
||||||
|
|
||||||
glslang = callPackage ../development/compilers/glslang { };
|
glslang = callPackage ../development/compilers/glslang { };
|
||||||
|
|
||||||
go_1_14 = callPackage ../development/compilers/go/1.14.nix ({
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
|
||||||
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
|
|
||||||
stdenv = gcc8Stdenv;
|
|
||||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
|
|
||||||
});
|
|
||||||
|
|
||||||
go_1_15 = callPackage ../development/compilers/go/1.15.nix ({
|
go_1_15 = callPackage ../development/compilers/go/1.15.nix ({
|
||||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||||
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
|
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
|
||||||
|
|
@ -19418,9 +19411,6 @@ with pkgs;
|
||||||
|
|
||||||
### DEVELOPMENT / GO MODULES
|
### DEVELOPMENT / GO MODULES
|
||||||
|
|
||||||
buildGo114Package = callPackage ../development/go-packages/generic {
|
|
||||||
go = buildPackages.go_1_14;
|
|
||||||
};
|
|
||||||
buildGo115Package = callPackage ../development/go-packages/generic {
|
buildGo115Package = callPackage ../development/go-packages/generic {
|
||||||
go = buildPackages.go_1_15;
|
go = buildPackages.go_1_15;
|
||||||
};
|
};
|
||||||
|
|
@ -19430,9 +19420,6 @@ with pkgs;
|
||||||
|
|
||||||
buildGoPackage = buildGo116Package;
|
buildGoPackage = buildGo116Package;
|
||||||
|
|
||||||
buildGo114Module = callPackage ../development/go-modules/generic {
|
|
||||||
go = buildPackages.go_1_14;
|
|
||||||
};
|
|
||||||
buildGo115Module = callPackage ../development/go-modules/generic {
|
buildGo115Module = callPackage ../development/go-modules/generic {
|
||||||
go = buildPackages.go_1_15;
|
go = buildPackages.go_1_15;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue