From 57a30e101b36a064f09619bf4a3f0b8a3fdcdcad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Jul 2017 16:06:10 +0200 Subject: nix search: Ignore top-level eval errors $NIX_PATH may contain elements that don't evaluate to an attrset (like "nixos-config"), so ignore those. --- src/nix/search.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/nix/search.cc') diff --git a/src/nix/search.cc b/src/nix/search.cc index 8aac06ad2cd3..970dcb9834b9 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -54,6 +54,8 @@ struct CmdSearch : SourceExprCommand, MixJSON auto jsonOut = json ? std::make_unique(std::cout, true) : nullptr; + auto sToplevel = state->symbols.create("_toplevel"); + doExpr = [&](Value * v, std::string attrPath, bool toplevel) { debug("at attribute ‘%s’", attrPath); @@ -123,7 +125,7 @@ struct CmdSearch : SourceExprCommand, MixJSON if (j == attrs->end() || !state->forceBool(*j->value, *j->pos)) return; } - Bindings::iterator j = v->attrs->find(state->symbols.create("_toplevel")); + Bindings::iterator j = v->attrs->find(sToplevel); bool toplevel2 = j != v->attrs->end() && state->forceBool(*j->value, *j->pos); for (auto & i : *v->attrs) { @@ -134,6 +136,11 @@ struct CmdSearch : SourceExprCommand, MixJSON } } catch (AssertionError & e) { + } catch (Error & e) { + if (!toplevel) { + e.addPrefix(fmt("While evaluating the attribute ‘%s’:\n", attrPath)); + throw; + } } }; -- cgit 1.4.1