Fix flake evaluation in chroot stores #10345
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
This is a temporary fix until we can pass `SourcePath`s rather than `StorePath`s to `call-flake.nix`. Fixes NixOS#10331.
This was referenced Mar 27, 2024
thufschmitt
previously requested changes
Mar 29, 2024
Comment on lines
+762
to
+767
| auto path = sourcePath.path.abs(); | ||
| if (auto store = state.store.dynamic_pointer_cast<LocalFSStore>()) { | ||
| auto realStoreDir = store->getRealStoreDir(); | ||
| if (isInDir(path, realStoreDir)) | ||
| path = store->storeDir + path.substr(realStoreDir.size()); | ||
| } |
There was a problem hiding this comment.
Can't this use store.getFSAccessor->toRealPath()?
There was a problem hiding this comment.
No because this does the opposite (it converts a real path to a store path).
github-actions
bot
added
the
with-tests
edolstra
force-pushed
the
fix-chroot-flakes
branch
from
3cc22ab
to
8930772
Compare
thufschmitt
approved these changes
Apr 2, 2024
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2023-03-27-nix-team-meeting-134/42961/1 |
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.
Motivation
This is a temporary fix until we can pass
SourcePaths rather thanStorePaths tocall-flake.nix.Fixes #10331, #10267.
Context
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.