Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check-meta.nix: use meta.availableOn #208686

Closed
wants to merge 4 commits into from
Closed

check-meta.nix: use meta.availableOn #208686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9c4720
check-meta.nix: use meta.availableOn
Jan 1, 2023
080c6e8
update check-meta types
Jan 2, 2023
2df2202
lib/meta.nix: make availableOn work when meta.platforms is missing
Dec 24, 2022
6ddf9b9
add a silly whitespace change to force ofborg to rerun EditorConfig
Jan 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/meta.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ rec {
2. None of `meta.badPlatforms` pattern matches the given platform.
*/
availableOn = platform: pkg:
lib.any (platformMatch platform) pkg.meta.platforms &&
((! pkg?meta.platforms) || lib.any (platformMatch platform) pkg.meta.platforms) &&
lib.all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []);

/* Get the corresponding attribute in lib.licenses
Expand Down
6 changes: 2 additions & 4 deletions pkgs/stdenv/generic/check-meta.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ let

isMarkedBroken = attrs: attrs.meta.broken or false;

hasUnsupportedPlatform = attrs:
(!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) ||
lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or []));
hasUnsupportedPlatform = attrs: !(lib.meta.availableOn hostPlatform attrs);

isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) != [];

Expand Down Expand Up @@ -272,7 +270,7 @@ let
sourceProvenance = either (listOf (attrsOf anything)) (attrsOf anything);
maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix
priority = int;
platforms = listOf str;
platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch
hydraPlatforms = listOf str;
broken = bool;
unfree = bool;
Expand Down