public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go_1_15: 1.15beta1 -> 1.15

Browse Source
This commit is contained in:
Thomas Bereknyei 2020-08-11 23:10:25 -04:00 committed by zowoq
parent 71dd85bffa
commit a3b69f46af
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/go/1.15.nix
View File

@ -31,11 +31,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.15beta1"; version = "1.15";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1h1sg6j9jac5bw2pjrd13bf4nr18prs89147izdhzbhp896sikbq"; sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9";
}; };
# perl is used for testing go vet # perl is used for testing go vet

16
pkgs/development/compilers/go/ssl-cert-file-1.15.patch
View File

@ -1,16 +1,16 @@
diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go 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 --- a/src/crypto/x509/root_darwin_amd64.go
+++ b/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" "bytes"
"crypto/x509/internal/macOS" macOS "crypto/x509/internal/macos"
"fmt" "fmt"
+ "io/ioutil" + "io/ioutil"
"os" "os"
"strings" "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) var loadSystemRootsWithCgo func() (*CertPool, error)
func loadSystemRoots() (*CertPool, error) { func loadSystemRoots() (*CertPool, error) {
@ -25,10 +25,10 @@ index 8ad5a9607d..1d6091cf83 100644
var trustedRoots []*Certificate var trustedRoots []*Certificate
untrustedRoots := make(map[string]bool) untrustedRoots := make(map[string]bool)
diff --git 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 2fb079ba66..6a072f3e78 100644 index 5ecc4911b3..14b4205c00 100644
--- a/src/crypto/x509/root_darwin_arm64.go --- a/src/crypto/x509/root_darwin_ios.go
+++ b/src/crypto/x509/root_darwin_arm64.go +++ b/src/crypto/x509/root_darwin_ios.go
@@ -6,6 +6,11 @@ @@ -6,6 +6,11 @@
package x509 package x509