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

Merge pull request #222742 from wegank/patterns-fix

Browse Source 
stdenv: fix error with patterned platforms
This commit is contained in:
Weijia Wang
2023-03-23 18:43:23 +02:00
committed by GitHub
parent 76786cd4fc 2a7e1e0228
commit d91ee29e40
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/check-meta.nix
+2 -1
View File
@@ -113,6 +113,7 @@ let
showLicenseOrSourceType = value: toString (map (v: v.shortName or "unknown") (lib.lists.toList value));
showLicense = showLicenseOrSourceType;
showPlatforms = value: lib.optionalString (builtins.isList value && builtins.all builtins.isString value) (toString value);
showSourceType = showLicenseOrSourceType;
pos_str = meta: meta.position or "«unknown-file»";
@@ -368,7 +369,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
{ valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${toString attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; }
{ valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${showPlatforms attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; }
else if !(hasAllowedInsecure attrs) then
{ valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; }