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

2016-07-21 00:56:43 +00:00
parent cc540843fe db7b4fb073
commit 1f04b4a566
226 changed files with 6549 additions and 1215 deletions
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "1b71hb42lh33y9843nd1mxlwkk9qh9ajvnz6ivzd1jq9lav4x7ph";
  };

-  buildInputs = [ lzip ];
+  nativeBuildInputs = [ lzip ];

  doCheck = true;