Support relocated store; lightweight store module #82
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
... when configured with the NIX_STORE_DIR and NIX_REMOTE environment variables.
roberth
force-pushed
the
relocated-store-via-env
branch
from
14fe802
to
41a6ce9
Compare
Gabriella439
reviewed
Mar 2, 2024
src/Nix/Diff.hs
Outdated
| let string = path | ||
| text <- liftIO (readFileUtf8Lenient string) | ||
| case Data.Attoparsec.Text.parse Nix.Derivation.parseDerivation text of | ||
| let parser = Nix.Derivation.parseDerivationWith (StorePath <$> filepathParser) Nix.Derivation.textParser |
There was a problem hiding this comment.
Minor suggestion: maybe have filepathParser return a StorePath (an rename it to storepathParser
src/Nix/Diff/Store.hs
Outdated
Comment on lines
69
to
76
| stripSlash :: FilePath -> FilePath | ||
| stripSlash = reverse . dropWhile (== '/') . reverse | ||
|
|
||
| replaceStart :: String -> String -> String -> String | ||
| replaceStart pattern replacement text = | ||
| case L.stripPrefix pattern text of | ||
| Just rest -> replacement <> rest | ||
| Nothing -> text |
There was a problem hiding this comment.
Both of these operations will simpler and more efficient if you convert to Text (and then back to FilePath when you're done).
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.
Support relocated store when configured with the
NIX_STORE_DIRandNIX_REMOTEenvironment variables.This allows
nix-diffto be used in the sandbox with instantiations in a store whose physical location is in the build directory rather than the logicalstoreDir(/nix/store).This is achieved by changing introducing a
newtype StorePathto help distinguish paths that may be logical paths rather than physical ones.It is not a true abstraction in the sense that Nix's own store concept is, but that's ok. It makes this use case work, while still only relying on the ambient environment, requiring no types and variables for the store itself.
I plan to use this functionality for error reporting in evaluation tests that evaluate Nixpkgs for the purpose of testing Nix itself, in the context of Nixpkgs "passthru" tests and Nix's own CI setup.