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

2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
  };

-  buildInputs = [ perl xz ]
+  buildInputs = [ perl xz.bin ]
    ++ optional interactive ncurses
    ++ optional doCheck procps; # for tests