From 8fc36e2c6a91c012650b1a6a133813585c6405fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 May 2024 16:49:20 +0200 Subject: [PATCH] Fix concatenating to an attrset 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 --- src/libexpr/eval.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 30313c87881..78da0b05a7d 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -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),