diff options
author | Yann Hodique <hodiquey@vmware.com> | 2017-05-06 12:55:32 -0700 |
---|---|---|
committer | Yann Hodique <hodiquey@vmware.com> | 2017-05-06 12:55:32 -0700 |
commit | aa513180c524b1487bfb879475d6d0512b9fa64b (patch) | |
tree | 8853d33f032673264e0e7626402eb9d6e01667eb /pkgs/development/compilers/go | |
parent | 2f826ef26f0c1e31e3fa53af52b14a5432a07e0e (diff) | |
download | nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.tar nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.tar.gz nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.tar.bz2 nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.tar.lz nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.tar.xz nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.tar.zst nixlib-aa513180c524b1487bfb879475d6d0512b9fa64b.zip |
go: 1.8 -> 1.8.1
Diffstat (limited to 'pkgs/development/compilers/go')
-rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 60125b2e22a9..e4cd29fc62b8 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch -, pcre, cacert +, pcre, cacert, llvm , Security, Foundation, bash }: let @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl"; + sha256 = "1157mmzjpk887cpcpn2qy9c69anc22c4p3cjpl84zl7an41x660j"; }; # perl is used for testing go vet @@ -110,15 +110,13 @@ stdenv.mkDerivation rec { ./ssl-cert-file-1.8.patch ./creds-test.patch ./remove-test-pie-1.8.patch - - # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch - # works fine here for now. - (fetchpatch { - url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; - sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; - }) ]; + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; |