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

This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
1470 changed files with 62103 additions and 28701 deletions
@@ -56,6 +56,5 @@ stdenv.mkDerivation rec {
'';
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
@@ -98,6 +98,5 @@ stdenv.mkDerivation rec {
'';
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
@@ -97,6 +97,5 @@ stdenv.mkDerivation rec {
'';
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}