Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Eelco Dolstra
2016-09-29 13:06:14 +02:00
59 changed files with 569 additions and 280 deletions
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
outputDocdev = "out";
meta = with stdenv.lib; {
description = "Linux development manual pages";