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

Merge pull request #28174 from matthewbauer/darwin-in-release

Browse Source 
enable hydra jobs for packages x86_64-linux does not support
This commit is contained in:
Daiderd Jordan 2017-08-17 23:29:00 +02:00 committed by GitHub
commit 6a870a59f8
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/check-meta.nix
View File

@ -40,6 +40,8 @@ let
allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
allowUnsupportedSystem = config.allowUnsupportedSystem or false;
isUnfree = licenses: lib.lists.any (l:
!l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
@ -177,7 +179,7 @@ let
{ valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
else if !allowBroken && attrs.meta.broken or false then
{ valid = false; reason = "broken"; errormsg = "is marked as broken"; }
else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
{ valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; }
else if !(hasAllowedInsecure attrs) then
{ valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }

4
pkgs/top-level/all-packages.nix
View File

@ -11767,7 +11767,7 @@ with pkgs;
darwin = let
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
in apple-source-releases // rec {
in recurseIntoAttrs (apple-source-releases // rec {
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
inherit libobjc;
stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
@ -11811,7 +11811,7 @@ with pkgs;
usr-include = callPackage ../os-specific/darwin/usr-include {};
DarwinTools = callPackage ../os-specific/darwin/DarwinTools {};
};
});
devicemapper = lvm2;

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

@ -13,7 +13,7 @@ rec {
allPackages = args: packageSet (args // nixpkgsArgs);
pkgs = pkgsFor "x86_64-linux";
pkgs = packageSet (lib.recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs);
inherit lib;

7
pkgs/top-level/release.nix
View File

@ -109,8 +109,11 @@ let
ocamlPackages = { };
perlPackages = { };
# hack around broken eval of non-linux packages for now.
tests.macOSSierraShared = darwin;
darwin = packagePlatforms pkgs.darwin // {
cf-private = {};
osx_private_sdk = {};
xcode = {};
};
} ));
in jobs