guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: remove ca support from common store api

Browse Source 
this removes the ca-derivations system feature and, perhaps most
importantly, realisation closure copy support. the latter is not
needed any more and its existence blocks some more code removal.

Change-Id: I2931b03637e25d35252ae6bd5f34f0c0168d80e9
This commit is contained in:
eldritch horrors
2025-05-20 17:43:46 +00:00
parent 484319fd2d
commit f25dc923ca
1 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libstore/store-api.cc
+3 -48
View File
@@ -485,12 +485,7 @@ try {
StringSet StoreConfig::getDefaultSystemFeatures()
{
auto res = settings.systemFeatures.get();
if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations))
res.insert("ca-derivations");
return res;
return settings.systemFeatures.get();
}
Store::Store(const StoreConfig & config) : state({(size_t) config.pathInfoCacheSize})
@@ -1171,53 +1166,13 @@ kj::Promise<Result<std::map<StorePath, StorePath>>> copyPaths(
SubstituteFlag substitute)
try {
StorePathSet storePaths;
std::set<Realisation> toplevelRealisations;
for (auto & path : paths) {
storePaths.insert(path.path());
if (auto realisation = std::get_if<Realisation>(&path.raw)) {
experimentalFeatureSettings.require(Xp::CaDerivations);
toplevelRealisations.insert(*realisation);
throw UnimplementedError("ca derivations are not supported");
}
}
auto pathsMap =
TRY_AWAIT(copyPaths(srcStore, dstStore, storePaths, repair, checkSigs, substitute));
try {
// Copy the realisation closure
TRY_AWAIT(processGraphAsync<Realisation>(
TRY_AWAIT(Realisation::closure(srcStore, toplevelRealisations)),
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
[&](const Realisation & current) -> kj::Promise<Result<std::set<Realisation>>> {
try {
std::set<Realisation> children;
for (const auto & [drvOutput, _] : current.dependentRealisations) {
auto currentChild = TRY_AWAIT(srcStore.queryRealisation(drvOutput));
if (!currentChild)
throw Error(
"incomplete realisation closure: '%s' is a "
"dependency of '%s' but isn't registered",
drvOutput.to_string(), current.id.to_string());
children.insert(*currentChild);
}
co_return children;
} catch (...) {
co_return result::current_exception();
}
},
[&](const Realisation& current) -> kj::Promise<Result<void>> {
return dstStore.registerDrvOutput(current, checkSigs);
}));
} catch (MissingExperimentalFeature & e) {
// Don't fail if the remote doesn't support CA derivations is it might
// not be within our control to change that, and we might still want
// to at least copy the output paths.
if (e.missingFeature == Xp::CaDerivations)
ignoreExceptionExceptInterrupt();
else
throw;
}
co_return pathsMap;
co_return TRY_AWAIT(copyPaths(srcStore, dstStore, storePaths, repair, checkSigs, substitute));
} catch (...) {
co_return result::current_exception();
}