nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 04:00:59 +01:00
Code Activity

Added backwards compatib. but still something... remains that changes the hashes .... :(

Browse source
This commit is contained in:
Wouter den Breejen 2007-05-21 23:42:20 +00:00
parent 802d7f40bd
commit 09b8b7efbc
4 changed files with 99 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libexpr/primops.cc
View file

@ -553,18 +553,21 @@ static Expr prim_derivationStrict(EvalState & state, const ATermVector & args)
/* Construct the final derivation store expression. */
drv.env["out"] = outPath;
drv.outputs["out"] = DerivationOutput(outPath, outputHashAlgo, outputHash);
//only add state when we have to to keep compitibilty with the 'old' format.
if(enableState){
/* Add the state path based on the outPath */
string callingUser = "wouterdb"; //TODO: Change into variable
string componentHash = printHash(hashDerivationModulo(state, drv)); //hash of the component path
Hash statehash = hashString(htSHA256, stateIndentifier + callingUser + componentHash); //hash of the state path
Path stateOutPath = makeStatePath("stateOutput:statepath", statehash, drvName); //
/* Add the state path based on the outPath */
string callingUser = "wouterdb"; //TODO: Change into variable
string componentHash = printHash(hashDerivationModulo(state, drv)); //hash of the component path
Hash statehash = hashString(htSHA256, stateIndentifier + callingUser + componentHash); //hash of the state path
Path stateOutPath = makeStatePath("stateOutput:statepath", statehash, drvName); //
drv.env["statepath"] = stateOutPath;
string enableStateS = bool2string(enableState && disableState);
string createDirsBeforeInstallS = bool2string(createDirsBeforeInstall);
drv.env["statepath"] = stateOutPath;
string enableStateS = bool2string(enableState && disableState);
string createDirsBeforeInstallS = bool2string(createDirsBeforeInstall);
drv.stateOutputs["state"] = DerivationStateOutput(stateOutPath, outputHashAlgo, outputHash, enableStateS, shareState, syncState, createDirsBeforeInstallS);
drv.stateOutputs["state"] = DerivationStateOutput(stateOutPath, outputHashAlgo, outputHash, enableStateS, shareState, syncState, createDirsBeforeInstallS);
}
/* Write the resulting term into the Nix store directory. */
Path drvPath = writeDerivation(drv, drvName);