puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Keep the isFlake attribute for overriden inputs

Browse source 
When overriding an input that isn’t a flake, mark the override as also not
being a flake.

Fix #3774
This commit is contained in:
regnat 2021-06-29 13:53:56 +02:00
parent 81535022dc
commit 4cff8188a5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/flake/flake.cc
View file

@ -359,7 +359,12 @@ LockedFlake lockFlake(
ancestors? */ ancestors? */
auto i = overrides.find(inputPath); auto i = overrides.find(inputPath);
bool hasOverride = i != overrides.end(); bool hasOverride = i != overrides.end();
if (hasOverride) overridesUsed.insert(inputPath); if (hasOverride) {
overridesUsed.insert(inputPath);
// Respect the “flakeness” of the input even if we
// override it
i->second.isFlake = input2.isFlake;
}
auto & input = hasOverride ? i->second : input2; auto & input = hasOverride ? i->second : input2;
/* Resolve 'follows' later (since it may refer to an input /* Resolve 'follows' later (since it may refer to an input