lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Evaluate attributes in sorted order for better determinism.

Browse source
This commit is contained in:
Eelco Dolstra 2008-08-25 14:31:29 +00:00
parent c4f1c2114b
commit abec1c0004
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libexpr/get-drvs.cc
View file

@ -175,19 +175,28 @@ static void getDerivations(EvalState & state, Expr e,
nix-env.cc. */ nix-env.cc. */
bool combineChannels = drvMap.get(toATerm("_combineChannels")); bool combineChannels = drvMap.get(toATerm("_combineChannels"));
for (ATermMap::const_iterator i = drvMap.begin(); i != drvMap.end(); ++i) { /* Consider the attributes in sorted order to get more
startNest(nest, lvlDebug, deterministic behaviour in nix-env operations (e.g. when
format("evaluating attribute `%1%'") % aterm2String(i->key)); there are names clashes between derivations, the derivation
string pathPrefix2 = addToPath(pathPrefix, aterm2String(i->key)); bound to the attribute with the "lower" name should take
precedence). */
typedef std::map<string, Expr> AttrsSorted;
AttrsSorted attrsSorted;
foreach (ATermMap::const_iterator, i, drvMap)
attrsSorted[aterm2String(i->key)] = i->value;
foreach (AttrsSorted::iterator, i, attrsSorted) {
startNest(nest, lvlDebug, format("evaluating attribute `%1%'") % i->first);
string pathPrefix2 = addToPath(pathPrefix, i->first);
if (combineChannels) if (combineChannels)
getDerivations(state, i->value, pathPrefix2, autoArgs, drvs, doneExprs); getDerivations(state, i->second, pathPrefix2, autoArgs, drvs, doneExprs);
else if (getDerivation(state, i->value, pathPrefix2, drvs, doneExprs)) { else if (getDerivation(state, i->second, pathPrefix2, drvs, doneExprs)) {
/* If the value of this attribute is itself an /* If the value of this attribute is itself an
attribute set, should we recurse into it? => Only attribute set, should we recurse into it? => Only
if it has a `recurseForDerivations = true' if it has a `recurseForDerivations = true'
attribute. */ attribute. */
ATermList es; ATermList es;
Expr e = evalExpr(state, i->value), e2; Expr e = evalExpr(state, i->second), e2;
if (matchAttrs(e, es)) { if (matchAttrs(e, es)) {
ATermMap attrs(ATgetLength(es)); ATermMap attrs(ATgetLength(es));
queryAllAttrs(e, attrs, false); queryAllAttrs(e, attrs, false);