From 70f75be199d8db959d313dc40111893fba56415f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Oct 2012 15:22:25 -0400 Subject: getDerivation(): Don't always quietly ignore assertion failure Ignoring assertion failures makes some sense for nix-env -qa, but not for nix-instantiate/nix-build or hydra-eval-jobs. --- src/nix-env/nix-env.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nix-env/nix-env.cc') diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index bb6df32d0fd0..5e171d0a0b3b 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -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; } -- cgit 1.4.1