Parser: Respect the accessor of the source file for relative paths#12430
Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom Feb 10, 2025
Merged
Conversation
Previously we only returned paths in rootFS, which is wrong and only worked because currently all our source trees are in rootFS.
Ericson2314
reviewed
Feb 6, 2025
| : PATH { | ||
| Path path(absPath(std::string_view{$1.p, $1.l}, state->basePath.path.abs())); | ||
| std::string_view literal({$1.p, $1.l}); | ||
| Path path(absPath(literal, state->basePath.path.abs())); |
Member
There was a problem hiding this comment.
This absPath is only needed in one of the new branches below, can you move it down?
Member
Author
There was a problem hiding this comment.
It's always needed because it canonicalizes the path.
Member
There was a problem hiding this comment.
OK I think we need to canonicalize with respect to the accessor, but this is a bit of long-standing separate technical debt, so fine for now.
Ericson2314
approved these changes
Feb 10, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Motivation
Previously we only returned paths in rootFS, which is wrong and only worked because currently all our source trees are in rootFS. However, starting in #12421, this is no longer the case. (Namely, the initial parse of
flake.nixuses a lazy source tree.)Context
Cherry-picked from #12421 and slightly adapted from lazy-trees.
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.