libstore: remove some unused code

these must've been left around by accident if past cleanups.

Change-Id: I3458ae45e362e7912a6bbe1f31956c41094144d3
This commit is contained in:
eldritch horrors
2025-05-16 13:16:27 +02:00
parent 3f355b8fd1
commit 8029cec3c0
6 changed files with 0 additions and 61 deletions
-2
View File
@@ -380,8 +380,6 @@ public:
return false;
}
StorePathSet exportReferences(const StorePathSet & storePaths);
JobCategory jobCategory() const override {
return JobCategory::Build;
};
@@ -127,11 +127,6 @@ struct LocalDerivationGoal : public DerivationGoal
const static Path homeDir;
/**
* The daemon worker threads.
*/
std::vector<std::thread> daemonWorkerThreads;
/**
* Create a LocalDerivationGoal without an on-disk .drv file,
* possibly a platform-specific subclass
-33
View File
@@ -493,37 +493,4 @@ try {
co_return result::current_exception();
}
kj ::Promise<Result<StorePath>>
resolveDerivedPath(Store & store, const SingleDerivedPath & req, Store * evalStore_)
try {
auto & evalStore = evalStore_ ? *evalStore_ : store;
auto handlers = overloaded {
[&](const SingleDerivedPath::Opaque & bo) -> kj::Promise<Result<StorePath>> {
return {bo.path};
},
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
[&](const SingleDerivedPath::Built & bfd) -> kj::Promise<Result<StorePath>> {
try {
auto drvPath = bfd.drvPath.path;
auto outputPaths =
TRY_AWAIT(evalStore.queryPartialDerivationOutputMap(drvPath, evalStore_));
if (outputPaths.count(bfd.output) == 0)
throw Error("derivation '%s' does not have an output named '%s'",
store.printStorePath(drvPath), bfd.output);
auto & optPath = outputPaths.at(bfd.output);
if (!optPath)
throw MissingRealisation(bfd.drvPath.to_string(store), bfd.output);
co_return *optPath;
} catch (...) {
co_return result::current_exception();
}
},
};
co_return TRY_AWAIT(std::visit(handlers, req.raw()));
} catch (...) {
co_return result::current_exception();
}
}
-17
View File
@@ -191,21 +191,4 @@ try {
co_return result::current_exception();
}
kj::Promise<Result<void>> RealisedPath::closure(Store& store, RealisedPath::Set & ret) const
try {
TRY_AWAIT(RealisedPath::closure(store, {*this}, ret));
co_return result::success();
} catch (...) {
co_return result::current_exception();
}
kj::Promise<Result<RealisedPath::Set>> RealisedPath::closure(Store& store) const
try {
RealisedPath::Set ret;
TRY_AWAIT(closure(store, ret));
co_return ret;
} catch (...) {
co_return result::current_exception();
}
} // namespace nix
-2
View File
@@ -135,9 +135,7 @@ struct RealisedPath {
*/
StorePath path() const;
kj::Promise<Result<void>> closure(Store & store, Set & ret) const;
static kj::Promise<Result<void>> closure(Store & store, const Set & startPaths, Set & ret);
kj::Promise<Result<Set>> closure(Store & store) const;
GENERATE_CMP(RealisedPath, me->raw);
};
-2
View File
@@ -1002,8 +1002,6 @@ void removeTempRoots();
* Resolve the derived path completely, failing if any derivation output
* is unknown.
*/
kj::Promise<Result<StorePath>>
resolveDerivedPath(Store &, const SingleDerivedPath &, Store * evalStore = nullptr);
kj::Promise<Result<OutputPathMap>>
resolveDerivedPath(Store &, const DerivedPath::Built &, Store * evalStore = nullptr);