diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index 926cac086e..c9cab2eef3 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -57,8 +57,9 @@ are: - In order to be less verbose, stack traces no longer show - calls to builtin functions. + Stack traces are less verbose: they no longer show calls to + builtin functions and only show a single line for each derivation + on the call stack. diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 0585f5bbe0..30dd15ac0d 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -394,10 +394,8 @@ static void prim_derivationStrict(EvalState & state, Value * * args, Value & v) } } catch (Error & e) { - e.addPrefix(format("while evaluating the derivation attribute `%1%' at %2%:\n") - % key % *i->pos); - e.addPrefix(format("while instantiating the derivation named `%1%' at %2%:\n") - % drvName % posDrvName); + e.addPrefix(format("while evaluating the attribute `%1%' of the derivation `%2%' at %3%:\n") + % key % drvName % posDrvName); throw; } }