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

go1.8: patch test to work with recent tzdata

Browse Source
This commit is contained in:
Dan Peebles 2017-03-15 15:16:59 -04:00
parent e6a5ab85b4
commit 2ffda66f11
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/go/1.8.nix
View File

@ -80,11 +80,6 @@ stdenv.mkDerivation rec {
'' + optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
'' + optionalString stdenv.isDarwin '' '' + 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 \ substituteInPlace src/race.bash --replace \
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
@ -115,6 +110,13 @@ stdenv.mkDerivation rec {
./cacert-1.8.patch ./cacert-1.8.patch
./creds-test.patch ./creds-test.patch
./remove-test-pie-1.8.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"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";