diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-15 15:16:32 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-15 15:17:11 -0400 |
| commit | 331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b (patch) | |
| tree | 187c0f0d64a6c9df9843e09d5119cac63f6ae3f1 /pkgs | |
| parent | 12648a455bd9d7755b635f0732ce402590e1bd6f (diff) | |
| download | nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.tar nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.tar.gz nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.tar.bz2 nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.tar.lz nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.tar.xz nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.tar.zst nixlib-331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b.zip | |
go1.4: patch test to work with recent tzdata
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/go/1.4.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b703a92f3ea5..f60077e89621 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross +{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross , pkgconfig , pcre , Security }: @@ -114,6 +114,13 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-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"; |