diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-05-27 13:52:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 13:52:50 +0200 |
| commit | eeeaba31f897db901dba5734b2436fe97dadb033 (patch) | |
| tree | 064c5bd2e207797d9ab804cfad0155300b7043ad /pkgs/development | |
| parent | 7d954312beaf25486482c10bb20ceb6acde3711b (diff) | |
| parent | b9bea6b17f64bf0e29a253855b95d76c1565d6ac (diff) | |
| download | nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.tar nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.tar.gz nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.tar.bz2 nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.tar.lz nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.tar.xz nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.tar.zst nixlib-eeeaba31f897db901dba5734b2436fe97dadb033.zip | |
Merge pull request #26139 from LnL7/armv7l-go
go: disable failing tests on arm
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 81b7f4bce1dd..8e0b1c7360f5 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isArm '' + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true |