check-meta(hasUnsupportedPlatform): use lib.meta.availableOn #195294
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
mentioned this pull request
2 tasks
ghost
marked this pull request as ready for review
ghost
requested review from
Ericson2314,
matthewbauer,
piegamesde,
edolstra,
nbp and
infinisil
as code owners
ofborg
bot
added
8.has: clean-up
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 1-10
10.rebuild-darwin: 0
lib/meta.nix
Outdated
Comment on lines
101
to
103
| if !(pkg?meta) then true else | ||
| (!(pkg.meta ? platforms) || | ||
| lib.any (platformMatch platform) pkg.meta.platforms) && |
There was a problem hiding this comment.
You can check the full attribute path using ?.
Suggested change
| if !(pkg?meta) then true else | |
| (!(pkg.meta ? platforms) || | |
| lib.any (platformMatch platform) pkg.meta.platforms) && | |
| if !(pkg ? meta.platforms) then true else | |
| lib.any (platformMatch platform) pkg.meta.platforms && |
There was a problem hiding this comment.
I think this altered the logic -- after the commit above meta.badPlatforms is ignored if meta.platforms is absent. I have adjusted for this in 194a4ea1a236.
ghost
mentioned this pull request
2 tasks
ghost
requested review from
sternenseemann
and removed request for
matthewbauer,
Ericson2314,
edolstra,
nbp,
piegamesde and
infinisil
`hasUnsupportedPlatform` was not updated with #37395, so it does not understand attrsets in `meta.[bad]platforms`. In particular, attrsets in `meta.badPlatforms` will "fail open" and be ignored. Let's use `lib.meta.availableOn` instead of duplicating its logic. Thanks to @alyssais for [noticing][1]. [1][#194148 (comment)] Co-authored-by: sternenseemann <sternenseemann@systemli.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
hasUnsupportedPlatformwas not updated with #37395, so it does not understand attrsets inmeta.[bad]platforms. In particular, attrsets inmeta.badPlatformswill "fail open" and be ignored.Let's use
lib.meta.availableOninstead of duplicating its logic.Thanks to @alyssais for noticing.
CC: @Ericson2314
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes