3
0
Fork 0
forked from mirrors/nixpkgs

go: remove ssl certs patches

Those are not needed since we now use a standard location to store our
bundles.

See bfebc7342e
This commit is contained in:
zimbatm 2016-02-20 00:19:49 +00:00
parent 53ea7dee75
commit 58dbaf69b7
4 changed files with 0 additions and 24 deletions

View file

@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
'';
patches = [
./cacert-1.4.patch
./remove-tools-1.4.patch
];

View file

@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
'';
patches = [
./cacert-1.5.patch
./remove-tools-1.5.patch
]
# -ldflags=-s is required to compile on Darwin, see

View file

@ -1,14 +0,0 @@
Go comes with hardcoded cacert. We add the usual in NixOS,
for easier NixOS life.
diff -r 14854533dcc7 src/crypto/x509/root_unix.go
--- a/src/crypto/x509/root_unix.go Thu Dec 11 11:27:56 2014 +1100
+++ b/src/crypto/x509/root_unix.go Tue Jan 06 00:41:31 2015 -0600
@@ -17,6 +17,7 @@
"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
"/etc/pki/tls/cacert.pem", // OpenELEC
"/etc/certs/ca-certificates.crt", // Solaris 11.2+
+ "/etc/ssl/certs/ca-bundle.crt", // NixOS
}
// Possible directories with certificate files; stop after successfully

View file

@ -1,8 +0,0 @@
--- a/src/crypto/x509/root_linux.go 2015-08-19 23:06:11.115133174 +0200
+++ b/src/crypto/x509/root_linux.go 2015-08-19 23:07:04.238507161 +0200
@@ -10,4 +10,5 @@
"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL
"/etc/ssl/ca-bundle.pem", // OpenSUSE
"/etc/pki/tls/cacert.pem", // OpenELEC
+ "/etc/ssl/certs/ca-bundle.crt", // NixOS
}