registry: fix symlinked flake registry files broken by convert-end-exes#15314
Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom Feb 21, 2026
Merged
Conversation
This commit reverts to using `getFSSourceAccessor()` so absolute symlink targets resolve correctly, since `makeFSSourceAccessor(path)` roots the accessor at `path` and can't follow symlinks that escape it.
github-actions
bot
added
with-tests
xokdvium
approved these changes
Feb 21, 2026
xokdvium
reviewed
Feb 21, 2026
| return {store.requireStoreObjectAccessor(storePath)}; | ||
| } else { | ||
| return SourcePath{makeFSSourceAccessor(path)}.resolveSymlinks(); | ||
| return SourcePath{getFSSourceAccessor(), CanonPath{path}}.resolveSymlinks(); |
Contributor
There was a problem hiding this comment.
In the changes to the fd *at-based source accessor I debated adding a function that opens an accessor while following symlinks for this purpose. Would be nicer to use that eventually
Member
There was a problem hiding this comment.
Yes I want to do try that too. I'll merge this as fixing the bug and testing is priority no. 1 though.
Ericson2314
approved these changes
Feb 21, 2026
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
3 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
This commit reverts to using
getFSSourceAccessor()so absolute symlink targets resolve correctly, sincemakeFSSourceAccessor(path)roots the accessor atpathand can't follow symlinks that escape it.Context
std::filesystem::pathfrom XDG directory helpers #15311 (comment)Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.