diff options
author | Dan Peebles <pumpkin@me.com> | 2017-03-15 15:16:59 -0400 |
---|---|---|
committer | Dan Peebles <pumpkin@me.com> | 2017-03-15 15:17:11 -0400 |
commit | 2ffda66f11bfd7f12271ac44ac7010148f73a085 (patch) | |
tree | 875a6f327204847f1ace084e76afe79f7bb3017f /pkgs/development/compilers/go/1.8.nix | |
parent | e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2 (diff) |
go1.8: patch test to work with recent tzdata
Diffstat (limited to 'pkgs/development/compilers/go/1.8.nix')
-rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 00ec11abc47b6..6d9ee3de5501b 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -80,11 +80,6 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isDarwin '' - - # Disabling `format_test.go` because it fails on Darwin for an - # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727 - rm src/time/format_test.go - substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go @@ -115,6 +110,13 @@ stdenv.mkDerivation rec { ./cacert-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"; + }) ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; |