maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Support for fixed-output hashes over directory trees (i.e., over the

Browse source 
NAR dump of the path).
This commit is contained in:
Eelco Dolstra 2005-02-22 21:14:41 +00:00
parent eda2c3c253
commit 3a2c3f0cf2
3 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/primops.cc
View file

@ -194,6 +194,7 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args)
string outputHash;
string outputHashAlgo;
bool outputHashRecursive = false;
for (ATermIterator i(attrs.keys()); i; ++i) {
string key = aterm2String(*i);
@ -228,6 +229,11 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args)
else if (key == "name") drvName = s;
else if (key == "outputHash") outputHash = s;
else if (key == "outputHashAlgo") outputHashAlgo = s;
else if (key == "outputHashMode") {
if (s == "recursive") outputHashRecursive = true;
else if (s == "flat") outputHashRecursive = false;
else throw Error(format("invalid value `%1%' for `outputHashMode' attribute") % s);
}
}
}
@ -255,6 +261,7 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args)
h = parseHash32(ht, outputHash);
string s = outputHash;
outputHash = printHash(h);
if (outputHashRecursive) outputHashAlgo = "r:" + outputHashAlgo;
}
/* Check the derivation name. It shouldn't contain whitespace,