nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00
Code Activity

Call it "store derivation", again, but keep "derivation expression"

Browse source 
A compromise that also should cut down on the diff.
This commit is contained in:
John Ericson 2025-02-05 21:53:21 -05:00
parent f003b8ca92
commit 54d684e1de
35 changed files with 98 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/primops.cc
View file

@ -1510,7 +1510,7 @@ static void derivationStrictInternal(
}
else {
/* Compute a hash over the "masked" derivation, which is
/* Compute a hash over the "masked" store derivation, which is
the final one except that in the list of outputs, the
output paths are empty strings, and the corresponding
environment variables have an empty value. This ensures
@ -1556,7 +1556,7 @@ static void derivationStrictInternal(
printMsg(lvlChatty, "instantiated '%1%' -> '%2%'", drvName, drvPathS);
/* Optimisation, but required in read-only mode! because in that
case we don't actually write derivations, so we can't
case we don't actually write store derivations, so we can't
read them later. */
{
auto h = hashDerivationModulo(*state.store, drv, false);