diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 8b2cf01f169b..8544d932f81c 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -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"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a08bca2e66a0..84db868ced3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index ddc449ae59c1..c852ace7d7c6 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -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; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e73f6f4f1129..41ab5da8067d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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