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

go1.4: patch test to work with recent tzdata

Browse Source
This commit is contained in:
Dan Peebles 2017-03-15 15:16:32 -04:00
parent 12648a455b
commit 331f5a886d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/go/1.4.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross { stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross
, pkgconfig , pkgconfig
, pcre , pcre
, Security }: , Security }:
@ -114,6 +114,13 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./remove-tools-1.4.patch ./remove-tools-1.4.patch
./creds-test-1.4.patch ./creds-test-1.4.patch
# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
# actually works on old versions too.
(fetchpatch {
url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
})
]; ];
GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOOS = if stdenv.isDarwin then "darwin" else "linux";