Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
@@ -73,7 +73,8 @@ let
    # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
    # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
    # and {Open,Free}BSD.
-    doCheck = stdenv ? glibc;
+    # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
+    doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store";

    # Saw random failures like ‘help2man: can't get '--help' info from
    # man/sha512sum.td/sha512sum’.