mirror of
https://github.com/NixOS/nix
synced 2025-07-05 08:11:47 +02:00
Fix follows paths in subordinate lockfiles
This commit is contained in:
parent
2cd1a5b8f3
commit
b3c424f5a6
4 changed files with 82 additions and 20 deletions
|
@ -43,7 +43,6 @@ struct FlakeInput
|
|||
std::optional<FlakeRef> ref;
|
||||
bool isFlake = true; // true = process flake to get outputs, false = (fetched) static source path
|
||||
std::optional<InputPath> follows;
|
||||
bool absolute = false; // whether 'follows' is relative to the flake root
|
||||
FlakeInputs overrides;
|
||||
};
|
||||
|
||||
|
@ -125,6 +124,15 @@ 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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue