diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-10-01 23:29:45 -0400 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-10-02 15:05:23 +0000 |
commit | 72b65981f9590db06558958179bef4dcf733777a (patch) | |
tree | 7ac9ce29716f721b28a0a286023bb87c215c9f77 /src/libstore/derived-path-map.hh | |
parent | 7e2399b12360d267af8dac033c3d0d95a00b874d (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.hh')
-rw-r--r-- | src/libstore/derived-path-map.hh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libstore/derived-path-map.hh b/src/libstore/derived-path-map.hh index 4a2c90733..4d72b301e 100644 --- a/src/libstore/derived-path-map.hh +++ b/src/libstore/derived-path-map.hh @@ -20,11 +20,8 @@ namespace nix { * * @param V A type to instantiate for each output. It should probably * should be an "optional" type so not every interior node has to have a - * value. For example, the scheduler uses - * `DerivedPathMap<std::weak_ptr<CreateDerivationAndRealiseGoal>>` to - * remember which goals correspond to which outputs. `* const Something` - * or `std::optional<Something>` would also be good choices for - * "optional" types. + * value. `* const Something` or `std::optional<Something>` would be + * good choices for "optional" types. */ template<typename V> struct DerivedPathMap { |