diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
| commit | 6748534d83fa05cc6dee0f11bce543f7672b351f (patch) | |
| tree | a0d303182dd9e0c8ae149316270b732715e9ae64 /pkgs/development/compilers/go | |
| parent | 4f7cdd35d58e3d32ba576e218316b3c835bc508c (diff) | |
| parent | 3510b983c41196fce90729289c8c300ada1ccaea (diff) | |
| download | nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.gz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.bz2 nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.lz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.xz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.zst nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers/go')
| -rw-r--r-- | pkgs/development/compilers/go/1.10.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index a6639d643dcf..23e7ec222a63 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -76,6 +76,10 @@ stdenv.mkDerivation rec { sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go # Remove cert tests that conflict with NixOS's cert resolution sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_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.9.nix b/pkgs/development/compilers/go/1.9.nix index 6a92775e0c25..8ef528e2c92a 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -76,6 +76,10 @@ stdenv.mkDerivation rec { sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go # Remove cert tests that conflict with NixOS's cert resolution sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_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 |