diff --git a/lix/libstore/build/derivation-goal.hh b/lix/libstore/build/derivation-goal.hh index 3ce619402..600f1a355 100644 --- a/lix/libstore/build/derivation-goal.hh +++ b/lix/libstore/build/derivation-goal.hh @@ -380,8 +380,6 @@ public: return false; } - StorePathSet exportReferences(const StorePathSet & storePaths); - JobCategory jobCategory() const override { return JobCategory::Build; }; diff --git a/lix/libstore/build/local-derivation-goal.hh b/lix/libstore/build/local-derivation-goal.hh index 239574673..918893cd8 100644 --- a/lix/libstore/build/local-derivation-goal.hh +++ b/lix/libstore/build/local-derivation-goal.hh @@ -127,11 +127,6 @@ struct LocalDerivationGoal : public DerivationGoal const static Path homeDir; - /** - * The daemon worker threads. - */ - std::vector daemonWorkerThreads; - /** * Create a LocalDerivationGoal without an on-disk .drv file, * possibly a platform-specific subclass diff --git a/lix/libstore/misc.cc b/lix/libstore/misc.cc index 2717e0c7c..98754a2f4 100644 --- a/lix/libstore/misc.cc +++ b/lix/libstore/misc.cc @@ -493,37 +493,4 @@ try { co_return result::current_exception(); } - -kj ::Promise> -resolveDerivedPath(Store & store, const SingleDerivedPath & req, Store * evalStore_) -try { - auto & evalStore = evalStore_ ? *evalStore_ : store; - - auto handlers = overloaded { - [&](const SingleDerivedPath::Opaque & bo) -> kj::Promise> { - return {bo.path}; - }, - // NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines) - [&](const SingleDerivedPath::Built & bfd) -> kj::Promise> { - 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(); -} - } diff --git a/lix/libstore/realisation.cc b/lix/libstore/realisation.cc index 82bb59454..932653a81 100644 --- a/lix/libstore/realisation.cc +++ b/lix/libstore/realisation.cc @@ -191,21 +191,4 @@ try { co_return result::current_exception(); } -kj::Promise> 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> 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 diff --git a/lix/libstore/realisation.hh b/lix/libstore/realisation.hh index 42dd3a87a..452cb7fb3 100644 --- a/lix/libstore/realisation.hh +++ b/lix/libstore/realisation.hh @@ -135,9 +135,7 @@ struct RealisedPath { */ StorePath path() const; - kj::Promise> closure(Store & store, Set & ret) const; static kj::Promise> closure(Store & store, const Set & startPaths, Set & ret); - kj::Promise> closure(Store & store) const; GENERATE_CMP(RealisedPath, me->raw); }; diff --git a/lix/libstore/store-api.hh b/lix/libstore/store-api.hh index 858470ca7..1dd4a5887 100644 --- a/lix/libstore/store-api.hh +++ b/lix/libstore/store-api.hh @@ -1002,8 +1002,6 @@ void removeTempRoots(); * Resolve the derived path completely, failing if any derivation output * is unknown. */ -kj::Promise> -resolveDerivedPath(Store &, const SingleDerivedPath &, Store * evalStore = nullptr); kj::Promise> resolveDerivedPath(Store &, const DerivedPath::Built &, Store * evalStore = nullptr);