Try pkg.meta.position before unsafeGetAttrPos #247
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
pbsds
force-pushed
the
use-meta-position
branch
2 times, most recently
from
e2d9ad0
to
1aede84
Compare
Mic92
reviewed
May 4, 2024
nix_update/eval.py
Outdated
| else if (builtins.unsafeGetAttrPos "src" pkg) != null then | ||
| sanitizePosition (builtins.unsafeGetAttrPos "src" pkg) | ||
| else | ||
| sanitizePosition (positionFromMeta pkg); |
There was a problem hiding this comment.
If we have meta.position, should it not be preferred over src?
There was a problem hiding this comment.
i was trying to change as little of existing behaviour as possible, by if you're on board with this change then why not.
pbsds
changed the title
Mic92
reviewed
May 7, 2024
nix_update/eval.py
Outdated
| @@ -142,13 +142,22 @@ def eval_expression( | |||
| return f""" | |||
| let | |||
| {indent(dedent(let_bindings), " ")} | |||
| positionFromMeta = pkg: let | |||
| parts = builtins.match "(.*):([0-9]+)" pkg.meta.position; | |||
| in if pkg ? meta.position then {{ | |||
There was a problem hiding this comment.
Do we need this if here? It's already checked on line 158. Also would make the code slightly simpler.
Mic92
reviewed
May 8, 2024
nix_update/eval.py
Outdated
| raw_version_position = sanitizePosition (builtins.unsafeGetAttrPos "version" pkg); | ||
|
|
||
| position = if pkg ? isRubyGem then | ||
| raw_version_position | ||
| else if pkg ? isPhpExtension then | ||
| raw_version_position | ||
| else | ||
| else if pkg ? meta.position then | ||
| sanitizePosition (positionFromMeta pkg) |
There was a problem hiding this comment.
I think we can even overrule the quirks for ruby gems and php here, I would say.
pbsds
changed the title
Fixes `nixpkgs.mpvScripts.*`, discovered while reviewing NixOS/nixpkgs#308062
|
@mergify queue |
✅ The pull request has been merged automaticallyThe pull request has been merged automatically at 63b5a4e |
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.
Some package builders set
meta.positionmanually due to clobbering the origin ofsrc.Fixes
nix-update -u mpvScripts.*, discovered while reviewing NixOS/nixpkgs#308062.