Re-revert "Merge: glibc: 2.24 -> 2.25"

This reverts commit 55cc7700e9. I hope most problems have been solved. /cc #22874.
2017-02-20 21:16:41 +01:00
parent 0ff2179e0f
commit 09d02f72f6
4 changed files with 16 additions and 5 deletions
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort

-  doCheck = !stdenv.isDarwin;
+  # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
+  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");

  outputs = [ "out" "info" ];