diff options
| author | Mateusz Kowalczyk <mk440@bath.ac.uk> | 2014-09-26 07:42:22 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <mk440@bath.ac.uk> | 2014-09-26 07:42:22 +0100 |
| commit | 2907d31248f97859318dfff17c788967beef7ac6 (patch) | |
| tree | 62905cd25d054b5b71dee42dfc7364615404bb6d /pkgs/development | |
| parent | 7b313b91fcc1af64f2b30a4042a008ab798f3f83 (diff) | |
| parent | e541add0c77a9f8a424101332aa3360378ac002d (diff) | |
| download | nixlib-2907d31248f97859318dfff17c788967beef7ac6.tar nixlib-2907d31248f97859318dfff17c788967beef7ac6.tar.gz nixlib-2907d31248f97859318dfff17c788967beef7ac6.tar.bz2 nixlib-2907d31248f97859318dfff17c788967beef7ac6.tar.lz nixlib-2907d31248f97859318dfff17c788967beef7ac6.tar.xz nixlib-2907d31248f97859318dfff17c788967beef7ac6.tar.zst nixlib-2907d31248f97859318dfff17c788967beef7ac6.zip | |
Merge pull request #4277 from matejc/fixothergos
go 1.1 and 1.2: fix builds by removing one test
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/go/1.1.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.2.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index dfb545bb368d..e54d12ef9c50 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation { sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go '' + stdenv.lib.optionalString removeGodocExternals '' sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html ''; diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index b519b96415bd..8567337be0b5 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation { sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go ''; patches = [ ./cacert-1.2.patch ]; |