diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-12-29 15:33:35 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-12-29 15:33:44 +0100 |
| commit | 5b1dad79cd870fd25f3eecafb975a013b61a1825 (patch) | |
| tree | de7bd13ca057b54e1b5c479ce9b1f1709589711b /pkgs | |
| parent | 581070147e32b20c48513159f6e1c47673e11623 (diff) | |
| download | nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.tar nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.tar.gz nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.tar.bz2 nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.tar.lz nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.tar.xz nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.tar.zst nixlib-5b1dad79cd870fd25f3eecafb975a013b61a1825.zip | |
go_1_6, go_1_7: comment out testLoadFixed in a way recommended by vcunat. The test depends on specific timezone names, and the latest tzdata changed the naming. Upstream only agrees to fix the test in the 1.8 branch that has no stable releases yer
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/go/1.6.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.7.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index ce68b007eaab..982446f4fdb1 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go # Remove the coverage test as we have removed this utility sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index c33e45c2983e..0df2e8d6f7e9 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation rec { sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go # Remove the coverage test as we have removed this utility sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go |