summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2017-03-15 15:16:45 -0400
committerDan Peebles <pumpkin@me.com>2017-03-15 15:17:11 -0400
commite6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2 (patch)
treeb603d1e9331cbd8bc70f404bc87db7aa08ac5b09 /pkgs
parent08314598bb938682049fc5753da13648141c0230 (diff)
downloadnixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.tar
nixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.tar.gz
nixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.tar.bz2
nixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.tar.lz
nixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.tar.xz
nixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.tar.zst
nixlib-e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2.zip
go1.7: patch test to work with recent tzdata
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/go/1.7.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 0df2e8d6f7e9..7fa35e1fcacb 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -107,6 +107,13 @@ stdenv.mkDerivation rec {
     [ ./remove-tools-1.7.patch
       ./cacert-1.7.patch
       ./creds-test.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";
+      })
     ];
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";