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

Inline closureRepaired

Browse source
This commit is contained in:
John Ericson 2025-02-01 18:36:58 -05:00
parent 41274f3c3e
commit 57463ab910
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/build/derivation-goal.cc
View file

@ -457,21 +457,16 @@ Goal::Co DerivationGoal::repairClosure()
co_return done(BuildResult::AlreadyValid, assertPathValidity()); co_return done(BuildResult::AlreadyValid, assertPathValidity());
} else { } else {
co_await Suspend{}; co_await Suspend{};
co_return closureRepaired();
trace("closure repaired");
if (nrFailed > 0)
throw Error("some paths in the output closure of derivation '%s' could not be repaired",
worker.store.printStorePath(drvPath));
co_return done(BuildResult::AlreadyValid, assertPathValidity());
} }
} }
Goal::Co DerivationGoal::closureRepaired()
{
trace("closure repaired");
if (nrFailed > 0)
throw Error("some paths in the output closure of derivation '%s' could not be repaired",
worker.store.printStorePath(drvPath));
co_return done(BuildResult::AlreadyValid, assertPathValidity());
}
Goal::Co DerivationGoal::inputsRealised() Goal::Co DerivationGoal::inputsRealised()
{ {
trace("all inputs realised"); trace("all inputs realised");

1
src/libstore/build/derivation-goal.hh
View file

@ -237,7 +237,6 @@ struct DerivationGoal : public Goal
Co loadDerivation(); Co loadDerivation();
Co haveDerivation(); Co haveDerivation();
Co gaveUpOnSubstitution(); Co gaveUpOnSubstitution();
Co closureRepaired();
Co inputsRealised(); Co inputsRealised();
Co tryToBuild(); Co tryToBuild();
virtual Co tryLocalBuild(); virtual Co tryLocalBuild();