mirror of
https://github.com/NixOS/nix
synced 2025-07-05 08:11:47 +02:00
resolveFlake -> lockFlake
"resolve" is ambiguous (also used for registry resolution).
This commit is contained in:
parent
b5c9dbc84f
commit
872a22fa23
5 changed files with 36 additions and 40 deletions
|
@ -46,7 +46,7 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef, bool allowLookup);
|
|||
/* Fingerprint of a locked flake; used as a cache key. */
|
||||
typedef Hash Fingerprint;
|
||||
|
||||
struct ResolvedFlake
|
||||
struct LockedFlake
|
||||
{
|
||||
Flake flake;
|
||||
LockFile lockFile;
|
||||
|
@ -54,7 +54,7 @@ struct ResolvedFlake
|
|||
Fingerprint getFingerprint() const;
|
||||
};
|
||||
|
||||
ResolvedFlake resolveFlake(EvalState &, const FlakeRef &, HandleLockFile);
|
||||
LockedFlake lockFlake(EvalState &, const FlakeRef &, HandleLockFile);
|
||||
|
||||
void callFlake(EvalState & state,
|
||||
const Flake & flake,
|
||||
|
@ -62,11 +62,9 @@ void callFlake(EvalState & state,
|
|||
Value & v);
|
||||
|
||||
void callFlake(EvalState & state,
|
||||
const ResolvedFlake & resFlake,
|
||||
const LockedFlake & resFlake,
|
||||
Value & v);
|
||||
|
||||
void updateLockFile(EvalState &, const FlakeRef & flakeRef, bool recreateLockFile);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue