Lockfile handling in resolveFlake is fixed
This commit is contained in:
Nick Van den Broeck
parent
98f20dee41
commit
ef6ae61503
|
|
@ -372,10 +372,58 @@ LockFile entryToLockFile(const LockFile::FlakeEntry & entry)
|
|||
return lockFile;
|
||||
}
|
||||
|
||||
ResolvedFlake resolveFlakeFromLockFile(EvalState & state, const FlakeRef & flakeRef,
|
||||
ShouldUpdateLockFile update, LockFile lockFile = {})
|
||||
LockFile::FlakeEntry dependenciesToFlakeEntry(const ResolvedFlake & resolvedFlake)
|
||||
{
|
||||
Flake flake = getFlake(state, flakeRef, update != DontUpdate);
|
||||
LockFile::FlakeEntry entry(resolvedFlake.flake.resolvedRef, resolvedFlake.flake.hash);
|
||||
|
||||
for (auto & info : resolvedFlake.flakeDeps)
|
||||
entry.flakeEntries.insert_or_assign(info.first.to_string(), dependenciesToFlakeEntry(info.second));
|
||||
|
||||
for (auto & nonFlake : resolvedFlake.nonFlakeDeps) {
|
||||
LockFile::NonFlakeEntry nonEntry(nonFlake.resolvedRef, nonFlake.hash);
|
||||
entry.nonFlakeEntries.insert_or_assign(nonFlake.alias, nonEntry);
|
||||
}
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
bool allowedToWrite (HandleLockFile handle)
|
||||
{
|
||||
if (handle == AllPure) return false;
|
||||
else if (handle == TopRefUsesRegistries) return false;
|
||||
else if (handle == UpdateLockFile) return true;
|
||||
else if (handle == UseUpdatedLockFile) return false;
|
||||
else if (handle == RecreateLockFile) return true;
|
||||
else if (handle == UseNewLockFile) return false;
|
||||
else assert(false);
|
||||
}
|
||||
|
||||
bool recreateLockFile (HandleLockFile handle)
|
||||
{
|
||||
if (handle == AllPure) return false;
|
||||
else if (handle == TopRefUsesRegistries) return false;
|
||||
else if (handle == UpdateLockFile) return false;
|
||||
else if (handle == UseUpdatedLockFile) return false;
|
||||
else if (handle == RecreateLockFile) return true;
|
||||
else if (handle == UseNewLockFile) return true;
|
||||
else assert(false);
|
||||
}
|
||||
|
||||
bool allowedToUseRegistries (HandleLockFile handle, bool isTopRef)
|
||||
{
|
||||
if (handle == AllPure) return false;
|
||||
else if (handle == TopRefUsesRegistries) return isTopRef;
|
||||
else if (handle == UpdateLockFile) return true;
|
||||
else if (handle == UseUpdatedLockFile) return true;
|
||||
else if (handle == RecreateLockFile) return true;
|
||||
else if (handle == UseNewLockFile) return true;
|
||||
else assert(false);
|
||||
}
|
||||
|
||||
ResolvedFlake resolveFlakeFromLockFile(EvalState & state, const FlakeRef & flakeRef,
|
||||
HandleLockFile handleLockFile, LockFile lockFile = {}, bool topRef = false)
|
||||
{
|
||||
Flake flake = getFlake(state, flakeRef, allowedToUseRegistries(handleLockFile, topRef));
|
||||
|
||||
ResolvedFlake deps(flake);
|
||||
|
||||
|
|
@ -388,23 +436,23 @@ ResolvedFlake resolveFlakeFromLockFile(EvalState & state, const FlakeRef & flake
|
|||
throw Error("the content hash of flakeref %s doesn't match", i->second.ref.to_string());
|
||||
deps.nonFlakeDeps.push_back(nonFlake);
|
||||
} else {
|
||||
if (update == DontUpdate) throw Error("the lockfile requires updating nonflake dependency %s in DontUpdate mode", nonFlakeInfo.first);
|
||||
if (handleLockFile == AllPure || handleLockFile == TopRefUsesRegistries)
|
||||
throw Error("the lockfile requires updating nonflake dependency %s in AllPure mode", nonFlakeInfo.first);
|
||||
deps.nonFlakeDeps.push_back(getNonFlake(state, nonFlakeInfo.second, nonFlakeInfo.first));
|
||||
}
|
||||
}
|
||||
|
||||
for (auto newFlakeRef : flake.requires) {
|
||||
FlakeRef ref = newFlakeRef;
|
||||
LockFile newLockFile;
|
||||
auto i = lockFile.flakeEntries.find(newFlakeRef);
|
||||
if (i != lockFile.flakeEntries.end()) { // Propagate lockFile downwards if possible
|
||||
ResolvedFlake newResFlake = resolveFlakeFromLockFile(state, i->second.ref, update, entryToLockFile(i->second));
|
||||
ResolvedFlake newResFlake = resolveFlakeFromLockFile(state, i->second.ref, handleLockFile, entryToLockFile(i->second));
|
||||
if (newResFlake.flake.hash != i->second.contentHash)
|
||||
throw Error("the content hash of flakeref %s doesn't match", i->second.ref.to_string());
|
||||
deps.flakeDeps.push_back(newResFlake);
|
||||
deps.flakeDeps.insert_or_assign(newFlakeRef, newResFlake);
|
||||
} else {
|
||||
if (update == DontUpdate) throw Error("the lockfile requires updating flake dependency %s in DontUpdate mode", newFlakeRef.to_string());
|
||||
deps.flakeDeps.push_back(resolveFlakeFromLockFile(state, newFlakeRef, update));
|
||||
if (handleLockFile == AllPure || handleLockFile == TopRefUsesRegistries)
|
||||
throw Error("the lockfile requires updating flake dependency %s in AllPure mode", newFlakeRef.to_string());
|
||||
deps.flakeDeps.insert_or_assign(newFlakeRef, resolveFlakeFromLockFile(state, newFlakeRef, handleLockFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -414,54 +462,37 @@ ResolvedFlake resolveFlakeFromLockFile(EvalState & state, const FlakeRef & flake
|
|||
/* Given a flake reference, recursively fetch it and its dependencies.
|
||||
FIXME: this should return a graph of flakes.
|
||||
*/
|
||||
ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, ShouldUpdateLockFile update)
|
||||
ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, HandleLockFile handleLockFile)
|
||||
{
|
||||
if (!std::get_if<FlakeRef::IsPath>(&topRef.data)) update = DontUpdate;
|
||||
Flake flake = getFlake(state, topRef, update != DontUpdate);
|
||||
Flake flake = getFlake(state, topRef, allowedToUseRegistries(handleLockFile, true));
|
||||
LockFile lockFile;
|
||||
|
||||
if (update != RecreateLockFile) {
|
||||
if (!recreateLockFile (handleLockFile)) {
|
||||
// If recreateLockFile, start with an empty lockfile
|
||||
lockFile = readLockFile(flake.storePath + "/flake.lock"); // FIXME: symlink attack
|
||||
}
|
||||
|
||||
return resolveFlakeFromLockFile(state, topRef, update, lockFile);
|
||||
ResolvedFlake resFlake = resolveFlakeFromLockFile(state, topRef, handleLockFile, lockFile, true);
|
||||
lockFile = entryToLockFile(dependenciesToFlakeEntry(resFlake));
|
||||
|
||||
if (allowedToWrite(handleLockFile)) {
|
||||
if (auto refData = std::get_if<FlakeRef::IsPath>(&topRef.data)) {
|
||||
writeLockFile(lockFile, refData->path + (topRef.subdir == "" ? "" : "/" + topRef.subdir) + "/flake.lock");
|
||||
|
||||
// Hack: Make sure that flake.lock is visible to Git, so it ends up in the Nix store.
|
||||
runProgram("git", true, { "-C", refData->path, "add",
|
||||
(topRef.subdir == "" ? "" : topRef.subdir + "/") + "flake.lock" });
|
||||
} else std::cout << "Cannot write lockfile because the FlakeRef isn't of the form IsPath." << std::endl;
|
||||
} else if (handleLockFile != AllPure && handleLockFile != TopRefUsesRegistries)
|
||||
std::cout << "Using updating lockfile without writing it to file" << std::endl;
|
||||
|
||||
return resFlake;
|
||||
}
|
||||
|
||||
LockFile::FlakeEntry dependenciesToFlakeEntry(const ResolvedFlake & resolvedFlake)
|
||||
void updateLockFile (EvalState & state, const FlakeUri & flakeUri, bool recreateLockFile)
|
||||
{
|
||||
LockFile::FlakeEntry entry(resolvedFlake.flake.resolvedRef, resolvedFlake.flake.hash);
|
||||
|
||||
for (auto & newResFlake : resolvedFlake.flakeDeps)
|
||||
entry.flakeEntries.insert_or_assign(newResFlake.flake.originalRef, dependenciesToFlakeEntry(newResFlake));
|
||||
|
||||
for (auto & nonFlake : resolvedFlake.nonFlakeDeps) {
|
||||
LockFile::NonFlakeEntry nonEntry(nonFlake.resolvedRef, nonFlake.hash);
|
||||
entry.nonFlakeEntries.insert_or_assign(nonFlake.alias, nonEntry);
|
||||
}
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
static LockFile makeLockFile(EvalState & evalState, FlakeRef & flakeRef, bool recreateLockFile)
|
||||
{
|
||||
ResolvedFlake resFlake = resolveFlake(evalState, flakeRef, recreateLockFile ? RecreateLockFile : UpdateLockFile);
|
||||
return entryToLockFile(dependenciesToFlakeEntry(resFlake));
|
||||
}
|
||||
|
||||
void updateLockFile(EvalState & state, const FlakeUri & uri, bool recreateLockFile)
|
||||
{
|
||||
FlakeRef flakeRef = FlakeRef(uri);
|
||||
auto lockFile = makeLockFile(state, flakeRef, recreateLockFile);
|
||||
if (auto refData = std::get_if<FlakeRef::IsPath>(&flakeRef.data)) {
|
||||
writeLockFile(lockFile, refData->path + (flakeRef.subdir == "" ? "" : "/" + flakeRef.subdir) + "/flake.lock");
|
||||
|
||||
// Hack: Make sure that flake.lock is visible to Git. Otherwise,
|
||||
// exportGit will fail to copy it to the Nix store.
|
||||
runProgram("git", true, { "-C", refData->path, "add",
|
||||
(flakeRef.subdir == "" ? "" : flakeRef.subdir + "/") + "flake.lock" });
|
||||
} else
|
||||
throw Error("flakeUri %s can't be updated because it is not a path", uri);
|
||||
FlakeRef flakeRef(flakeUri);
|
||||
resolveFlake(state, flakeRef, recreateLockFile ? RecreateLockFile : UpdateLockFile);
|
||||
}
|
||||
|
||||
void callFlake(EvalState & state, const ResolvedFlake & resFlake, Value & v)
|
||||
|
|
@ -471,7 +502,8 @@ void callFlake(EvalState & state, const ResolvedFlake & resFlake, Value & v)
|
|||
|
||||
state.mkAttrs(v, resFlake.flakeDeps.size() + resFlake.nonFlakeDeps.size() + 8);
|
||||
|
||||
for (const ResolvedFlake newResFlake : resFlake.flakeDeps) {
|
||||
for (auto info : resFlake.flakeDeps) {
|
||||
const ResolvedFlake newResFlake = info.second;
|
||||
auto vFlake = state.allocAttr(v, newResFlake.flake.id);
|
||||
callFlake(state, newResFlake, *vFlake);
|
||||
}
|
||||
|
|
@ -512,16 +544,16 @@ void callFlake(EvalState & state, const ResolvedFlake & resFlake, Value & v)
|
|||
|
||||
// Return the `provides` of the top flake, while assigning to `v` the provides
|
||||
// of the dependencies as well.
|
||||
void makeFlakeValue(EvalState & state, const FlakeRef & flakeRef, ShouldUpdateLockFile update, Value & v)
|
||||
void makeFlakeValue(EvalState & state, const FlakeRef & flakeRef, HandleLockFile handle, Value & v)
|
||||
{
|
||||
callFlake(state, resolveFlake(state, flakeRef, update), v);
|
||||
callFlake(state, resolveFlake(state, flakeRef, handle), v);
|
||||
}
|
||||
|
||||
// This function is exposed to be used in nix files.
|
||||
static void prim_getFlake(EvalState & state, const Pos & pos, Value * * args, Value & v)
|
||||
{
|
||||
makeFlakeValue(state, state.forceStringNoCtx(*args[0], pos),
|
||||
evalSettings.pureEval ? DontUpdate : UpdateLockFile, v);
|
||||
evalSettings.pureEval ? AllPure : UseUpdatedLockFile, v);
|
||||
}
|
||||
|
||||
static RegisterPrimOp r2("getFlake", 1, prim_getFlake);
|
||||
|
|
|
|||
|
|
@ -36,16 +36,23 @@ struct LockFile
|
|||
};
|
||||
|
||||
std::map<FlakeRef, FlakeEntry> flakeEntries;
|
||||
std::map<FlakeId, NonFlakeEntry> nonFlakeEntries;
|
||||
std::map<FlakeAlias, NonFlakeEntry> nonFlakeEntries;
|
||||
};
|
||||
|
||||
typedef std::vector<std::shared_ptr<FlakeRegistry>> Registries;
|
||||
|
||||
Path getUserRegistryPath();
|
||||
|
||||
enum ShouldUpdateLockFile { DontUpdate, UpdateLockFile, RecreateLockFile};
|
||||
enum HandleLockFile
|
||||
{ AllPure // Everything is handled 100% purely
|
||||
, TopRefUsesRegistries // The top FlakeRef uses the registries, apart from that, everything happens 100% purely
|
||||
, UpdateLockFile // Update the existing lockfile and write it to file
|
||||
, UseUpdatedLockFile // `UpdateLockFile` without writing to file
|
||||
, RecreateLockFile // Recreate the lockfile from scratch and write it to file
|
||||
, UseNewLockFile // `RecreateLockFile` without writing to file
|
||||
};
|
||||
|
||||
void makeFlakeValue(EvalState &, const FlakeRef &, ShouldUpdateLockFile, Value &);
|
||||
void makeFlakeValue(EvalState &, const FlakeRef &, HandleLockFile, Value &);
|
||||
|
||||
std::shared_ptr<FlakeRegistry> readRegistry(const Path &);
|
||||
|
||||
|
|
@ -98,12 +105,12 @@ Flake getFlake(EvalState &, const FlakeRef &, bool impureIsAllowed);
|
|||
struct ResolvedFlake
|
||||
{
|
||||
Flake flake;
|
||||
std::vector<ResolvedFlake> flakeDeps; // The flake dependencies
|
||||
std::map<FlakeRef, ResolvedFlake> flakeDeps; // The key in this map, is the originalRef as written in flake.nix
|
||||
std::vector<NonFlake> nonFlakeDeps;
|
||||
ResolvedFlake(const Flake & flake) : flake(flake) {}
|
||||
};
|
||||
|
||||
ResolvedFlake resolveFlake(EvalState &, const FlakeRef &, ShouldUpdateLockFile);
|
||||
ResolvedFlake resolveFlake(EvalState &, const FlakeRef &, HandleLockFile);
|
||||
|
||||
void updateLockFile(EvalState &, const FlakeUri &, bool recreateLockFile);
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,10 @@ struct SourceExprCommand : virtual Args, StoreCommand, MixEvalArgs
|
|||
|
||||
bool recreateLockFile = false;
|
||||
|
||||
bool saveLockFile = true;
|
||||
|
||||
bool noRegistries = false;
|
||||
|
||||
ref<EvalState> getEvalState();
|
||||
|
||||
std::vector<std::shared_ptr<Installable>> parseInstallables(
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ struct CmdFlakeDeps : FlakeCommand, MixJSON, StoreCommand, MixEvalArgs
|
|||
for (NonFlake & nonFlake : resFlake.nonFlakeDeps)
|
||||
printNonFlakeInfo(nonFlake, json);
|
||||
|
||||
for (ResolvedFlake & newResFlake : resFlake.flakeDeps)
|
||||
todo.push(newResFlake);
|
||||
for (auto info : resFlake.flakeDeps)
|
||||
todo.push(info.second);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,6 +26,16 @@ SourceExprCommand::SourceExprCommand()
|
|||
.longName("recreate-lock-file")
|
||||
.description("recreate lock file from scratch")
|
||||
.set(&recreateLockFile, true);
|
||||
|
||||
mkFlag()
|
||||
.longName("dont-save-lock-file")
|
||||
.description("save the newly generated lock file")
|
||||
.set(&saveLockFile, false);
|
||||
|
||||
mkFlag()
|
||||
.longName("no-registries")
|
||||
.description("don't use flake registries")
|
||||
.set(&noRegistries, true);
|
||||
}
|
||||
|
||||
ref<EvalState> SourceExprCommand::getEvalState()
|
||||
|
|
@ -158,10 +168,12 @@ struct InstallableFlake : InstallableValue
|
|||
Value * toValue(EvalState & state) override
|
||||
{
|
||||
auto vFlake = state.allocValue();
|
||||
if (std::get_if<FlakeRef::IsPath>(&flakeRef.data))
|
||||
updateLockFile(state, flakeRef.to_string(), cmd.recreateLockFile);
|
||||
|
||||
makeFlakeValue(state, flakeRef, cmd.recreateLockFile ? RecreateLockFile : UpdateLockFile, *vFlake);
|
||||
HandleLockFile handle = cmd.noRegistries ? AllPure :
|
||||
cmd.recreateLockFile ?
|
||||
(cmd.saveLockFile ? RecreateLockFile : UseNewLockFile)
|
||||
: (cmd.saveLockFile ? UpdateLockFile : UseUpdatedLockFile);
|
||||
makeFlakeValue(state, flakeRef, handle, *vFlake);
|
||||
|
||||
auto vProvides = (*vFlake->attrs->get(state.symbols.create("provides")))->value;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
with import <nix/config.nix>;
|
||||
|
||||
rec {
|
||||
inherit shell;
|
||||
|
||||
path = coreutils;
|
||||
|
||||
system = "x86_64-linux";
|
||||
|
||||
shared = builtins.getEnv "_NIX_TEST_SHARED";
|
||||
|
||||
mkDerivation = args:
|
||||
derivation ({
|
||||
inherit system;
|
||||
builder = shell;
|
||||
args = ["-e" args.builder or (builtins.toFile "builder.sh" "if [ -e .attrs.sh ]; then source .attrs.sh; fi; eval \"$buildCommand\"")];
|
||||
PATH = path;
|
||||
} // removeAttrs args ["builder" "meta"])
|
||||
// { meta = args.meta or {}; };
|
||||
}
|
||||
|
|
@ -118,7 +118,7 @@ nix build -o $TEST_ROOT/result --flake-registry $registry flake1:
|
|||
[[ -e $TEST_ROOT/result/hello ]]
|
||||
|
||||
# Building a flake with an unlocked dependency should fail in pure mode.
|
||||
(! nix build -o $TEST_ROOT/result --flake-registry $registry flake2:bar)
|
||||
(! nix eval "(builtins.getFlake "$flake2Dir")")
|
||||
|
||||
# But should succeed in impure mode.
|
||||
nix build -o $TEST_ROOT/result --flake-registry $registry flake2:bar --impure
|
||||
|
|
@ -129,8 +129,8 @@ nix build -o $TEST_ROOT/result --flake-registry $registry $flake2Dir:bar
|
|||
git -C $flake2Dir commit flake.lock -m 'Add flake.lock'
|
||||
|
||||
# Rerunning the build should not change the lockfile.
|
||||
#nix build -o $TEST_ROOT/result --flake-registry $registry $flake2:bar
|
||||
#[[ -z $(git -C $flake2 diff) ]]
|
||||
nix build -o $TEST_ROOT/result --flake-registry $registry $flake2Dir:bar
|
||||
[[ -z $(git -C $flake2Dir diff master) ]]
|
||||
|
||||
# Now we should be able to build the flake in pure mode.
|
||||
nix build -o $TEST_ROOT/result --flake-registry $registry flake2:bar
|
||||
|
|
@ -140,3 +140,32 @@ nix build -o $TEST_ROOT/result file://$flake2Dir:bar
|
|||
|
||||
# Test whether indirect dependencies work.
|
||||
nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:xyzzy
|
||||
|
||||
# Add dependency to flake3
|
||||
rm $flake3Dir/flake.nix
|
||||
|
||||
cat > $flake3Dir/flake.nix <<EOF
|
||||
{
|
||||
name = "flake3";
|
||||
|
||||
epoch = 2019;
|
||||
|
||||
requires = [ "flake1" "flake2" ];
|
||||
|
||||
description = "Fnord";
|
||||
|
||||
provides = deps: rec {
|
||||
packages.xyzzy = deps.flake2.provides.packages.bar;
|
||||
packages.sth = deps.flake1.provides.packages.foo;
|
||||
};
|
||||
}
|
||||
EOF
|
||||
|
||||
git -C $flake3Dir add flake.nix
|
||||
git -C $flake3Dir commit -m 'Update flake.nix'
|
||||
|
||||
# Check whether `nix build` works with an incomplete lockfile
|
||||
nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:sth
|
||||
|
||||
# Check whether it saved the lockfile
|
||||
[[ ! (-z $(git -C $flake3Dir diff master)) ]]
|
||||
|
|
|
|||
Loading…
Reference in a new issue