diff options
| author | Shea Levy <shea@shealevy.com> | 2018-04-09 06:23:31 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-17 16:02:15 -0400 |
| commit | 3955b846984201b190ee72bbd0c65ba5c4067d91 (patch) | |
| tree | 1b79759fdcd3373b493ec567ab5d2996b7a17764 /pkgs/stdenv/generic/check-meta.nix | |
| parent | 3458776bb1f5b5cf645428cd8ab35f70fd43199e (diff) | |
| download | nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.tar nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.tar.gz nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.tar.bz2 nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.tar.lz nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.tar.xz nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.tar.zst nixlib-3955b846984201b190ee72bbd0c65ba5c4067d91.zip | |
meta: Don't bypass unsupported platforms with allowBroken.
Our platforms are open-world oriented these days, and anyway there's allowUnsupportedSystem.
Diffstat (limited to 'pkgs/stdenv/generic/check-meta.nix')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26522ad6045e..24b5205ffe6f 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -75,6 +75,7 @@ let remediation = { unfree = remediate_whitelist "Unfree"; broken = remediate_whitelist "Broken"; + unsupported = remediate_whitelist "UnsupportedSystem"; blacklisted = x: ""; insecure = remediate_insecure; unknown-meta = x: ""; @@ -192,8 +193,8 @@ 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 !allowUnsupportedSystem && !allowBroken && !(checkPlatform attrs) then - { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } + else if !allowUnsupportedSystem && !(checkPlatform attrs) then + { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then |