Merge pull request #300211 from K900/fix-check-meta

stdenv/check-meta: don't infrec on unsupported platforms
This commit is contained in:
K900 2024-03-30 14:43:44 +03:00 committed by GitHub
commit f4a04eea5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -424,7 +424,7 @@ let
else if !allowBroken && attrs.meta.broken or false then
{ valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }
else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then
let toPretty = toPretty {
let toPretty' = toPretty {
allowPrettyValues = true;
indent = " ";
};
@ -432,8 +432,8 @@ let
errormsg = ''
is not available on the requested hostPlatform:
hostPlatform.config = "${hostPlatform.config}"
package.meta.platforms = ${toPretty (attrs.meta.platforms or [])}
package.meta.badPlatforms = ${toPretty (attrs.meta.badPlatforms or [])}
package.meta.platforms = ${toPretty' (attrs.meta.platforms or [])}
package.meta.badPlatforms = ${toPretty' (attrs.meta.badPlatforms or [])}
'';
}
else if !(hasAllowedInsecure attrs) then