Merge pull request #3953 from lethalman/combined

release: don't build broken packages, don't build tested on unsupported systems
This commit is contained in:
Eelco Dolstra 2014-09-05 10:46:42 +02:00
commit 002b067750
2 changed files with 3 additions and 1 deletions

View File

@ -34,7 +34,7 @@ in rec {
maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
};
constituents =
let all = x: [ x.x86_64-linux x.i686-linux ]; in
let all = x: map (p: x.${p}) supportedSystems; in
[ nixos.channel
(all nixos.manual)

View File

@ -123,6 +123,8 @@ rec {
packagesWithMetaPlatform attrSet
else if attrSet.recurseForRelease or false then
packagesWithMetaPlatform attrSet
else if attrSet.meta.broken or false then
[]
else
attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []);