summary refs log tree commit diff
path: root/pkgs/tools/misc/findutils
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-16 18:16:06 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-16 18:16:06 +0100
commit55cc7700e968001c9ac79190fbcf25ed3620680a (patch)
tree50f4ea8fdc20a2eaee14def3e348e2bc06c62a75 /pkgs/tools/misc/findutils
parent7832806e205493482b349c0a53dbc3e4b1412456 (diff)
downloadnixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.tar
nixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.tar.gz
nixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.tar.bz2
nixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.tar.lz
nixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.tar.xz
nixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.tar.zst
nixpkgs-55cc7700e968001c9ac79190fbcf25ed3620680a.zip
Revert "Merge: glibc: 2.24 -> 2.25"
This reverts commit 1daf2e26d221712dfbe72f9f6d2f73ef230cc43c, reversing
changes made to c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.

It seems this is what has been causing all the reliability problems
on Hydra.  I'm currently unable to find why it happens, so I'm forced
to revert the update for now.  Discussion: #22874.
Diffstat (limited to 'pkgs/tools/misc/findutils')
-rw-r--r--pkgs/tools/misc/findutils/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 549175ed7b0..1271aa8c986 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ coreutils ];
 
-  # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
-  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
+  doCheck = !stdenv.isDarwin;
 
   outputs = [ "out" "info" ];