Skip to content

Fix, improve and test error traces #15832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
layus wants to merge 9 commits into
base: master
Choose a base branch
from
+1,286 −36
Draft

Fix, improve and test error traces #15832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21f6cee
Add structured trace display tests
layus May 9, 2026
890baa3
Move truncation message to top, truncate outer frames instead of inner
layus May 9, 2026
9b25a88
Add golden-string tests for rendered error trace output
layus May 9, 2026
6e0ae8d
Add 'at <pos>' to the summary line on error output
layus May 9, 2026
720ca01
Add EvalContextGuard at all major evaluation entry points
layus May 9, 2026
2d0e733
Make outermost EvalContextGuard win, inner guards are no-ops
layus May 9, 2026
c61690f
Move EvalContextGuard to dedicated eval-context.hh header
layus May 9, 2026
c9dd59e
Fix evalContext not being set for --expr/--file evaluations
layus May 11, 2026
1e8938a
Add evalContext tests and formatting improvements
layus May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libcmd/installable-attr-path.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "nix/cmd/installable-attr-path.hh"
#include "nix/util/eval-context.hh"
#include "nix/store/outputs-spec.hh"
#include "nix/util/util.hh"
#include "nix/cmd/command.hh"
Expand Down Expand Up @@ -36,6 +37,7 @@ std::pair<Value *, PosIdx> InstallableAttrPath::toValue(EvalState & state)

DerivedPathsWithInfo InstallableAttrPath::toDerivedPaths()
{
EvalContextGuard ctx(fmt("during evaluation of attribute '%s'", attrPath));
auto [v, pos] = toValue(*state);

if (std::optional derivedPathWithInfo =
Expand Down
2 changes: 2 additions & 0 deletions src/libcmd/installable-flake.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "nix/cmd/installable-flake.hh"
#include "nix/util/eval-context.hh"
#include "nix/store/outputs-spec.hh"
#include "nix/util/util.hh"
#include "nix/cmd/command.hh"
Expand Down Expand Up @@ -66,6 +67,7 @@ InstallableFlake::InstallableFlake(

DerivedPathsWithInfo InstallableFlake::toDerivedPaths()
{
EvalContextGuard ctx(fmt("during evaluation of installable '%s'", what()));
Activity act(*logger, lvlTalkative, actUnknown, fmt("evaluating derivation '%s'", what()));

auto attr = getCursor(*state);
Expand Down
5 changes: 5 additions & 0 deletions src/libcmd/installables.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "nix/store/globals.hh"
#include "nix/cmd/installables.hh"
#include "nix/util/eval-context.hh"
#include "nix/cmd/installable-derived-path.hh"
#include "nix/cmd/installable-attr-path.hh"
#include "nix/cmd/installable-flake.hh"
Expand Down Expand Up @@ -461,6 +462,10 @@ Installables SourceExprCommand::parseInstallables(ref<Store> store, std::vector<
auto state = getEvalState();
auto vFile = state->allocValue();

EvalContextGuard ctx(
expr ? fmt("during evaluation of expression '%s'", *expr)
: fmt("during evaluation of file '%s'", file->string()));

if (file == "-") {
auto e = state->parseStdin();
state->eval(e, *vFile);
Expand Down
3 changes: 3 additions & 0 deletions src/libcmd/repl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <memory>

#include "nix/util/error.hh"
#include "nix/util/eval-context.hh"
#include "nix/cmd/repl-interacter.hh"
#include "nix/cmd/repl.hh"

Expand Down Expand Up @@ -688,6 +689,7 @@ ProcessLineResult NixRepl::processLine(std::string line)

void NixRepl::loadFile(const std::filesystem::path & path)
{
EvalContextGuard ctx(fmt("during loading of '%s'", path.string()));
Value v, v2;
state->evalFile(lookupFileArg(*state, path.string()), v);
state->autoCallFunction(*autoArgs, v, v2);
Expand Down Expand Up @@ -905,6 +907,7 @@ ExprAttrs * NixRepl::parseReplBindings(std::string s)

void NixRepl::evalString(std::string s, Value & v)
{
EvalContextGuard ctx(fmt("during evaluation of REPL expression '%s'", s));
Expr * e = parseString(s);
e->eval(*state, *env, v);
state->forceValue(v, v.determinePos(noPos));
Expand Down
Loading
Loading