aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/derived-path-map.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2023-10-01 23:29:45 -0400
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-10-02 15:05:23 +0000
commit72b65981f9590db06558958179bef4dcf733777a (patch)
tree7ac9ce29716f721b28a0a286023bb87c215c9f77 /src/libstore/derived-path-map.cc
parent7e2399b12360d267af8dac033c3d0d95a00b874d (diff)
Revert "Adapt scheduler to work with dynamic derivations"
This reverts commit 5e3986f59cb58f48186a49dcec7aa317b4787522. This un-implements RFC 92 but fixes the critical bug #9052 which many people are hitting. This is a decent stop-gap until a minimal reproduction of that bug is found and a proper fix can be made. Mostly fixed #9052, but I would like to leave that issue open until we have a regression test, so I can then properly fix the bug (unbreaking RFC 92) later. (cherry picked from commit 8440afbed756254784d9fea3eaab06649dffd390)
Diffstat (limited to 'src/libstore/derived-path-map.cc')
-rw-r--r--src/libstore/derived-path-map.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstore/derived-path-map.cc b/src/libstore/derived-path-map.cc
index 437b6a71a..5982c04b3 100644
--- a/src/libstore/derived-path-map.cc
+++ b/src/libstore/derived-path-map.cc
@@ -51,11 +51,8 @@ typename DerivedPathMap<V>::ChildNode * DerivedPathMap<V>::findSlot(const Single
// instantiations
-#include "create-derivation-and-realise-goal.hh"
namespace nix {
-template struct DerivedPathMap<std::weak_ptr<CreateDerivationAndRealiseGoal>>;
-
GENERATE_CMP_EXT(
template<>,
DerivedPathMap<std::set<std::string>>::ChildNode,