diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-03-26 11:11:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-26 11:11:05 -0400 |
| commit | 826ae5ff214c5c190297805592ab60bab3d1107c (patch) | |
| tree | 02ca7dedfa2a3f5c70b6d51ef4b3c1ff52bc6067 /pkgs/development | |
| parent | f2cf8ffdcb4b117102b337417151b6e1178aaef7 (diff) | |
| parent | f36f21c650538dbecd6e4c723f601b8b43176ffb (diff) | |
| download | nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.tar nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.tar.gz nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.tar.bz2 nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.tar.lz nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.tar.xz nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.tar.zst nixlib-826ae5ff214c5c190297805592ab60bab3d1107c.zip | |
Merge pull request #24058 from LnL7/go-cacert
go: use NIX_SSL_CERT_FILE for crypto/x509
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/go/1.7.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/ssl-cert-file-1.7.patch (renamed from pkgs/development/compilers/go/cacert-1.7.patch) | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/ssl-cert-file-1.8.patch (renamed from pkgs/development/compilers/go/cacert-1.8.patch) | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 7fa35e1fcacb..6c1b868beba3 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.7.patch - ./cacert-1.7.patch + ./ssl-cert-file-1.7.patch ./creds-test.patch # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { }) ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 6d9ee3de5501..32e95c3c0491 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.8.patch - ./cacert-1.8.patch + ./ssl-cert-file-1.8.patch ./creds-test.patch ./remove-test-pie-1.8.patch @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { }) ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch index 57f09c975d9c..e35ad9e4b759 100644 --- a/pkgs/development/compilers/go/cacert-1.7.patch +++ b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch @@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -36,7 +36,7 @@ index 59b303d..d4a34ac 100644 + roots = NewCertPool() + ) + -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -65,7 +65,7 @@ index 7bcb3d6..3986e1a 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) diff --git a/pkgs/development/compilers/go/cacert-1.8.patch b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch index bf44e123711f..052655eed52c 100644 --- a/pkgs/development/compilers/go/cacert-1.8.patch +++ b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch @@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -43,7 +43,7 @@ index 66cdb5e..bb28036 100644 numVerified int // number of execs of 'security verify-cert', for debug stats ) -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -67,7 +67,7 @@ index 7bcb3d6..3986e1a 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) |