diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-08-23 02:00:50 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-08-23 02:00:50 +0200 |
| commit | 91104b5417275b780f6947b46a5c1bcc0d99f10b (patch) | |
| tree | f9530394ba9869c49b30171bb6006f04ba43abf8 /pkgs/development/compilers/go | |
| parent | 4cf394ea3f173946363c40439b03ebcd92eb2bb4 (diff) | |
| parent | ddfa22167019726c015a5638e815d028031162e8 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/compilers/go')
| -rw-r--r-- | pkgs/development/compilers/go/1.15.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/ssl-cert-file-1.15.patch | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index cd6d5faaabbfa..b3851741c69cd 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15beta1"; + version = "1.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1h1sg6j9jac5bw2pjrd13bf4nr18prs89147izdhzbhp896sikbq"; + sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch index cca48eb5705cc..1884c681ca30e 100644 --- a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch +++ b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch @@ -1,16 +1,16 @@ diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go -index 8ad5a9607d..1d6091cf83 100644 +index ce88de025e..258ecc45d1 100644 --- a/src/crypto/x509/root_darwin_amd64.go +++ b/src/crypto/x509/root_darwin_amd64.go -@@ -8,6 +8,7 @@ import ( +@@ -10,6 +10,7 @@ import ( "bytes" - "crypto/x509/internal/macOS" + macOS "crypto/x509/internal/macos" "fmt" + "io/ioutil" "os" "strings" ) -@@ -23,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate +@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate var loadSystemRootsWithCgo func() (*CertPool, error) func loadSystemRoots() (*CertPool, error) { @@ -25,10 +25,10 @@ index 8ad5a9607d..1d6091cf83 100644 var trustedRoots []*Certificate untrustedRoots := make(map[string]bool) -diff --git a/src/crypto/x509/root_darwin_arm64.go b/src/crypto/x509/root_darwin_arm64.go -index 2fb079ba66..6a072f3e78 100644 ---- a/src/crypto/x509/root_darwin_arm64.go -+++ b/src/crypto/x509/root_darwin_arm64.go +diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go +index 5ecc4911b3..14b4205c00 100644 +--- a/src/crypto/x509/root_darwin_ios.go ++++ b/src/crypto/x509/root_darwin_ios.go @@ -6,6 +6,11 @@ package x509 |