b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #25568 from sigma/pr/go-1.8.1

Browse source 
go: 1.8 -> 1.8.1
This commit is contained in:
Daiderd Jordan 2017-05-09 18:44:12 +02:00 committed by GitHub
parent eb79649414 69e5da17c6
commit 0d6d47edd1
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/compilers/go/1.8.nix
View file

@ -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.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";

6
pkgs/top-level/all-packages.nix
View file

@ -5358,11 +5358,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
go_1_8 = callPackage ../development/compilers/go/1.8.nix ({
go_1_8 = callPackage ../development/compilers/go/1.8.nix {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // stdenv.lib.optionalAttrs stdenv.isDarwin {
stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
});
};
go = go_1_8;