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

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

Browse Source
This commit is contained in:
Michael Raskin 2016-12-29 15:33:35 +01:00
parent 581070147e
commit 5b1dad79cd
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/go/1.6.nix
View File

@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
# Remove the coverage test as we have removed this utility # Remove the coverage test as we have removed this utility
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go 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/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

2
pkgs/development/compilers/go/1.7.nix
View File

@ -66,6 +66,8 @@ stdenv.mkDerivation rec {
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
# Remove the coverage test as we have removed this utility # Remove the coverage test as we have removed this utility
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go 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/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go