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

getDerivation(): Don't always quietly ignore assertion failure

Browse source 
Ignoring assertion failures makes some sense for nix-env -qa, but not
for nix-instantiate/nix-build or hydra-eval-jobs.
This commit is contained in:
Eelco Dolstra 2012-10-04 15:22:25 -04:00
parent ad328bea15
commit 70f75be199
5 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nix-env/nix-env.cc
View file

@ -166,7 +166,7 @@ static void loadDerivations(EvalState & state, Path nixExprPath,
Value v;
findAlongAttrPath(state, pathPrefix, autoArgs, loadSourceExpr(state, nixExprPath), v);
getDerivations(state, v, pathPrefix, autoArgs, elems);
getDerivations(state, v, pathPrefix, autoArgs, elems, true);
/* Filter out all derivations not applicable to the current
system. */
@ -362,7 +362,7 @@ static void queryInstSources(EvalState & state,
Expr * e2 = state.parseExprFromString(*i, absPath("."));
Expr * call = new ExprApp(e2, e1);
Value v; state.eval(call, v);
getDerivations(state, v, "", instSource.autoArgs, elems);
getDerivations(state, v, "", instSource.autoArgs, elems, true);
}
break;
@ -417,7 +417,7 @@ static void queryInstSources(EvalState & state,
Value v;
findAlongAttrPath(state, *i, instSource.autoArgs,
loadSourceExpr(state, instSource.nixExprPath), v);
getDerivations(state, v, "", instSource.autoArgs, elems);
getDerivations(state, v, "", instSource.autoArgs, elems, true);
}
break;
}

4
src/nix-env/user-env.cc
View file

@ -25,7 +25,7 @@ DrvInfos queryInstalled(EvalState & state, const Path & userEnv)
Value v;
state.evalFile(manifestFile, v);
Bindings bindings;
getDerivations(state, v, "", bindings, elems);
getDerivations(state, v, "", bindings, elems, false);
} else if (pathExists(oldManifestFile))
readLegacyManifest(oldManifestFile, elems);
@ -127,7 +127,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
/* Evaluate it. */
debug("evaluating user environment builder");
DrvInfo topLevelDrv;
if (!getDerivation(state, topLevel, topLevelDrv))
if (!getDerivation(state, topLevel, topLevelDrv, false))
abort();
/* Realise the resulting store expression. */