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

This commit is contained in:
Robin Gloster
2016-08-03 13:34:44 +00:00
1099 changed files with 2664 additions and 513 deletions

View File

@@ -25,5 +25,6 @@ stdenv.mkDerivation {
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -97,6 +97,6 @@ stdenv.mkDerivation rec {
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://matthewwild.co.uk/projects/luaexpat";
hydraPlatforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.flosse ];
};
}

View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/brunoos/luasec";
hydraPlatforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.flosse ];
};
}