wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

parser: merge nested dynamic attributes

Browse source 
Fixes https://github.com/NixOS/nix/issues/7115
This commit is contained in:
Naïm Favier 2023-07-08 12:28:13 +02:00
parent 85d0eb6316
commit 570a1a3ad7
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
6 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libexpr/parser.y
View file

@ -137,6 +137,7 @@ static void addAttr(ExprAttrs * attrs, AttrPath && attrPath,
dupAttr(state, ad.first, j2->second.pos, ad.second.pos);
jAttrs->attrs.emplace(ad.first, ad.second);
}
jAttrs->dynamicAttrs.insert(jAttrs->dynamicAttrs.end(), ae->dynamicAttrs.begin(), ae->dynamicAttrs.end());
} else {
dupAttr(state, attrPath, pos, j->second.pos);
}