diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-07-06 16:40:10 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-07-06 16:40:10 +0200 |
| commit | 54712aaf8a4d9d6a42232fe9b360fc72f35ed02d (patch) | |
| tree | 02f1ad7cb8628ed5877ed411a7ed67b3c0917da9 /src/libexpr/flake | |
| parent | 6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0 (diff) | |
| parent | 14227aeb327798a1446ddde59fc561c3d2e6b7a8 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libexpr/flake')
| -rw-r--r-- | src/libexpr/flake/flake.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 871af07b0..fd168b74f 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -123,7 +123,7 @@ static FlakeInput parseFlakeInput(EvalState & state, attr.name, showType(*attr.value)); } } catch (Error & e) { - e.addPrefix(fmt("in flake attribute '%s' at '%s':\n", attr.name, *attr.pos)); + e.addTrace(*attr.pos, hintfmt("in flake attribute '%s'", attr.name)); throw; } } @@ -132,7 +132,7 @@ static FlakeInput parseFlakeInput(EvalState & state, try { input.ref = FlakeRef::fromAttrs(attrs); } catch (Error & e) { - e.addPrefix(fmt("in flake input at '%s':\n", pos)); + e.addTrace(pos, hintfmt("in flake input")); throw; } else { @@ -195,7 +195,7 @@ static Flake getFlake( Value vInfo; state.evalFile(flakeFile, vInfo, true); // FIXME: symlink attack - expectType(state, tAttrs, vInfo, Pos(state.symbols.create(flakeFile), 0, 0)); + expectType(state, tAttrs, vInfo, Pos(foFile, state.symbols.create(flakeFile), 0, 0)); auto sEdition = state.symbols.create("edition"); // FIXME: remove soon |