mirror of
https://github.com/NixOS/nix.git
synced 2025-11-15 06:52:43 +01:00
Remove signRealisation from drv goal
We can move this method from `LocalStore` to `Store` --- even if we only want the actual builder to sign things in many cases, there is no reason to try to enforce this policy by spurious moving the method to a subclass. Now, we might technically sign class, but CA derivations is experimental, and @Ericson2314 is going to revisit all this stuff with issue #11896 anyways.
This commit is contained in:
parent
0e7e1f5b57
commit
db8439c328
8 changed files with 17 additions and 28 deletions
|
|
@ -2872,7 +2872,7 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()
|
|||
if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations)
|
||||
&& !drv->type().isImpure())
|
||||
{
|
||||
signRealisation(thisRealisation);
|
||||
worker.store.signRealisation(thisRealisation);
|
||||
worker.store.registerDrvOutput(thisRealisation);
|
||||
}
|
||||
builtOutputs.emplace(outputName, thisRealisation);
|
||||
|
|
@ -2881,11 +2881,6 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()
|
|||
return builtOutputs;
|
||||
}
|
||||
|
||||
void LocalDerivationGoal::signRealisation(Realisation & realisation)
|
||||
{
|
||||
getLocalStore().signRealisation(realisation);
|
||||
}
|
||||
|
||||
|
||||
void LocalDerivationGoal::checkOutputs(const std::map<std::string, ValidPathInfo> & outputs)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -241,8 +241,6 @@ struct LocalDerivationGoal : public DerivationGoal
|
|||
*/
|
||||
SingleDrvOutputs registerOutputs();
|
||||
|
||||
void signRealisation(Realisation &) override;
|
||||
|
||||
/**
|
||||
* Check that an output meets the requirements specified by the
|
||||
* 'outputChecks' attribute (or the legacy
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue