Skip to content

registry: fix symlinked flake registry files broken by convert-end-exes #15314

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

Merged
Ericson2314 merged 1 commit into from
Feb 21, 2026
Merged

registry: fix symlinked flake registry files broken by convert-end-exes #15314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/libfetchers/registry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static std::shared_ptr<Registry> getGlobalRegistry(const Settings & settings, St
store2->addPermRoot(storePath, (getCacheDir() / "flake-registry.json").string());
return {store.requireStoreObjectAccessor(storePath)};
} else {
return SourcePath{makeFSSourceAccessor(path)}.resolveSymlinks();
return SourcePath{getFSSourceAccessor(), CanonPath{path}}.resolveSymlinks();
Copy link
Contributor

@xokdvium xokdvium Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

@Ericson2314 Ericson2314 Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I want to do try that too. I'll merge this as fixing the bug and testing is priority no. 1 though.

}
}(),
Registry::Global);
Expand Down
6 changes: 6 additions & 0 deletions tests/functional/flakes/flakes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ nix store gc
nix registry list --flake-registry "file://$registry" --refresh | grepQuiet flake3
mv "$registry.tmp" "$registry"

# A symlinked registry file should work even when the symlink target is
# an absolute path. The source accessor needs to be rooted at `/` for this.
ln -sfn "$registry" "$TEST_ROOT/registry-symlink.json"
nix registry list --flake-registry "$TEST_ROOT/registry-symlink.json" | grepQuiet flake1
rm "$TEST_ROOT/registry-symlink.json"

# Ensure that locking ignores the user registry.
mkdir -p "$TEST_HOME/.config/nix"
ln -sfn "$registry" "$TEST_HOME/.config/nix/registry.json"
Expand Down
Loading