wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

resolveFlake -> lockFlake

Browse source 
"resolve" is ambiguous (also used for registry resolution).
This commit is contained in:
Eelco Dolstra 2020-01-22 20:59:59 +01:00
parent b5c9dbc84f
commit 872a22fa23
5 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -302,7 +302,10 @@ static std::pair<Flake, LockedInput> updateLocks(
/* Compute an in-memory lockfile for the specified top-level flake,
and optionally write it to file, it the flake is writable. */
ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, HandleLockFile handleLockFile)
LockedFlake lockFlake(
EvalState & state,
const FlakeRef & topRef,
HandleLockFile handleLockFile)
{
settings.requireExperimentalFeature("flakes");
@ -356,12 +359,7 @@ ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, HandleLoc
warn("using updated lock file without writing it to file");
}
return ResolvedFlake { .flake = std::move(flake), .lockFile = std::move(lockFile) };
}
void updateLockFile(EvalState & state, const FlakeRef & flakeRef, bool recreateLockFile)
{
resolveFlake(state, flakeRef, recreateLockFile ? RecreateLockFile : UpdateLockFile);
return LockedFlake { .flake = std::move(flake), .lockFile = std::move(lockFile) };
}
static void emitSourceInfoAttrs(EvalState & state, const fetchers::Tree & sourceInfo, Value & vAttrs)
@ -480,16 +478,16 @@ void callFlake(EvalState & state,
}
void callFlake(EvalState & state,
const ResolvedFlake & resFlake,
const LockedFlake & lockedFlake,
Value & v)
{
callFlake(state, resFlake.flake, resFlake.lockFile, v);
callFlake(state, lockedFlake.flake, lockedFlake.lockFile, v);
}
// This function is exposed to be used in nix files.
static void prim_getFlake(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
callFlake(state, resolveFlake(state, parseFlakeRef(state.forceStringNoCtx(*args[0], pos)),
callFlake(state, lockFlake(state, parseFlakeRef(state.forceStringNoCtx(*args[0], pos)),
evalSettings.pureEval ? AllPure : UseUpdatedLockFile), v);
}
@ -497,7 +495,7 @@ static RegisterPrimOp r2("getFlake", 1, prim_getFlake);
}
Fingerprint ResolvedFlake::getFingerprint() const
Fingerprint LockedFlake::getFingerprint() const
{
// FIXME: as an optimization, if the flake contains a lock file
// and we haven't changed it, then it's sufficient to use