diff options
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/flake/flake.cc | 27 | ||||
| -rw-r--r-- | src/libexpr/flake/flake.hh | 9 |
2 files changed, 17 insertions, 19 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index a380ae27f..9e00ff188 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -325,12 +325,23 @@ LockedFlake lockFlake( std::vector<FlakeRef> parents; + struct LockParent { + /* The path to this parent. */ + InputPath path; + + /* Whether we are currently inside a top-level lockfile + (inputs absolute) or subordinate lockfile (inputs + relative). */ + bool absolute; + }; + std::function<void( const FlakeInputs & flakeInputs, std::shared_ptr<Node> node, const InputPath & inputPathPrefix, std::shared_ptr<const Node> oldNode, - const LockParent parent, const Path parentPath)> + const LockParent & parent, + const Path & parentPath)> computeLocks; computeLocks = [&]( @@ -338,7 +349,8 @@ LockedFlake lockFlake( std::shared_ptr<Node> node, const InputPath & inputPathPrefix, std::shared_ptr<const Node> oldNode, - const LockParent parent, const Path parentPath) + const LockParent & parent, + const Path & parentPath) { debug("computing lock file node '%s'", printInputPath(inputPathPrefix)); @@ -384,15 +396,11 @@ LockedFlake lockFlake( if (parent.absolute && !hasOverride) { target = *input.follows; } else { - if (hasOverride) - { + if (hasOverride) { target = inputPathPrefix; target.pop_back(); - } - else - { + } else target = parent.path; - } for (auto & i : *input.follows) target.push_back(i); } @@ -480,8 +488,7 @@ LockedFlake lockFlake( // If this input is a path, recurse it down. // This allows us to resolve path inputs relative to the current flake. - if (localRef.input.getType() == "path") - { + if (localRef.input.getType() == "path") { localRef.input.parent = parentPath; localPath = canonPath(parentPath + "/" + *input.ref->input.getSourcePath()); } diff --git a/src/libexpr/flake/flake.hh b/src/libexpr/flake/flake.hh index 937cc021b..d46da9d68 100644 --- a/src/libexpr/flake/flake.hh +++ b/src/libexpr/flake/flake.hh @@ -124,15 +124,6 @@ struct LockFlags std::set<InputPath> inputUpdates; }; -struct LockParent { - /* The path to this parent */ - InputPath path; - - /* Whether we are currently inside a top-level lockfile (inputs absolute) - or subordinate lockfile (inputs relative) */ - bool absolute; -}; - LockedFlake lockFlake( EvalState & state, const FlakeRef & flakeRef, |