Merge branch 'master' into staging

There have been some larger security rebuilds on master.
2017-02-01 15:56:35 +01:00
parent 9cd2dbc569 05ee54782e
commit a2e7770b51
100 changed files with 2444 additions and 1668 deletions
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
  checkPhase = "make test";

  preInstall = ''
-    mkdir -p $out/{man/man1,bin,lib,include}
+    mkdir -p $out/{bin,lib,include}
  '';

  meta = with stdenv.lib; {