Skip to content

Commit

Permalink
Fix concatenating to an attrset
Browse files Browse the repository at this point in the history
This code caused firstType to be set to nPath rather than
nAttrs. That's probably better, but it broke compatibility:
https://hydra.nixos.org/build/258397002
  • Loading branch information
edolstra committed May 6, 2024
1 parent 2cb003c commit 8fc36e2
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/libexpr/eval.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2044,11 +2044,6 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
Value * vTmp = vTmpP++;
i->eval(state, env, *vTmp);

if (vTmp->type() == nAttrs) {
if (auto j = vTmp->attrs()->get(state.sOutPath))
vTmp = j->value;
}

/* If the first element is a path, then the result will also
be a path, we don't copy anything (yet - that's done later,
since paths are copied when they are used in a derivation),
Expand Down

0 comments on commit 8fc36e2

Please sign in to comment.