Merge master into staging

This commit is contained in:
Frederik Rietdijk
2018-10-13 09:48:20 +02:00
309 changed files with 11221 additions and 3339 deletions
+1 -1
View File
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) ''
rm $out/share/man/man1/*
cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
cp ${buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1
''
# du: 8.7 M locale + 0.4 M man pages
+ optionalString minimal ''