public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3953 from lethalman/combined

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release-combined.nix
View File

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

2
pkgs/top-level/release-lib.nix
View File

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