diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-06 17:15:11 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-06 17:15:11 -0700 |
| commit | ae28ff8b91b5d89add314d10c22467d224e2b953 (patch) | |
| tree | fa8bfa0af5c34266c142001543c1168c7a384af3 /pkgs/applications/window-managers | |
| parent | b35da0edee1d1e035d1b1b68827c5d632e1652b7 (diff) | |
| parent | 9eae9dd811b5704c8d8f0d014f0583a43de0911e (diff) | |
| download | nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.tar nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.tar.gz nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.tar.bz2 nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.tar.lz nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.tar.xz nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.tar.zst nixlib-ae28ff8b91b5d89add314d10c22467d224e2b953.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/i3/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 21836bd4fffb..b5029d3c1416 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -24,7 +24,13 @@ stdenv.mkDerivation rec { patchShebangs . ''; - doCheck = stdenv.system == "x86_64-linux"; + # Tests have been failing (at least for some people in some cases) + # and have been disabled until someone wants to fix them. Some + # initial digging uncovers that the tests call out to `git`, which + # they shouldn't, and then even once that's fixed have some + # perl-related errors later on. For more, see + # https://github.com/NixOS/nixpkgs/issues/7957 + doCheck = false; # stdenv.system == "x86_64-linux"; checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' @@ -60,4 +66,3 @@ stdenv.mkDerivation rec { }; } - |