forked from lix-project/lix
Move follows-check into its own function
This commit is contained in:
parent
411111a3bc
commit
1f771065f1
|
@ -353,26 +353,15 @@ LockedFlake lockFlake(
|
||||||
std::vector<FlakeRef> parents;
|
std::vector<FlakeRef> parents;
|
||||||
|
|
||||||
std::function<void(
|
std::function<void(
|
||||||
const FlakeInputs & flakeInputs,
|
|
||||||
std::shared_ptr<Node> node,
|
|
||||||
const InputPath & inputPathPrefix,
|
const InputPath & inputPathPrefix,
|
||||||
std::shared_ptr<const Node> oldNode,
|
const FlakeInputs & flakeInputs
|
||||||
const InputPath & lockRootPath,
|
)>
|
||||||
const Path & parentPath,
|
checkFollowsDeclarations;
|
||||||
bool trustLock)>
|
|
||||||
computeLocks;
|
|
||||||
|
|
||||||
computeLocks = [&](
|
checkFollowsDeclarations = [&](
|
||||||
const FlakeInputs & flakeInputs,
|
|
||||||
std::shared_ptr<Node> node,
|
|
||||||
const InputPath & inputPathPrefix,
|
const InputPath & inputPathPrefix,
|
||||||
std::shared_ptr<const Node> oldNode,
|
const FlakeInputs & flakeInputs
|
||||||
const InputPath & lockRootPath,
|
) {
|
||||||
const Path & parentPath,
|
|
||||||
bool trustLock)
|
|
||||||
{
|
|
||||||
debug("computing lock file node '%s'", printInputPath(inputPathPrefix));
|
|
||||||
|
|
||||||
for (auto [inputPath, inputOverride] : overrides) {
|
for (auto [inputPath, inputOverride] : overrides) {
|
||||||
auto inputPath2(inputPath);
|
auto inputPath2(inputPath);
|
||||||
auto follow = inputPath2.back();
|
auto follow = inputPath2.back();
|
||||||
|
@ -394,6 +383,30 @@ LockedFlake lockFlake(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
std::function<void(
|
||||||
|
const FlakeInputs & flakeInputs,
|
||||||
|
std::shared_ptr<Node> node,
|
||||||
|
const InputPath & inputPathPrefix,
|
||||||
|
std::shared_ptr<const Node> oldNode,
|
||||||
|
const InputPath & lockRootPath,
|
||||||
|
const Path & parentPath,
|
||||||
|
bool trustLock)>
|
||||||
|
computeLocks;
|
||||||
|
|
||||||
|
computeLocks = [&](
|
||||||
|
const FlakeInputs & flakeInputs,
|
||||||
|
std::shared_ptr<Node> node,
|
||||||
|
const InputPath & inputPathPrefix,
|
||||||
|
std::shared_ptr<const Node> oldNode,
|
||||||
|
const InputPath & lockRootPath,
|
||||||
|
const Path & parentPath,
|
||||||
|
bool trustLock)
|
||||||
|
{
|
||||||
|
debug("computing lock file node '%s'", printInputPath(inputPathPrefix));
|
||||||
|
|
||||||
|
checkFollowsDeclarations(inputPathPrefix, flakeInputs);
|
||||||
|
|
||||||
/* Get the overrides (i.e. attributes of the form
|
/* Get the overrides (i.e. attributes of the form
|
||||||
'inputs.nixops.inputs.nixpkgs.url = ...'). */
|
'inputs.nixops.inputs.nixpkgs.url = ...'). */
|
||||||
|
|
Loading…
Reference in a new issue