Merge branch 'staging'

This commit is contained in:
Thomas Tuegel
2016-10-06 09:51:02 -05:00
95 changed files with 1365 additions and 1895 deletions

View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l";
};
outputDocdev = "out";
outputDevdoc = "out";
preConfigure = "
patchShebangs ./configure