216 changed files with 2088 additions and 4042 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -29,7 +29,3 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 max_line_length = 0
-
-[meson.build]
-indent_style = space
-indent_size = 2
--- a/.github/ISSUE_TEMPLATE/missing_documentation.md
+++ b/.github/ISSUE_TEMPLATE/missing_documentation.md
@ -2,7 +2,7 @@
 name: Missing or incorrect documentation
 about: Help us improve the reference manual
 title: ''
-labels: docs
+labels: documentation
 assignees: ''

 ---
@ -19,10 +19,10 @@ assignees: ''

 <!-- make sure this issue is not redundant or obsolete -->

- [ ] checked [latest Lix manual] or its [source code]
+- [ ] checked [latest Lix manual] \([source]\)
 - [ ] checked [documentation issues] and [recent documentation changes] for possible duplicates

-[latest Lix manual]: https://docs.lix.systems/manual/lix/nightly
-[source code]: https://git.lix.systems/lix-project/lix/src/main/doc/manual/src
+[latest Nix manual]: https://docs.lix.systems/manual/lix/nightly
+[source]: https://git.lix.systems/lix-project/lix/src/main/doc/manual/src
 [documentation issues]: https://git.lix.systems/lix-project/lix/issues?labels=151&state=all
 [recent documentation changes]: https://gerrit.lix.systems/q/p:lix+path:%22%5Edoc/manual/.*%22
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3

+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
 [[package]]
 name = "countme"
 version = "3.0.1"
@ -10,15 +16,15 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"

 [[package]]
 name = "dissimilar"
-version = "1.0.9"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
+checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"

 [[package]]
 name = "expect-test"
-version = "1.5.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
+checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3"
 dependencies = [
 "dissimilar",
 "once_cell",
@ -39,6 +45,15 @@ dependencies = [
 "rowan",
 ]

+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@ -56,12 +71,13 @@ dependencies = [

 [[package]]
 name = "rowan"
-version = "0.15.16"
+version = "0.15.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d"
+checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
 dependencies = [
 "countme",
 "hashbrown",
+ "memoffset",
 "rustc-hash",
 "text-size",
 ]
--- a/doc/internal-api/doxygen.cfg.in
+++ b/doc/internal-api/doxygen.cfg.in
@ -33,7 +33,32 @@ GENERATE_LATEX         = NO
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.

-INPUT                  = @INPUT_PATHS@
+# FIXME Make this list more maintainable somehow. We could maybe generate this
+# in the Makefile, but we would need to change how `.in` files are preprocessed
+# so they can expand variables despite configure variables.
+
+INPUT                  = \
+  src/libcmd \
+  src/libexpr \
+  src/libexpr/flake \
+  tests/unit/libexpr \
+  tests/unit/libexpr/value \
+  tests/unit/libexpr/test \
+  tests/unit/libexpr/test/value \
+  src/libexpr/value \
+  src/libfetchers \
+  src/libmain \
+  src/libstore \
+  src/libstore/build \
+  src/libstore/builtins \
+  tests/unit/libstore \
+  tests/unit/libstore/test \
+  src/libutil \
+  tests/unit/libutil \
+  tests/unit/libutil/test \
+  src/nix \
+  src/nix-env \
+  src/nix-store

 # If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
 # in the source code. If set to NO, only conditional compilation will be
@ -72,15 +97,3 @@ EXPAND_AS_DEFINED      = \
  DECLARE_WORKER_SERIALISER \
  DECLARE_SERVE_SERIALISER \
  LENGTH_PREFIXED_PROTO_HELPER
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = "@PROJECT_SOURCE_ROOT@"
--- a/doc/internal-api/meson.build
+++ b/doc/internal-api/meson.build
@ -1,35 +1,3 @@
-internal_api_sources = [
-  'src/libcmd',
-  'src/libexpr',
-  'src/libexpr/flake',
-  'tests/unit/libexpr',
-  'tests/unit/libexpr/value',
-  'tests/unit/libexpr/test',
-  'tests/unit/libexpr/test/value',
-  'src/libexpr/value',
-  'src/libfetchers',
-  'src/libmain',
-  'src/libstore',
-  'src/libstore/build',
-  'src/libstore/builtins',
-  'tests/unit/libstore',
-  'tests/unit/libstore/test',
-  'src/libutil',
-  'tests/unit/libutil',
-  'tests/unit/libutil/test',
-  'src/nix',
-  'src/nix-env',
-  'src/nix-store',
-]
-
-# We feed Doxygen absolute paths so it can be invoked from any working directory.
-internal_api_sources_absolute = []
-foreach src : internal_api_sources
-  internal_api_sources_absolute += '"' + (meson.project_source_root() / src) + '"'
-endforeach
-
-internal_api_sources_oneline = ' \\\n  '.join(internal_api_sources_absolute)
-
 doxygen_cfg = configure_file(
  input : 'doxygen.cfg.in',
  output : 'doxygen.cfg',
@ -37,16 +5,22 @@ doxygen_cfg = configure_file(
    'PACKAGE_VERSION': meson.project_version(),
    'RAPIDCHECK_HEADERS': rapidcheck_meson.get_variable('includedir'),
    'docdir' : meson.current_build_dir(),
-    'INPUT_PATHS' : internal_api_sources_oneline,
-    'PROJECT_SOURCE_ROOT' : meson.project_source_root(),
  },
 )

 internal_api_docs = custom_target(
  'internal-api-docs',
  command : [
-    doxygen.full_path(),
-    '@INPUT0@',
+    bash,
+    # Meson can you please just give us a `workdir` argument to custom targets...
+    '-c',
+    # We have to prefix the doxygen_cfg path with the project build root
+    # because of the cd in front.
+    'cd @0@ && @1@ @2@/@INPUT0@'.format(
+      meson.project_source_root(),
+      doxygen.full_path(),
+      meson.project_build_root(),
+    ),
  ],
  input : [
    doxygen_cfg,
--- a/doc/manual/change-authors.yml
+++ b/doc/manual/change-authors.yml
@ -147,6 +147,3 @@ winter:

 yshui:
  github: yshui
-
-zimbatm:
-  github: zimbatm
--- a/doc/manual/meson.build
+++ b/doc/manual/meson.build
@ -126,19 +126,20 @@ manual = custom_target(
    'manual',
    'markdown',
  ],
-  install : true,
-  install_dir : [
-    datadir / 'doc/nix',
-    false,
-  ],
  depfile : 'manual.d',
  env : {
    'RUST_LOG': 'info',
    'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'src',
  },
 )
+manual_html = manual[0]
 manual_md = manual[1]

+install_subdir(
+  manual_html.full_path(),
+  install_dir : datadir / 'doc/nix',
+)
+
 nix_nested_manpages = [
  [ 'nix-env',
    [
--- a/doc/manual/rl-next/alt-left-and-alt-right-in-repl.md
+++ b/doc/manual/rl-next/alt-left-and-alt-right-in-repl.md
@ -1,10 +0,0 @@
---
-synopsis: "`Alt+Left` and `Alt+Right` go back/forwards by words in `nix repl`"
-issues: [fj#501]
-cls: [1883]
-category: Fixes
-credits: 9999years
---
-
-`nix repl` now recognizes `Alt+Left` and `Alt+Right` for navigating by words
-when entering input in `nix repl` on more terminals/platforms.
--- a/doc/manual/rl-next/ctrl-c-improved.md
+++ b/doc/manual/rl-next/ctrl-c-improved.md
@ -1,13 +0,0 @@
---
-synopsis: Ctrl-C stops Nix commands much more reliably and responsively
-issues: [7245, fj#393]
-cls: [2016]
-prs: [11618]
-category: Fixes
-credits: [roberth, 9999years]
---
-
-CTRL-C will now stop Nix commands much more reliably and responsively. While
-there are still some cases where a Nix command can be slow or unresponsive
-following a `SIGINT` (please report these as issues!), the vast majority of
-signals will now cause the Nix command to quit quickly and consistently.
--- a/doc/manual/rl-next/fetchGit-regression.md
+++ b/doc/manual/rl-next/fetchGit-regression.md
@ -1,23 +0,0 @@
---
-synopsis: restore backwards-compatibility of `builtins.fetchGit` with Nix 2.3
-issues: [5291, 5128]
-credits: [ma27]
-category: Fixes
---
-
-Compatibility with `builtins.fetchGit` from Nix 2.3 has been restored as follows:
-
-* Until now, each `ref` was prefixed with `refs/heads` unless it starts with `refs/` itself.
-
-  Now, this is not done if the `ref` looks like a commit hash.
-
-* Specifying `builtins.fetchGit { ref = "a-tag"; /* … */ }` was broken because `refs/heads` was appended.
-
-  Now, the fetcher doesn't turn a ref into `refs/heads/ref`, but into `refs/*/ref`. That way,
-  the value in `ref` can be either a tag or a branch.
-
-* The ref resolution happens the same way as in git:
-
-  * If `refs/ref` exists, it's used.
-  * If a tag `refs/tags/ref` exists, it's used.
-  * If a branch `refs/heads/ref` exists, it's used.
--- a/doc/manual/rl-next/nix-fmt-default-argument.md
+++ b/doc/manual/rl-next/nix-fmt-default-argument.md
@ -1,38 +0,0 @@
---
-synopsis: Removing the `.` default argument passed to the `nix fmt` formatter
-issues: []
-prs: [11438]
-cls: [1902]
-category: Breaking Changes
-credits: zimbatm
---
-
-The underlying formatter no longer receives the ". " default argument when `nix fmt` is called with no arguments.
-
-This change was necessary as the formatter wasn't able to distinguish between
-a user wanting to format the current folder with `nix fmt .` or the generic
-`nix fmt`.
-
-The default behaviour is now the responsibility of the formatter itself, and
-allows tools such as treefmt to format the whole tree instead of only the
-current directory and below.
-
-This may cause issues with some formatters: nixfmt, nixpkgs-fmt and alejandra currently format stdin when no arguments are passed.
-
-Here is a small wrapper example that will restore the previous behaviour for such a formatter:
-
-```nix
-{
-  outputs = { self, nixpkgs, systems }:
-    let
-      eachSystem = nixpkgs.lib.genAttrs (import systems) (system: nixpkgs.legacyPackages.${system});
-    in
-    {
-      formatter = eachSystem (pkgs:
-        pkgs.writeShellScriptBin "formatter" ''
-          if [[ $# = 0 ]]; set -- .; fi
-          exec "${pkgs.nixfmt-rfc-style}/bin/nixfmt "$@"
-        '');
-    };
-}
-```
--- a/doc/manual/rl-next/readline-support-removed.md
+++ b/doc/manual/rl-next/readline-support-removed.md
@ -1,17 +0,0 @@
---
-synopsis: readline support removed
-cls: [1885]
-category: Packaging
-credits: [9999years]
---
-
-Support for building Lix with [`readline`][readline] instead of
-[`editline`][editline] has been removed. `readline` support hasn't worked for a
-long time (attempting to use it would lead to build errors) and would make Lix
-subject to the GPL if it did work. In the future, we're hoping to replace
-`editline` with [`rustyline`][rustyline] for improved ergonomics in the `nix
-repl`.
-
-[readline]: https://en.wikipedia.org/wiki/GNU_Readline
-[editline]: https://github.com/troglobit/editline
-[rustyline]: https://github.com/kkawakam/rustyline
--- a/doc/manual/rl-next/relative-and-tilde-paths-in-config.md
+++ b/doc/manual/rl-next/relative-and-tilde-paths-in-config.md
@ -1,30 +0,0 @@
---
-synopsis: Relative and tilde paths in configuration
-issues: [fj#482]
-cls: [1851, 1863, 1864]
-category: Features
-credits: [9999years]
---
-
-[Configuration settings](@docroot@/command-ref/conf-file.md) can now refer to
-files with paths relative to the file they're written in or relative to your
-home directory (with `~/`).
-
-This makes settings like
-[`repl-overlays`](@docroot@/command-ref/conf-file.md#conf-repl-overlays) and
-[`secret-key-files`](@docroot@/command-ref/conf-file.md#conf-repl-overlays)
-much easier to set, especially if you'd like to refer to files in an existing
-dotfiles repo cloned into your home directory.
-
-If you put `repl-overlays = repl.nix` in your `~/.config/nix/nix.conf`, it'll
-load `~/.config/nix/repl.nix`. Similarly, you can set `repl-overlays =
-~/.dotfiles/repl.nix` to load a file relative to your home directory.
-
-Configuration files can also
-[`include`](@docroot@/command-ref/conf-file.md#file-format) paths relative to
-your home directory.
-
-Only user configuration files (like `$XDG_CONFIG_HOME/nix/nix.conf` or the
-files listed in `$NIX_USER_CONF_FILES`) can use tilde paths relative to your
-home directory. Configuration listed in the `$NIX_CONFIG` environment variable
-may not use relative paths.
--- a/doc/manual/rl-next/stack-traces.md
+++ b/doc/manual/rl-next/stack-traces.md
@ -1,26 +0,0 @@
---
-synopsis: "Some Lix crashes now produce reporting instructions and a stack trace, then abort"
-cls: [1854]
-category: Improvements
-credits: jade
---
-
-Lix, being a C++ program, can crash in a few kinds of ways.
-It can obviously do a memory access violation, which will generate a core dump and thus be relatively debuggable.
-But, worse, it could throw an unhandled exception, and, in the past, we would just show the message but not where it comes from, in spite of this always being a bug, since we expect all such errors to be translated to a Lix specific error.
-Now the latter kind of bug should print reporting instructions, a rudimentary stack trace and (depending on system configuration) generate a core dump.
-
-Sample output:
-
-```
-Lix crashed. This is a bug. We would appreciate if you report it along with what caused it at https://git.lix.systems/lix-project/lix/issues with the following information included:
-
-Exception: std::runtime_error: test exception
-Stack trace:
- 0# nix::printStackTrace() in /home/jade/lix/lix3/build/src/nix/../libutil/liblixutil.so
- 1# 0x000073C9862331F2 in /home/jade/lix/lix3/build/src/nix/../libmain/liblixmain.so
- 2# 0x000073C985F2E21A in /nix/store/p44qan69linp3ii0xrviypsw2j4qdcp2-gcc-13.2.0-lib/lib/libstdc++.so.6
- 3# 0x000073C985F2E285 in /nix/store/p44qan69linp3ii0xrviypsw2j4qdcp2-gcc-13.2.0-lib/lib/libstdc++.so.6
- 4# nix::handleExceptions(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void ()>) in /home/jade/lix/lix3/build/src/nix/../libmain/liblixmain.so
- ...
-```
--- a/doc/manual/rl-next/verify-tls.md
+++ b/doc/manual/rl-next/verify-tls.md
@ -1,10 +0,0 @@
---
-synopsis: "`<nix/fetchurl.nix>` now uses TLS verification"
-category: Fixes
-prs: [11585]
-credits: edolstra
---
-
-Previously `<nix/fetchurl.nix>` did not do TLS verification. This was because the Nix sandbox in the past did not have access to TLS certificates, and Nix checks the hash of the fetched file anyway. However, this can expose authentication data from `netrc` and URLs to man-in-the-middle attackers. In addition, Nix now in some cases (such as when using impure derivations) does *not* check the hash. Therefore we have now enabled TLS verification. This means that downloads by `<nix/fetchurl.nix>` will now fail if you're fetching from a HTTPS server that does not have a valid certificate.
-
-`<nix/fetchurl.nix>` is also known as the builtin derivation builder `builtin:fetchurl`. It's not to be confused with the evaluation-time function `builtins.fetchurl`, which was not affected by this issue.
--- a/doc/manual/src/installation/multi-user.md
+++ b/doc/manual/src/installation/multi-user.md
@ -36,10 +36,7 @@ All users of the Lix daemon may do the following to bring things into the Nix st
    - Input-addressed, so they are run in the sandbox with no network access, with the following exceptions:

      - The (poorly named, since it is not *just* about chroot) property `__noChroot` is set on the derivation and `sandbox` is set to `relaxed`.
-      - On macOS, the derivation property `__darwinAllowLocalNetworking` allows network access to localhost from input-addressed derivations regardless of the `sandbox` setting value.
-        This property exists with such semantics because macOS has no network namespace equivalent to isolate individual processes' localhost networking.
-      - On macOS, the derivation property `__sandboxProfile` accepts extra sandbox profile S-expressions, allowing derivations to bypass arbitrary parts of the sandbox without altogether disabling it.
-        This is only permitted when `sandbox` is set to `relaxed`.
+      - On macOS, the derivation property `__darwinAllowLocalNetworking` allows network access to localhost from input-addressed derivations regardless of the `sandbox` setting value. This property exists with such semantics because macOS has no network namespace equivalent to isolate individual processes' localhost networking.
    - Output-addressed, so they are run with network access but their result must match an expected hash.

  Trusted users may set any setting, including `sandbox = false`, so the sandbox state can be different at runtime from what is described in `nix.conf` for builds invoked with such settings.
--- a/flake.nix
+++ b/flake.nix
@ -99,10 +99,9 @@
      ];

      stdenvs = [
-        # see assertion in package.nix why these two are disabled
-        # "stdenv"
-        # "gccStdenv"
+        "gccStdenv"
        "clangStdenv"
+        "stdenv"
        "libcxxStdenv"
        "ccacheStdenv"
      ];
@ -122,11 +121,7 @@
            name = "${stdenvName}Packages";
            value = f stdenvName;
          }) stdenvs
-        )
-        // {
-          # TODO delete this and reënable gcc stdenvs once gcc compiles kj coros correctly
-          stdenvPackages = f "clangStdenv";
-        };
+        );

      # Memoize nixpkgs for different platforms for efficiency.
      nixpkgsFor = forAllSystems (
@ -217,7 +212,7 @@

      # A Nixpkgs overlay that overrides the 'nix' and
      # 'nix.perl-bindings' packages.
-      overlays.default = overlayFor (p: p.clangStdenv);
+      overlays.default = overlayFor (p: p.stdenv);

      hydraJobs = {
        # Binary package for various platforms.
--- a/meson.build
+++ b/meson.build
@ -47,12 +47,12 @@
 # in the build directory.

 project('lix', 'cpp', 'rust',
-  meson_version : '>=1.4.0',
  version : run_command('bash', '-c', 'echo -n $(jq -r .version < ./version.json)$VERSION_SUFFIX', check : true).stdout().strip(),
  default_options : [
-    'cpp_std=c++23',
+    'cpp_std=c++2a',
    'rust_std=2021',
-    'warning_level=2',
+    # TODO(Qyriad): increase the warning level
+    'warning_level=1',
    'debug=true',
    'optimization=2',
    'errorlogs=true', # Please print logs for tests that fail
@ -167,18 +167,10 @@ endif
 # frees one would expect when the objects are unique_ptrs. these problems
 # often show up as memory corruption when nesting generators (since we do
 # treat generators like owned memory) and will cause inexplicable crashs.
-#
-# gcc 13 does not compile capnp coroutine code correctly. a newer version
-# may fix this. (cf. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102051)
-# we allow gcc 13 here anyway because CI uses it for clang-tidy, and when
-# the compiler crashes outright if won't produce any bad binaries either.
 assert(
  cxx.get_id() != 'gcc' or cxx.version().version_compare('>=13'),
-  'GCC is known to miscompile coroutines, use clang.'
+  'GCC 12 and earlier are known to miscompile lix coroutines, use GCC 13 or clang.'
 )
-if cxx.get_id() == 'gcc'
-  warning('GCC is known to crash while building coroutines, use clang.')
-endif


 # Translate some historical and Mesony CPU names to Lixy CPU names.
@ -237,7 +229,6 @@ configdata += {
 }

 boost = dependency('boost', required : true, modules : ['container'], include_type : 'system')
-kj = dependency('kj-async', required : true, include_type : 'system')

 # cpuid only makes sense on x86_64
 cpuid_required = is_x64 ? get_option('cpuid') : false
@ -484,7 +475,6 @@ add_project_arguments(
  # TODO(Qyriad): Yes this is how the autoconf+Make system did it.
  # It would be nice for our headers to be idempotent instead.
  '-include', 'config.h',
-  '-Wno-unused-parameter',
  '-Wno-deprecated-declarations',
  '-Wimplicit-fallthrough',
  '-Werror=switch',
@ -493,6 +483,12 @@ add_project_arguments(
  '-Wdeprecated-copy',
  '-Wignored-qualifiers',
  '-Werror=suggest-override',
+  # Enable assertions in libstdc++ by default. Harmless on libc++. Benchmarked
+  # at ~1% overhead in `nix search`.
+  #
+  # FIXME: remove when we get meson 1.4.0 which will default this to on for us:
+  # https://mesonbuild.com/Release-notes-for-1-4-0.html#ndebug-setting-now-controls-c-stdlib-assertions
+  '-D_GLIBCXX_ASSERTIONS=1',
  language : 'cpp',
 )

@ -588,10 +584,10 @@ run_command(
 )

 if is_darwin
-  fs.copyfile(
-    'misc/launchd/org.nixos.nix-daemon.plist.in',
-    'org.nixos.nix-daemon.plist',
-    install : true,
+  configure_file(
+    input : 'misc/launchd/org.nixos.nix-daemon.plist.in',
+    output : 'org.nixos.nix-daemon.plist',
+    copy : true,
    install_dir : prefix / 'Library/LaunchDaemons',
  )
 endif
--- a/meson/clang-tidy/clang-tidy-runner.py
+++ b/meson/clang-tidy/clang-tidy-runner.py
@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-"""
-Runs run-clang-tidy. A bit meta. Maybe it will replace run-clang-tidy one day
-because the run-clang-tidy UX is so questionable.
-"""
-
-# I hereby dedicate this script to fuck you meson.
-# I cannot simply write my code to invoke a subprocess in a meson file because
-# Meson corrupts backslashes in command line args to subprocesses.
-# This is allegedly for "Windows support", but last time I checked Windows
-# neither needs nor wants you to corrupt its command lines.
-# https://github.com/mesonbuild/meson/issues/1564
-
-import multiprocessing
-import subprocess
-import os
-import sys
-from pathlib import Path
-
-
-def default_concurrency():
-    return min(multiprocessing.cpu_count(),
-               int(os.environ.get("NIX_BUILD_CORES", "16")))
-
-
-def go(exe: str, plugin_path: Path, compile_commands_json_dir: Path, jobs: int,
-       paths: list[Path], werror: bool, fix: bool):
-    args = [
-        # XXX: This explicitly invokes it with python because of a nixpkgs bug
-        # where clang-unwrapped does not patch interpreters in run-clang-tidy.
-        # However, making clang-unwrapped depend on python is also silly, so idk.
-        sys.executable,
-        exe,
-        '-quiet',
-        '-load',
-        plugin_path,
-        '-p',
-        compile_commands_json_dir,
-        '-j',
-        str(jobs),
-        '-header-filter',
-        r'src/[^/]+/.*\.hh'
-    ]
-    if werror:
-        args += ['-warnings-as-errors', '*']
-    if fix:
-        args += ['-fix']
-    args += ['--']
-    args += paths
-    os.execvp(sys.executable, args)
-
-
-def main():
-    import argparse
-
-    ap = argparse.ArgumentParser(description='Runs run-clang-tidy for you')
-    ap.add_argument('--jobs',
-                    '-j',
-                    type=int,
-                    default=default_concurrency(),
-                    help='Parallel linting jobs to run')
-    ap.add_argument('--plugin-path',
-                    type=Path,
-                    help='Path to the Lix clang-tidy plugin')
-    # FIXME: maybe we should integrate this so it just fixes the compdb for you and throws it in a tempdir?
-    ap.add_argument(
-        '--compdb-path',
-        type=Path,
-        help=
-        'Path to the directory containing the fixed-up compilation database from clean_compdb'
-    )
-    ap.add_argument('--werror',
-                    action='store_true',
-                    help='Warnings get turned into errors')
-    ap.add_argument('--fix',
-                    action='store_true',
-                    help='Apply fixes for warnings')
-    ap.add_argument('--run-clang-tidy-path',
-                    default='run-clang-tidy',
-                    help='Path to run-clang-tidy')
-    ap.add_argument('paths', nargs='*', help='Source paths to check')
-    args = ap.parse_args()
-
-    go(args.run_clang_tidy_path, args.plugin_path, args.compdb_path, args.jobs,
-       args.paths, args.werror, args.fix)
-
-
-if __name__ == '__main__':
-    main()
--- a/meson/clang-tidy/clean_compdb.py
+++ b/meson/clang-tidy/clean_compdb.py
@ -13,8 +13,8 @@ def process_compdb(compdb: list[dict]) -> list[dict]:
        out = []
        eat_next = False
        for i, arg in enumerate(args):
-            if arg in ['-fpch-preprocess', '-fpch-instantiate-templates']:
-                # -fpch-preprocess as used with gcc, -fpch-instantiate-templates as used by clang
+            if arg == '-fpch-preprocess':
+                # as used with gcc
                continue
            elif arg == '-include-pch' or (arg == '-include' and args[i + 1] == 'precompiled-headers.hh'):
                # -include-pch some-pch (clang), or -include some-pch (gcc)
--- a/meson/clang-tidy/meson.build
+++ b/meson/clang-tidy/meson.build
@ -57,18 +57,34 @@ build_all_generated_headers = custom_target(
 )

 if lix_clang_tidy_so_found
+  default_concurrency = run_command(python, '-c', '''
+import multiprocessing
+import os
+print(min(multiprocessing.cpu_count(), int(os.environ.get("NIX_BUILD_CORES", "16"))))
+  ''', check : true).stdout()
+
  run_clang_tidy_args = [
-    meson.current_source_dir() / 'clang-tidy-runner.py',
-    '--run-clang-tidy-path', run_clang_tidy,
-    '--compdb-path', meson.current_build_dir(),
-    '--plugin-path', lix_clang_tidy_so,
+    '-load',
+    lix_clang_tidy_so,
+    '-p',
+    # We have to workaround a run-clang-tidy bug too, so we must give the
+    # directory name rather than the actual compdb file.
+    # https://github.com/llvm/llvm-project/issues/101440
+    meson.current_build_dir(),
+    '-quiet',
+    '-j', default_concurrency,
  ]
  run_target(
    'clang-tidy',
    command : [
+      # XXX: This explicitly invokes it with python because of a nixpkgs bug
+      # where clang-unwrapped does not patch interpreters in run-clang-tidy.
+      # However, making clang-unwrapped depend on python is also silly, so idk.
      python,
+      run_clang_tidy,
      run_clang_tidy_args,
-      '--werror',
+      '-warnings-as-errors',
+      '*',
    ],
    depends : [
      build_all_generated_headers,
@ -78,8 +94,9 @@ if lix_clang_tidy_so_found
    'clang-tidy-fix',
    command : [
      python,
+      run_clang_tidy,
      run_clang_tidy_args,
-      '--fix',
+      '-fix',
    ],
    depends : [
      build_all_generated_headers,
--- a/misc/bash/meson.build
+++ b/misc/bash/meson.build
@ -1,7 +1,8 @@
-fs.copyfile(
-  'completion.sh',
-  'nix',
+configure_file(
+  input : 'completion.sh',
+  output : 'nix',
  install : true,
  install_dir : datadir / 'bash-completion/completions',
  install_mode : 'rw-r--r--',
+  copy : true,
 )
--- a/misc/fish/completion.fish
+++ b/misc/fish/completion.fish
@ -14,7 +14,7 @@ function _nix_complete
  # But the variable also misses the current token so it cancels out.
  set -l nix_arg_to_complete (count $nix_args)

-  env NIX_GET_COMPLETIONS=$nix_arg_to_complete $nix_args $current_token 2>/dev/null
+  env NIX_GET_COMPLETIONS=$nix_arg_to_complete $nix_args $current_token
 end

 function _nix_accepts_files
--- a/misc/fish/meson.build
+++ b/misc/fish/meson.build
@ -1,7 +1,8 @@
-fs.copyfile(
-  'completion.fish',
-  'nix.fish',
+configure_file(
+  input : 'completion.fish',
+  output : 'nix.fish',
  install : true,
  install_dir : datadir / 'fish/vendor_completions.d',
  install_mode : 'rw-r--r--',
+  copy : true,
 )
--- a/misc/meson.build
+++ b/misc/meson.build
@ -5,4 +5,8 @@ subdir('zsh')
 subdir('systemd')
 subdir('flake-registry')

-runinpty = fs.copyfile('runinpty.py')
+runinpty = configure_file(
+  copy : true,
+  input : meson.current_source_dir() / 'runinpty.py',
+  output : 'runinpty.py',
+)
--- a/misc/zsh/meson.build
+++ b/misc/zsh/meson.build
@ -1,9 +1,10 @@
 foreach script : [ [ 'completion.zsh', '_nix' ], [ 'run-help-nix' ] ]
-  fs.copyfile(
-    script[0],
-    script.get(1, script[0]),
+  configure_file(
+    input : script[0],
+    output : script.get(1, script[0]),
    install : true,
    install_dir : datadir / 'zsh/site-functions',
    install_mode : 'rw-r--r--',
+    copy : true,
  )
 endforeach
--- a/nix-support/editline.patch
+++ b/nix-support/editline.patch
@ -1,106 +0,0 @@
-From d0f2a5bc2300b96b2434c7838184c1dfd6a639f5 Mon Sep 17 00:00:00 2001
-From: Rebecca Turner <rbt@sent.as>
-Date: Sun, 8 Sep 2024 15:42:42 -0700
-Subject: [PATCH 1/2] Recognize Meta+Left and Meta+Right
-
-Recognize `Alt-Left` and `Alt-Right` for navigating by words in more
-terminals/shells/platforms.
-
-I'm not sure exactly where to find canonical documentation for these
-codes, but this seems to match what my terminal produces (macOS + iTerm2
-+ Fish + Tmux).
-
-It might also be nice to have some more support for editing the bindings
-for these characters; sequences of more than one character are not
-supported by `el_bind_key` and similar.
-
-Originally from: https://github.com/troglobit/editline/pull/70
-This patch is applied upstream: https://gerrit.lix.systems/c/lix/+/1883
-
---
- src/editline.c | 29 +++++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/src/editline.c b/src/editline.c
-index 5ec9afb..d1cfbbc 100644
--- a/src/editline.c
-+++ b/src/editline.c
-@@ -1034,6 +1034,30 @@ static el_status_t meta(void)
-         return CSeof;
-
- #ifdef CONFIG_ANSI_ARROWS
-+    /* See: https://en.wikipedia.org/wiki/ANSI_escape_code */
-+    /* Recognize ANSI escapes for `Meta+Left` and `Meta+Right`. */
-+    if (c == '\e') {
-+        switch (tty_get()) {
-+        case '[':
-+        {
-+            switch (tty_get()) {
-+            /* \e\e[C = Meta+Left */
-+            case 'C': return fd_word();
-+            /* \e\e[D = Meta+Right */
-+            case 'D': return bk_word();
-+            default:
-+                break;
-+            }
-+
-+            return el_ring_bell();
-+        }
-+        default:
-+            break;
-+        }
-+
-+        return el_ring_bell();
-+    }
-+
-     /* Also include VT-100 arrows. */
-     if (c == '[' || c == 'O') {
-         switch (tty_get()) {
-@@ -1043,6 +1067,7 @@ static el_status_t meta(void)
-             char seq[4] = { 0 };
-             seq[0] = tty_get();
-
-+            /* \e[1~ */
-             if (seq[0] == '~')
-                 return beg_line(); /* Home */
-
-@@ -1050,9 +1075,9 @@ static el_status_t meta(void)
-                 seq[c] = tty_get();
-
-             if (!strncmp(seq, ";5C", 3))
-                return fd_word(); /* Ctrl+Right */
-+                return fd_word(); /* \e[1;5C = Ctrl+Right */
-             if (!strncmp(seq, ";5D", 3))
-                return bk_word(); /* Ctrl+Left */
-+                return bk_word(); /* \e[1;5D = Ctrl+Left */
-
-             break;
-         }
-
-From 4c4455353a0a88bee09d5f27c28f81f747682fed Mon Sep 17 00:00:00 2001
-From: Rebecca Turner <rbt@sent.as>
-Date: Mon, 9 Sep 2024 09:44:44 -0700
-Subject: [PATCH 2/2] Add support for \e[1;3C and \e[1;3D
-
---
- src/editline.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/editline.c b/src/editline.c
-index d1cfbbc..350b5cb 100644
--- a/src/editline.c
-+++ b/src/editline.c
-@@ -1074,9 +1074,11 @@ static el_status_t meta(void)
-             for (c = 1; c < 3; c++)
-                 seq[c] = tty_get();
-
-            if (!strncmp(seq, ";5C", 3))
-+            if (!strncmp(seq, ";5C", 3)
-+                || !strncmp(seq, ";3C", 3))
-                 return fd_word(); /* \e[1;5C = Ctrl+Right */
-            if (!strncmp(seq, ";5D", 3))
-+            if (!strncmp(seq, ";5D", 3)
-+                || !strncmp(seq, ";3D", 3))
-                 return bk_word(); /* \e[1;5D = Ctrl+Left */
-
-             break;
--- a/package.nix
+++ b/package.nix
@ -15,8 +15,6 @@
  brotli,
  bzip2,
  callPackage,
-  capnproto-lix ? __forDefaults.capnproto-lix,
-  capnproto,
  cmake,
  curl,
  doxygen,
@ -38,7 +36,6 @@
  mercurial,
  meson,
  ninja,
-  ncurses,
  openssl,
  pegtl,
  pkg-config,
@ -82,36 +79,12 @@
    boehmgc-nix = boehmgc.override { enableLargeConfig = true; };

    editline-lix = editline.overrideAttrs (prev: {
-      patches = (prev.patches or [ ]) ++ [
-        # Recognize `Alt-Left` and `Alt-Right` for navigating by words in more
-        # terminals/shells/platforms.
-        #
-        # See: https://github.com/troglobit/editline/pull/70
-        ./nix-support/editline.patch
-      ];
-
-      configureFlags = (prev.configureFlags or [ ]) ++ [
-        # Enable SIGSTOP (Ctrl-Z) behavior.
-        (lib.enableFeature true "sigstop")
-        # Enable ANSI arrow keys.
-        (lib.enableFeature true "arrow-keys")
-        # Use termcap library to query terminal size.
-        (lib.enableFeature (ncurses != null) "termcap")
-      ];
-
-      buildInputs = (prev.buildInputs or [ ]) ++ [ ncurses ];
+      configureFlags = prev.configureFlags or [ ] ++ [ (lib.enableFeature true "sigstop") ];
    });

    build-release-notes = callPackage ./maintainers/build-release-notes.nix { };
-
-    # needs explicit c++20 to enable coroutine support
-    capnproto-lix = capnproto.overrideAttrs { CXXFLAGS = "-std=c++20"; };
  },
 }:
-
-# gcc miscompiles coroutines at least until 13.2, possibly longer
-assert stdenv.cc.isClang || lintInsteadOfBuild || internalApiDocs;
-
 let
  inherit (__forDefaults) canRunInstalled;
  inherit (lib) fileset;
@ -247,7 +220,6 @@ stdenv.mkDerivation (finalAttrs: {
      ninja
      cmake
      rustc
-      capnproto-lix
    ]
    ++ [
      (lib.getBin lowdown)
@ -288,7 +260,6 @@ stdenv.mkDerivation (finalAttrs: {
      libsodium
      toml11
      pegtl
-      capnproto-lix
    ]
    ++ lib.optionals hostPlatform.isLinux [
      libseccomp
--- a/scripts/meson.build
+++ b/scripts/meson.build
@ -8,7 +8,12 @@ configure_file(
  }
 )

-fs.copyfile('nix-profile.sh.in')
+# https://github.com/mesonbuild/meson/issues/860
+configure_file(
+  input : 'nix-profile.sh.in',
+  output : 'nix-profile.sh.in',
+  copy : true,
+)

 foreach rc : [ '.sh', '.fish', '-daemon.sh', '-daemon.fish' ]
  configure_file(
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@ -1,7 +1,11 @@
+#include <cstdlib>
+#include <cstring>
 #include <algorithm>
 #include <set>
 #include <memory>
+#include <string_view>
 #include <tuple>
+#include <iomanip>
 #if __APPLE__
 #include <sys/time.h>
 #endif
@ -14,7 +18,6 @@
 #include "build-result.hh"
 #include "store-api.hh"
 #include "derivations.hh"
-#include "strings.hh"
 #include "local-store.hh"
 #include "legacy.hh"
 #include "experimental-features.hh"
--- a/src/libcmd/built-path.hh
+++ b/src/libcmd/built-path.hh
@ -20,15 +20,13 @@ struct SingleBuiltPathBuilt {
    DECLARE_CMP(SingleBuiltPathBuilt);
 };

-namespace built_path::detail {
-using SingleBuiltPathRaw = std::variant<
+using _SingleBuiltPathRaw = std::variant<
    DerivedPathOpaque,
    SingleBuiltPathBuilt
 >;
-}

-struct SingleBuiltPath : built_path::detail::SingleBuiltPathRaw {
-    using Raw = built_path::detail::SingleBuiltPathRaw;
+struct SingleBuiltPath : _SingleBuiltPathRaw {
+    using Raw = _SingleBuiltPathRaw;
    using Raw::Raw;

    using Opaque = DerivedPathOpaque;
@ -67,19 +65,17 @@ struct BuiltPathBuilt {
    DECLARE_CMP(BuiltPathBuilt);
 };

-namespace built_path::detail {
-using BuiltPathRaw = std::variant<
+using _BuiltPathRaw = std::variant<
    DerivedPath::Opaque,
    BuiltPathBuilt
 >;
-}

 /**
 * A built path. Similar to a DerivedPath, but enriched with the corresponding
 * output path(s).
 */
-struct BuiltPath : built_path::detail::BuiltPathRaw {
-    using Raw = built_path::detail::BuiltPathRaw;
+struct BuiltPath : _BuiltPathRaw {
+    using Raw = _BuiltPathRaw;
    using Raw::Raw;

    using Opaque = DerivedPathOpaque;
--- a/src/libcmd/common-eval-args.cc
+++ b/src/libcmd/common-eval-args.cc
@ -9,24 +9,8 @@
 #include "store-api.hh"
 #include "command.hh"

-#include <regex>
-
 namespace nix {

-static std::regex const identifierRegex("^[A-Za-z_][A-Za-z0-9_'-]*$");
-static void warnInvalidNixIdentifier(const std::string & name)
-{
-    std::smatch match;
-    if (!std::regex_match(name, match, identifierRegex)) {
-        warn("This Nix invocation specifies a value for argument '%s' which isn't a valid \
-Nix identifier. The project is considering to drop support for this \
-or to require quotes around args that aren't valid Nix identifiers. \
-If you depend on this behvior, please reach out in \
-https://git.lix.systems/lix-project/lix/issues/496 so we can discuss \
-your use-case.", name);
-    }
-}
-
 MixEvalArgs::MixEvalArgs()
 {
    addFlag({
@ -34,10 +18,7 @@ MixEvalArgs::MixEvalArgs()
        .description = "Pass the value *expr* as the argument *name* to Nix functions.",
        .category = category,
        .labels = {"name", "expr"},
-        .handler = {[&](std::string name, std::string expr) {
-            warnInvalidNixIdentifier(name);
-            autoArgs[name] = 'E' + expr;
-        }}
+        .handler = {[&](std::string name, std::string expr) { autoArgs[name] = 'E' + expr; }}
    });

    addFlag({
@ -45,10 +26,7 @@ MixEvalArgs::MixEvalArgs()
        .description = "Pass the string *string* as the argument *name* to Nix functions.",
        .category = category,
        .labels = {"name", "string"},
-        .handler = {[&](std::string name, std::string s) {
-            warnInvalidNixIdentifier(name);
-            autoArgs[name] = 'S' + s;
-        }},
+        .handler = {[&](std::string name, std::string s) { autoArgs[name] = 'S' + s; }},
    });

    addFlag({
--- a/src/libcmd/editor-for.cc
+++ b/src/libcmd/editor-for.cc
@ -1,7 +1,6 @@
 #include "editor-for.hh"
 #include "environment-variables.hh"
 #include "source-path.hh"
-#include "strings.hh"

 namespace nix {

--- a/src/libcmd/repl-interacter.cc
+++ b/src/libcmd/repl-interacter.cc
@ -8,6 +8,10 @@
 #include <string_view>
 #include <cerrno>

+#ifdef READLINE
+#include <readline/history.h>
+#include <readline/readline.h>
+#else
 // editline < 1.15.2 don't wrap their API for C++ usage
 // (added in https://github.com/troglobit/editline/commit/91398ceb3427b730995357e9d120539fb9bb7461).
 // This results in linker errors due to to name-mangling of editline C symbols.
@ -16,6 +20,7 @@
 extern "C" {
 #include <editline.h>
 }
+#endif

 #include "finally.hh"
 #include "repl-interacter.hh"
@ -110,13 +115,17 @@ ReadlineLikeInteracter::Guard ReadlineLikeInteracter::init(detail::ReplCompleter
    } catch (SysError & e) {
        logWarning(e.info());
    }
+#ifndef READLINE
    el_hist_size = 1000;
+#endif
    read_history(historyFile.c_str());
    auto oldRepl = curRepl;
    curRepl = repl;
    Guard restoreRepl([oldRepl] { curRepl = oldRepl; });
+#ifndef READLINE
    rl_set_complete_func(completionCallback);
    rl_set_list_possib_func(listPossibleCallback);
+#endif
    return restoreRepl;
 }

--- a/src/libexpr/eval-cache.cc
+++ b/src/libexpr/eval-cache.cc
@ -79,7 +79,7 @@ struct AttrDb
                state->txn->commit();
            state->txn.reset();
        } catch (...) {
-            ignoreExceptionInDestructor();
+            ignoreException();
        }
    }

@ -90,7 +90,7 @@ struct AttrDb
        try {
            return fun();
        } catch (SQLiteError &) {
-            ignoreExceptionExceptInterrupt();
+            ignoreException();
            failed = true;
            return 0;
        }
@ -329,7 +329,7 @@ static std::shared_ptr<AttrDb> makeAttrDb(
    try {
        return std::make_shared<AttrDb>(cfg, fingerprint, symbols);
    } catch (SQLiteError &) {
-        ignoreExceptionExceptInterrupt();
+        ignoreException();
        return nullptr;
    }
 }
--- a/src/libexpr/eval-error.hh
+++ b/src/libexpr/eval-error.hh
@ -1,8 +1,9 @@
 #pragma once
 ///@file

+#include <algorithm>
+
 #include "error.hh"
-#include "types.hh"
 #include "pos-idx.hh"

 namespace nix {
--- a/src/libexpr/eval-inline.hh
+++ b/src/libexpr/eval-inline.hh
@ -31,7 +31,7 @@ Value * EvalState::allocValue()
 #endif

    nrValues++;
-    return static_cast<Value *>(p);
+    return (Value *) p;
 }


@ -54,10 +54,10 @@ Env & EvalState::allocEnv(size_t size)
        void * p = *env1AllocCache;
        *env1AllocCache = GC_NEXT(p);
        GC_NEXT(p) = nullptr;
-        env = static_cast<Env *>(p);
+        env = (Env *) p;
    } else
 #endif
-        env = static_cast<Env *>(gcAllocBytes(sizeof(Env) + size * sizeof(Value *)));
+        env = (Env *) gcAllocBytes(sizeof(Env) + size * sizeof(Value *));

    /* We assume that env->values has been cleared by the allocator; maybeThunk() and lookupVar fromWith expect this. */

--- a/src/libexpr/eval-settings.hh
+++ b/src/libexpr/eval-settings.hh
@ -185,54 +185,6 @@ struct EvalSettings : Config
          else
          { }
          ```
-
-          Here's a more elaborate `repl-overlay`, which provides the following
-          variables:
-          - The original, unmodified variables are aliased to `original`.
-          - `legacyPackages.${system}` (if it exists) or `packages.${system}`
-            (otherwise) is aliased to `pkgs`.
-          - All attribute set variables with a `${system}` attribute are
-            abbreviated in the same manner; e.g. `devShells.${system}` is
-            shortened to `devShells`.
-
-          For example, the following attribute set:
-
-          ```nix
-          info: final: attrs: let
-            # Equivalent to nixpkgs `lib.optionalAttrs`.
-            optionalAttrs = predicate: attrs:
-              if predicate
-              then attrs
-              else {};
-
-            # If `attrs.${oldName}.${info.currentSystem}` exists, alias `${newName}` to
-            # it.
-            collapseRenamed = oldName: newName:
-              optionalAttrs (builtins.hasAttr oldName attrs
-                && builtins.hasAttr info.currentSystem attrs.${oldName})
-              {
-                ${newName} = attrs.${oldName}.${info.currentSystem};
-              };
-
-            # Alias `attrs.${oldName}.${info.currentSystem} to `${newName}`.
-            collapse = name: collapseRenamed name name;
-
-            # Alias all `attrs` keys with an `${info.currentSystem}` attribute.
-            collapseAll =
-              builtins.foldl'
-              (prev: name: prev // collapse name)
-              {}
-              (builtins.attrNames attrs);
-          in
-            # Preserve the original bindings as `original`.
-            (optionalAttrs (! attrs ? original)
-              {
-                original = attrs;
-              })
-            // (collapseRenamed "packages" "pkgs")
-            // (collapseRenamed "legacyPackages" "pkgs")
-            // collapseAll
-          ```
        )"};
 };

--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@ -19,7 +19,6 @@
 #include "gc-small-vector.hh"
 #include "fetch-to-store.hh"
 #include "flake/flakeref.hh"
-#include "exit.hh"

 #include <algorithm>
 #include <iostream>
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@ -12,7 +12,6 @@
 #include "experimental-features.hh"
 #include "search-path.hh"
 #include "repl-exit-status.hh"
-#include "backed-string-view.hh"

 #include <map>
 #include <optional>
@ -792,4 +791,4 @@ static constexpr std::string_view corepkgsPrefix{"/__corepkgs__/"};

 }

-#include "eval-inline.hh" // IWYU pragma: keep
+#include "eval-inline.hh"
--- a/src/libexpr/gc-alloc.hh
+++ b/src/libexpr/gc-alloc.hh
@ -120,7 +120,6 @@ inline T * gcAllocType(size_t howMany = 1)
    // However, people can and do request zero sized allocations, so we need
    // to check that neither of our multiplicands were zero before complaining
    // about it.
-    // NOLINTNEXTLINE(bugprone-sizeof-expression): yeah we only seem to alloc pointers with this. the calculation *is* correct though!
    auto checkedSz = checked::Checked<size_t>(howMany) * sizeof(T);
    size_t sz = checkedSz.valueWrapping();
    if (checkedSz.overflowed()) {
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@ -11,7 +11,6 @@
 namespace nix {

 ExprBlackHole eBlackHole;
-Expr *eBlackHoleAddr = &eBlackHole;

 // FIXME: remove, because *symbols* are abstract and do not have a single
 //        textual representation; see printIdentifier()
@ -21,14 +20,6 @@ std::ostream & operator <<(std::ostream & str, const SymbolStr & symbol)
    return printIdentifier(str, s);
 }

-AttrName::AttrName(Symbol s) : symbol(s)
-{
-}
-
-AttrName::AttrName(std::unique_ptr<Expr> e) : expr(std::move(e))
-{
-}
-
 void Expr::show(const SymbolTable & symbols, std::ostream & str) const
 {
    abort();
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@ -11,7 +11,6 @@
 #include "eval-error.hh"
 #include "pos-idx.hh"
 #include "pos-table.hh"
-#include "strings.hh"

 namespace nix {

@ -30,8 +29,8 @@ struct AttrName
 {
    Symbol symbol;
    std::unique_ptr<Expr> expr;
-    AttrName(Symbol s);
-    AttrName(std::unique_ptr<Expr> e);
+    AttrName(Symbol s) : symbol(s) {};
+    AttrName(std::unique_ptr<Expr> e) : expr(std::move(e)) {};
 };

 typedef std::vector<AttrName> AttrPath;
--- a/src/libexpr/parser/state.hh
+++ b/src/libexpr/parser/state.hh
@ -9,7 +9,7 @@ namespace nix::parser {
 struct StringToken
 {
    std::string_view s;
-    bool hasIndentation = false;
+    bool hasIndentation;
    operator std::string_view() const { return s; }
 };

--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@ -394,8 +394,7 @@ static RegisterPrimOp primop_fetchGit({
        [Git reference]: https://git-scm.com/book/en/v2/Git-Internals-Git-References

        By default, the `ref` value is prefixed with `refs/heads/`.
-        As of 2.3.0, Nix will not prefix `refs/heads/` if `ref` starts with `refs/` or
-        if `ref` looks like a commit hash for backwards compatibility with CppNix 2.3.
+        As of 2.3.0, Nix will not prefix `refs/heads/` if `ref` starts with `refs/`.

      - `submodules` (default: `false`)

--- a/src/libexpr/value.hh
+++ b/src/libexpr/value.hh
@ -136,9 +136,7 @@ class ExternalValueBase

 std::ostream & operator << (std::ostream & str, const ExternalValueBase & v);

-/** This is just the address of eBlackHole. It exists because eBlackHole has an
- * incomplete type at usage sites so is not possible to cast. */
-extern Expr *eBlackHoleAddr;
+extern ExprBlackHole eBlackHole;

 struct NewValueAs
 {
@ -198,7 +196,6 @@ private:
 public:

    // Discount `using NewValueAs::*;`
-// NOLINTNEXTLINE(bugprone-macro-parentheses)
 #define USING_VALUETYPE(name) using name = NewValueAs::name
    USING_VALUETYPE(integer_t);
    USING_VALUETYPE(floating_t);
@ -476,7 +473,7 @@ public:
    /// Constructs an evil thunk, whose evaluation represents infinite recursion.
    explicit Value(blackhole_t)
        : internalType(tThunk)
-        , thunk({ .env = nullptr, .expr = eBlackHoleAddr })
+        , thunk({ .env = nullptr, .expr = reinterpret_cast<Expr *>(&eBlackHole) })
    { }

    Value(Value const & rhs) = default;
@ -516,10 +513,7 @@ public:
    // type() == nThunk
    inline bool isThunk() const { return internalType == tThunk; };
    inline bool isApp() const { return internalType == tApp; };
-    inline bool isBlackhole() const
-    {
-        return internalType == tThunk && thunk.expr == eBlackHoleAddr;
-    }
+    inline bool isBlackhole() const;

    // type() == nFunction
    inline bool isLambda() const { return internalType == tLambda; };
@ -675,6 +669,11 @@ public:

    void mkStringMove(const char * s, const NixStringContext & context);

+    inline void mkString(const Symbol & s)
+    {
+        mkString(((const std::string &) s).c_str());
+    }
+
    void mkPath(const SourcePath & path);

    inline void mkPath(const char * path)
@ -733,11 +732,7 @@ public:
        lambda.fun = f;
    }

-    inline void mkBlackhole()
-    {
-        internalType = tThunk;
-        thunk.expr = eBlackHoleAddr;
-    }
+    inline void mkBlackhole();

    void mkPrimOp(PrimOp * p);

@ -837,6 +832,18 @@ public:
    }
 };

+
+bool Value::isBlackhole() const
+{
+    return internalType == tThunk && thunk.expr == (Expr*) &eBlackHole;
+}
+
+void Value::mkBlackhole()
+{
+    internalType = tThunk;
+    thunk.expr = (Expr*) &eBlackHole;
+}
+
 using ValueVector = GcVector<Value *>;
 using ValueMap = GcMap<Symbol, Value *>;
 using ValueVectorMap = std::map<Symbol, ValueVector>;
--- a/src/libfetchers/fetch-settings.cc
+++ b/src/libfetchers/fetch-settings.cc
@ -7,33 +7,7 @@

 namespace nix {

-void to_json(nlohmann::json & j, const AcceptFlakeConfig & e)
-{
-    if (e == AcceptFlakeConfig::False) {
-        j = false;
-    } else if (e == AcceptFlakeConfig::Ask) {
-        j = "ask";
-    } else if (e == AcceptFlakeConfig::True) {
-        j = true;
-    } else {
-        abort();
-    }
-}
-
-void from_json(const nlohmann::json & j, AcceptFlakeConfig & e)
-{
-    if (j == false) {
-        e = AcceptFlakeConfig::False;
-    } else if (j == "ask") {
-        e = AcceptFlakeConfig::Ask;
-    } else if (j == true) {
-        e = AcceptFlakeConfig::True;
-    } else {
-        throw Error("Invalid accept-flake-config value '%s'", std::string(j));
-    }
-}
-
-template<> AcceptFlakeConfig BaseSetting<AcceptFlakeConfig>::parse(const std::string & str, const ApplyConfigOptions & options) const
+template<> AcceptFlakeConfig BaseSetting<AcceptFlakeConfig>::parse(const std::string & str) const
 {
    if (str == "true") return AcceptFlakeConfig::True;
    else if (str == "ask") return AcceptFlakeConfig::Ask;
--- a/src/libfetchers/fetch-settings.hh
+++ b/src/libfetchers/fetch-settings.hh
@ -13,9 +13,6 @@ namespace nix {

 enum class AcceptFlakeConfig { False, Ask, True };

-void to_json(nlohmann::json & j, const AcceptFlakeConfig & e);
-void from_json(const nlohmann::json & j, AcceptFlakeConfig & e);
-
 struct FetchSettings : public Config
 {
    FetchSettings();
--- a/src/libfetchers/fetchers.hh
+++ b/src/libfetchers/fetchers.hh
@ -7,8 +7,6 @@
 #include "path.hh"
 #include "attrs.hh"
 #include "url.hh"
-#include "ref.hh"
-#include "strings.hh"

 #include <memory>

--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@ -1,4 +1,3 @@
-#include "error.hh"
 #include "fetchers.hh"
 #include "cache.hh"
 #include "globals.hh"
@ -258,28 +257,6 @@ std::pair<StorePath, Input> fetchFromWorkdir(ref<Store> store, Input & input, co
 }
 }  // end namespace

-static std::optional<Path> resolveRefToCachePath(
-    Input & input,
-    const Path & cacheDir,
-    std::vector<Path> & gitRefFileCandidates,
-    std::function<bool(const Path&)> condition)
-{
-    if (input.getRef()->starts_with("refs/")) {
-        Path fullpath = cacheDir + "/" + *input.getRef();
-        if (condition(fullpath)) {
-            return fullpath;
-        }
-    }
-
-    for (auto & candidate : gitRefFileCandidates) {
-        if (condition(candidate)) {
-            return candidate;
-        }
-    }
-
-    return std::nullopt;
-}
-
 struct GitInputScheme : InputScheme
 {
    std::optional<Input> inputFromURL(const ParsedURL & url, bool requireTree) const override
@ -562,13 +539,10 @@ struct GitInputScheme : InputScheme
                runProgram("git", true, { "-c", "init.defaultBranch=" + gitInitialBranch, "init", "--bare", repoDir });
            }

-            std::vector<Path> gitRefFileCandidates;
-            for (auto & infix : {"", "tags/", "heads/"}) {
-                Path p = cacheDir + "/refs/" + infix + *input.getRef();
-                gitRefFileCandidates.push_back(p);
-            }
-
-            Path localRefFile;
+            Path localRefFile =
+                input.getRef()->compare(0, 5, "refs/") == 0
+                ? cacheDir + "/" + *input.getRef()
+                : cacheDir + "/refs/heads/" + *input.getRef();

            bool doFetch;
            time_t now = time(0);
@ -590,70 +564,29 @@ struct GitInputScheme : InputScheme
                if (allRefs) {
                    doFetch = true;
                } else {
-                    std::function<bool(const Path&)> condition;
-                    condition = [&now](const Path & path) {
-                        /* If the local ref is older than ‘tarball-ttl’ seconds, do a
-                           git fetch to update the local ref to the remote ref. */
-                        struct stat st;
-                        return stat(path.c_str(), &st) == 0 &&
-                            isCacheFileWithinTtl(now, st);
-                    };
-                    if (auto result = resolveRefToCachePath(
-                        input,
-                        cacheDir,
-                        gitRefFileCandidates,
-                        condition
-                    )) {
-                        localRefFile = *result;
-                        doFetch = false;
-                    } else {
-                        doFetch = true;
-                    }
+                    /* If the local ref is older than ‘tarball-ttl’ seconds, do a
+                       git fetch to update the local ref to the remote ref. */
+                    struct stat st;
+                    doFetch = stat(localRefFile.c_str(), &st) != 0 ||
+                        !isCacheFileWithinTtl(now, st);
                }
            }

-            // When having to fetch, we don't know `localRefFile` yet.
-            // Because git needs to figure out what we're fetching
-            // (i.e. is it a rev? a branch? a tag?)
            if (doFetch) {
                Activity act(*logger, lvlTalkative, actUnknown, fmt("fetching Git repository '%s'", actualUrl));

-                auto ref = input.getRef();
-                std::string fetchRef;
-                if (allRefs) {
-                    fetchRef = "refs/*";
-                } else if (
-                    ref->starts_with("refs/")
-                    || *ref == "HEAD"
-                    || std::regex_match(*ref, revRegex))
-                {
-                    fetchRef = *ref;
-                } else {
-                    fetchRef = "refs/*/" + *ref;
-                }
-
+                // FIXME: git stderr messes up our progress indicator, so
+                // we're using --quiet for now. Should process its stderr.
                try {
-                    Finally finally([&]() {
-                        if (auto p = resolveRefToCachePath(
-                            input,
-                            cacheDir,
-                            gitRefFileCandidates,
-                            pathExists
-                        )) {
-                            localRefFile = *p;
-                        }
-                    });
-
-                    // FIXME: git stderr messes up our progress indicator, so
-                    // we're using --quiet for now. Should process its stderr.
-                    runProgram("git", true, {
-                        "-C", repoDir,
-                        "--git-dir", gitDir,
-                        "fetch",
-                        "--quiet",
-                        "--force",
-                        "--", actualUrl, fmt("%s:%s", fetchRef, fetchRef)
-                    }, true);
+                    auto ref = input.getRef();
+                    auto fetchRef = allRefs
+                        ? "refs/*"
+                        : ref->compare(0, 5, "refs/") == 0
+                            ? *ref
+                            : ref == "HEAD"
+                                ? *ref
+                                : "refs/heads/" + *ref;
+                    runProgram("git", true, { "-C", repoDir, "--git-dir", gitDir, "fetch", "--quiet", "--force", "--", actualUrl, fmt("%s:%s", fetchRef, fetchRef) }, true);
                } catch (Error & e) {
                    if (!pathExists(localRefFile)) throw;
                    warn("could not update local clone of Git repository '%s'; continuing with the most recent version", actualUrl);
--- a/src/libmain/crash-handler.cc
+++ b/src/libmain/crash-handler.cc
@ -1,41 +0,0 @@
-#include "crash-handler.hh"
-#include "fmt.hh"
-
-#include <boost/core/demangle.hpp>
-#include <exception>
-
-namespace nix {
-
-namespace {
-void onTerminate()
-{
-    std::cerr << "Lix crashed. This is a bug. We would appreciate if you report it along with what caused it at https://git.lix.systems/lix-project/lix/issues with the following information included:\n\n";
-    try {
-        std::exception_ptr eptr = std::current_exception();
-        if (eptr) {
-            std::rethrow_exception(eptr);
-        } else {
-            std::cerr << "std::terminate() called without exception\n";
-        }
-    } catch (const std::exception & ex) {
-        std::cerr << "Exception: " << boost::core::demangle(typeid(ex).name()) << ": " << ex.what() << "\n";
-    } catch (...) {
-        std::cerr << "Unknown exception! Spooky.\n";
-    }
-
-    std::cerr << "Stack trace:\n";
-    nix::printStackTrace();
-
-    std::abort();
-}
-}
-
-void registerCrashHandler()
-{
-    // DO NOT use this for signals. Boost stacktrace is very much not
-    // async-signal-safe, and in a world with ASLR, addr2line is pointless.
-    //
-    // If you want signals, set up a minidump system and do it out-of-process.
-    std::set_terminate(onTerminate);
-}
-}
--- a/src/libmain/crash-handler.hh
+++ b/src/libmain/crash-handler.hh
@ -1,21 +0,0 @@
-#pragma once
-/// @file Crash handler for Lix that prints back traces (hopefully in instances where it is not just going to crash the process itself).
-/*
- * Author's note: This will probably be partially/fully supplanted by a
- * minidump writer like the following once we get our act together on crashes a
- * little bit more:
- * https://github.com/rust-minidump/minidump-writer
- * https://github.com/EmbarkStudios/crash-handling
- * (out of process implementation *should* be able to be done on-demand)
- *
- * Such an out-of-process implementation could then both make minidumps and
- * print stack traces for arbitrarily messed-up process states such that we can
- * safely give out backtraces for SIGSEGV and other deadly signals.
- */
-
-namespace nix {
-
-/** Registers the Lix crash handler for std::terminate (currently; will support more crashes later). See also detectStackOverflow().  */
-void registerCrashHandler();
-
-}
--- a/src/libmain/loggers.cc
+++ b/src/libmain/loggers.cc
@ -7,7 +7,7 @@ namespace nix {
 LogFormat defaultLogFormat = LogFormat::raw;

 LogFormat parseLogFormat(const std::string & logFormatStr) {
-    if (logFormatStr == "raw")
+    if (logFormatStr == "raw" || getEnv("NIX_GET_COMPLETIONS"))
        return LogFormat::raw;
    else if (logFormatStr == "raw-with-logs")
        return LogFormat::rawWithLogs;
--- a/src/libmain/meson.build
+++ b/src/libmain/meson.build
@ -1,6 +1,5 @@
 libmain_sources = files(
  'common-args.cc',
-  'crash-handler.cc',
  'loggers.cc',
  'progress-bar.cc',
  'shared.cc',
@ -9,7 +8,6 @@ libmain_sources = files(

 libmain_headers = files(
  'common-args.hh',
-  'crash-handler.hh',
  'loggers.hh',
  'progress-bar.hh',
  'shared.hh',
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@ -1,9 +1,8 @@
 #include "progress-bar.hh"
-#include "file-system.hh"
 #include "sync.hh"
+#include "store-api.hh"
 #include "names.hh"
 #include "terminal.hh"
-#include "strings.hh"

 #include <map>
 #include <thread>
@ -92,7 +91,7 @@ void ProgressBar::resume()
            nextWakeup = draw(*state, {});
            state.wait_for(quitCV, std::chrono::milliseconds(50));
        }
-        eraseProgressDisplay(*state);
+        writeLogsToStderr("\r\e[K");
    });
 }

@ -558,8 +557,7 @@ std::optional<char> ProgressBar::ask(std::string_view msg)
 {
    auto state(state_.lock());
    if (state->paused > 0 || !isatty(STDIN_FILENO)) return {};
-    eraseProgressDisplay(*state);
-    std::cerr << msg;
+    std::cerr << fmt("\r\e[K%s ", msg);
    auto s = trim(readLine(STDIN_FILENO));
    if (s.size() != 1) return {};
    draw(*state, {});
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@ -1,4 +1,3 @@
-#include "crash-handler.hh"
 #include "globals.hh"
 #include "shared.hh"
 #include "store-api.hh"
@ -7,8 +6,6 @@
 #include "loggers.hh"
 #include "current-process.hh"
 #include "terminal.hh"
-#include "strings.hh"
-#include "exit.hh"

 #include <algorithm>
 #include <exception>
@ -119,8 +116,6 @@ static void sigHandler(int signo) { }

 void initNix()
 {
-    registerCrashHandler();
-
    /* Turn on buffering for cerr. */
    static char buf[1024];
    std::cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));
@ -338,15 +333,12 @@ int handleExceptions(const std::string & programName, std::function<void()> fun)
    } catch (BaseError & e) {
        logError(e.info());
        return e.info().status;
-    } catch (const std::bad_alloc & e) {
+    } catch (std::bad_alloc & e) {
        printError(error + "out of memory");
        return 1;
-    } catch (const std::exception & e) {
-        // Random exceptions bubbling into main are cause for bug reports, crash
-        std::terminate();
-    } catch (...) {
-        // Explicitly do not tolerate non-std exceptions escaping.
-        std::terminate();
+    } catch (std::exception & e) {
+        printError(error + e.what());
+        return 1;
    }

    return 0;
@ -395,7 +387,7 @@ RunPager::~RunPager()
            pid.wait();
        }
    } catch (...) {
-        ignoreExceptionInDestructor();
+        ignoreException();
    }
 }

--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@ -7,10 +7,12 @@
 #include "path.hh"
 #include "derived-path.hh"
 #include "processes.hh"
-#include "strings.hh"
+#include "exit.hh"

 #include <signal.h>

+#include <locale>
+

 namespace nix {

@ -111,7 +113,7 @@ struct PrintFreed


 /**
- * Install a SIGSEGV handler to detect stack overflows. See also registerCrashHandler().
+ * Install a SIGSEGV handler to detect stack overflows.
 */
 void detectStackOverflow();

--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@ -10,7 +10,6 @@
 #include "nar-accessor.hh"
 #include "thread-pool.hh"
 #include "signals.hh"
-#include "strings.hh"

 #include <chrono>
 #include <regex>
--- a/src/libstore/build-result.hh
+++ b/src/libstore/build-result.hh
@ -47,7 +47,7 @@ struct BuildResult
     * @todo This should be an entire ErrorInfo object, not just a
     * string, for richer information.
     */
-    std::string errorMsg = {};
+    std::string errorMsg;

    std::string toString() const {
        auto strStatus = [&]() {
@ -90,7 +90,7 @@ struct BuildResult
     * For derivations, a mapping from the names of the wanted outputs
     * to actual paths.
     */
-    SingleDrvOutputs builtOutputs = {};
+    SingleDrvOutputs builtOutputs;

    /**
     * The start/stop times of the build (or one of the rounds, if it
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@ -9,15 +9,8 @@
 #include "logging-json.hh"
 #include "substitution-goal.hh"
 #include "drv-output-substitution-goal.hh"
-#include "strings.hh"

-#include <boost/outcome/try.hpp>
 #include <fstream>
-#include <kj/array.h>
-#include <kj/async-unix.h>
-#include <kj/async.h>
-#include <kj/debug.h>
-#include <kj/vector.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@ -64,25 +57,26 @@
 namespace nix {

 DerivationGoal::DerivationGoal(const StorePath & drvPath,
-    const OutputsSpec & wantedOutputs, Worker & worker, bool isDependency, BuildMode buildMode)
-    : Goal(worker, isDependency)
+    const OutputsSpec & wantedOutputs, Worker & worker, BuildMode buildMode)
+    : Goal(worker)
    , useDerivation(true)
    , drvPath(drvPath)
    , wantedOutputs(wantedOutputs)
    , buildMode(buildMode)
 {
+    state = &DerivationGoal::getDerivation;
    name = fmt(
        "building of '%s' from .drv file",
        DerivedPath::Built { makeConstantStorePathRef(drvPath), wantedOutputs }.to_string(worker.store));
    trace("created");

-    mcExpectedBuilds = worker.expectedBuilds.addTemporarily(1);
+    mcExpectedBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.expectedBuilds);
 }


 DerivationGoal::DerivationGoal(const StorePath & drvPath, const BasicDerivation & drv,
-    const OutputsSpec & wantedOutputs, Worker & worker, bool isDependency, BuildMode buildMode)
-    : Goal(worker, isDependency)
+    const OutputsSpec & wantedOutputs, Worker & worker, BuildMode buildMode)
+    : Goal(worker)
    , useDerivation(false)
    , drvPath(drvPath)
    , wantedOutputs(wantedOutputs)
@ -90,12 +84,13 @@ DerivationGoal::DerivationGoal(const StorePath & drvPath, const BasicDerivation
 {
    this->drv = std::make_unique<Derivation>(drv);

+    state = &DerivationGoal::haveDerivation;
    name = fmt(
        "building of '%s' from in-memory derivation",
        DerivedPath::Built { makeConstantStorePathRef(drvPath), drv.outputNames() }.to_string(worker.store));
    trace("created");

-    mcExpectedBuilds = worker.expectedBuilds.addTemporarily(1);
+    mcExpectedBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.expectedBuilds);

    /* Prevent the .chroot directory from being
       garbage-collected. (See isActiveTempFile() in gc.cc.) */
@ -107,7 +102,17 @@ DerivationGoal::~DerivationGoal() noexcept(false)
 {
    /* Careful: we should never ever throw an exception from a
       destructor. */
-    try { closeLogFile(); } catch (...) { ignoreExceptionInDestructor(); }
+    try { closeLogFile(); } catch (...) { ignoreException(); }
+}
+
+
+std::string DerivationGoal::key()
+{
+    /* Ensure that derivations get built in order of their name,
+       i.e. a derivation named "aardvark" always comes before
+       "baboon". And substitution goals always happen before
+       derivation goals (due to "b$"). */
+    return "b$" + std::string(drvPath.name()) + "$" + worker.store.printStorePath(drvPath);
 }


@ -118,24 +123,20 @@ void DerivationGoal::killChild()
 }


-Goal::WorkResult DerivationGoal::timedOut(Error && ex)
+Goal::Finished DerivationGoal::timedOut(Error && ex)
 {
    killChild();
    return done(BuildResult::TimedOut, {}, std::move(ex));
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::workImpl() noexcept
+Goal::WorkResult DerivationGoal::work(bool inBuildSlot)
 {
-    return useDerivation ? getDerivation() : haveDerivation();
+    return (this->*state)(inBuildSlot);
 }

-bool DerivationGoal::addWantedOutputs(const OutputsSpec & outputs)
+void DerivationGoal::addWantedOutputs(const OutputsSpec & outputs)
 {
-    if (isDone) {
-        return false;
-    }
-
    auto newWanted = wantedOutputs.union_(outputs);
    switch (needRestart) {
    case NeedRestartForMoreOutputs::OutputsUnmodifedDontNeed:
@ -152,38 +153,32 @@ bool DerivationGoal::addWantedOutputs(const OutputsSpec & outputs)
        break;
    };
    wantedOutputs = newWanted;
-    return true;
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::getDerivation() noexcept
-try {
+Goal::WorkResult DerivationGoal::getDerivation(bool inBuildSlot)
+{
    trace("init");

    /* The first thing to do is to make sure that the derivation
       exists.  If it doesn't, it may be created through a
       substitute. */
    if (buildMode == bmNormal && worker.evalStore.isValidPath(drvPath)) {
-        co_return co_await loadDerivation();
+        return loadDerivation(inBuildSlot);
    }

-    (co_await waitForGoals(worker.goalFactory().makePathSubstitutionGoal(drvPath))).value();
-    co_return co_await loadDerivation();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+
+    state = &DerivationGoal::loadDerivation;
+    return WaitForGoals{{worker.makePathSubstitutionGoal(drvPath)}};
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::loadDerivation() noexcept
-try {
+Goal::WorkResult DerivationGoal::loadDerivation(bool inBuildSlot)
+{
    trace("loading derivation");

    if (nrFailed != 0) {
-        return {done(
-            BuildResult::MiscFailure,
-            {},
-            Error("cannot build missing derivation '%s'", worker.store.printStorePath(drvPath))
-        )};
+        return done(BuildResult::MiscFailure, {}, Error("cannot build missing derivation '%s'", worker.store.printStorePath(drvPath)));
    }

    /* `drvPath' should already be a root, but let's be on the safe
@ -205,14 +200,12 @@ try {
    }
    assert(drv);

-    return haveDerivation();
-} catch (...) {
-    return {std::current_exception()};
+    return haveDerivation(inBuildSlot);
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::haveDerivation() noexcept
-try {
+Goal::WorkResult DerivationGoal::haveDerivation(bool inBuildSlot)
+{
    trace("have derivation");

    parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *drv);
@ -239,7 +232,7 @@ try {
            });
        }

-        co_return co_await gaveUpOnSubstitution();
+        return gaveUpOnSubstitution(inBuildSlot);
    }

    for (auto & i : drv->outputsAndOptPaths(worker.store))
@ -261,27 +254,27 @@ try {

    /* If they are all valid, then we're done. */
    if (allValid && buildMode == bmNormal) {
-        co_return done(BuildResult::AlreadyValid, std::move(validOutputs));
+        return done(BuildResult::AlreadyValid, std::move(validOutputs));
    }

    /* We are first going to try to create the invalid output paths
       through substitutes.  If that doesn't work, we'll build
       them. */
-    kj::Vector<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies;
+    WaitForGoals result;
    if (settings.useSubstitutes) {
        if (parsedDrv->substitutesAllowed()) {
            for (auto & [outputName, status] : initialOutputs) {
                if (!status.wanted) continue;
                if (!status.known)
-                    dependencies.add(
-                        worker.goalFactory().makeDrvOutputSubstitutionGoal(
+                    result.goals.insert(
+                        worker.makeDrvOutputSubstitutionGoal(
                            DrvOutput{status.outputHash, outputName},
                            buildMode == bmRepair ? Repair : NoRepair
                        )
                    );
                else {
                    auto * cap = getDerivationCA(*drv);
-                    dependencies.add(worker.goalFactory().makePathSubstitutionGoal(
+                    result.goals.insert(worker.makePathSubstitutionGoal(
                        status.known->path,
                        buildMode == bmRepair ? Repair : NoRepair,
                        cap ? std::optional { *cap } : std::nullopt));
@ -292,31 +285,24 @@ try {
        }
    }

-    if (!dependencies.empty()) { /* to prevent hang (no wake-up event) */
-        (co_await waitForGoals(dependencies.releaseAsArray())).value();
+    if (result.goals.empty()) { /* to prevent hang (no wake-up event) */
+        return outputsSubstitutionTried(inBuildSlot);
+    } else {
+        state = &DerivationGoal::outputsSubstitutionTried;
+        return result;
    }
-    co_return co_await outputsSubstitutionTried();
-} catch (...) {
-    co_return result::failure(std::current_exception());
 }

-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::outputsSubstitutionTried() noexcept
-try {
+Goal::WorkResult DerivationGoal::outputsSubstitutionTried(bool inBuildSlot)
+{
    trace("all outputs substituted (maybe)");

    assert(drv->type().isPure());

-    if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback)
-    {
-        return {done(
-            BuildResult::TransientFailure,
-            {},
-            Error(
-                "some substitutes for the outputs of derivation '%s' failed (usually happens due "
-                "to networking issues); try '--fallback' to build derivation from source ",
-                worker.store.printStorePath(drvPath)
-            )
-        )};
+    if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback) {
+        return done(BuildResult::TransientFailure, {},
+            Error("some substitutes for the outputs of derivation '%s' failed (usually happens due to networking issues); try '--fallback' to build derivation from source ",
+                worker.store.printStorePath(drvPath)));
    }

    /*  If the substitutes form an incomplete closure, then we should
@ -350,13 +336,13 @@ try {

    if (needRestart == NeedRestartForMoreOutputs::OutputsAddedDoNeed) {
        needRestart = NeedRestartForMoreOutputs::OutputsUnmodifedDontNeed;
-        return haveDerivation();
+        return haveDerivation(inBuildSlot);
    }

    auto [allValid, validOutputs] = checkPathValidity();

    if (buildMode == bmNormal && allValid) {
-        return {done(BuildResult::Substituted, std::move(validOutputs))};
+        return done(BuildResult::Substituted, std::move(validOutputs));
    }
    if (buildMode == bmRepair && allValid) {
        return repairClosure();
@ -366,17 +352,15 @@ try {
            worker.store.printStorePath(drvPath));

    /* Nothing to wait for; tail call */
-    return gaveUpOnSubstitution();
-} catch (...) {
-    return {std::current_exception()};
+    return gaveUpOnSubstitution(inBuildSlot);
 }


 /* At least one of the output paths could not be
   produced using a substitute.  So we have to build instead. */
-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::gaveUpOnSubstitution() noexcept
-try {
-    kj::Vector<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies;
+Goal::WorkResult DerivationGoal::gaveUpOnSubstitution(bool inBuildSlot)
+{
+    WaitForGoals result;

    /* At this point we are building all outputs, so if more are wanted there
       is no need to restart. */
@ -389,7 +373,7 @@ try {

        addWaiteeDerivedPath = [&](ref<SingleDerivedPath> inputDrv, const DerivedPathMap<StringSet>::ChildNode & inputNode) {
            if (!inputNode.value.empty())
-                dependencies.add(worker.goalFactory().makeGoal(
+                result.goals.insert(worker.makeGoal(
                    DerivedPath::Built {
                        .drvPath = inputDrv,
                        .outputs = inputNode.value,
@ -434,20 +418,20 @@ try {
        if (!settings.useSubstitutes)
            throw Error("dependency '%s' of '%s' does not exist, and substitution is disabled",
                worker.store.printStorePath(i), worker.store.printStorePath(drvPath));
-        dependencies.add(worker.goalFactory().makePathSubstitutionGoal(i));
+        result.goals.insert(worker.makePathSubstitutionGoal(i));
    }

-    if (!dependencies.empty()) {/* to prevent hang (no wake-up event) */
-        (co_await waitForGoals(dependencies.releaseAsArray())).value();
+    if (result.goals.empty()) {/* to prevent hang (no wake-up event) */
+        return inputsRealised(inBuildSlot);
+    } else {
+        state = &DerivationGoal::inputsRealised;
+        return result;
    }
-    co_return co_await inputsRealised();
-} catch (...) {
-    co_return result::failure(std::current_exception());
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::repairClosure() noexcept
-try {
+Goal::WorkResult DerivationGoal::repairClosure()
+{
    assert(drv->type().isPure());

    /* If we're repairing, we now know that our own outputs are valid.
@ -482,7 +466,7 @@ try {
        }

    /* Check each path (slow!). */
-    kj::Vector<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies;
+    WaitForGoals result;
    for (auto & i : outputClosure) {
        if (worker.pathContentsGood(i)) continue;
        printError(
@ -490,9 +474,9 @@ try {
            worker.store.printStorePath(i), worker.store.printStorePath(drvPath));
        auto drvPath2 = outputsToDrv.find(i);
        if (drvPath2 == outputsToDrv.end())
-            dependencies.add(worker.goalFactory().makePathSubstitutionGoal(i, Repair));
+            result.goals.insert(worker.makePathSubstitutionGoal(i, Repair));
        else
-            dependencies.add(worker.goalFactory().makeGoal(
+            result.goals.insert(worker.makeGoal(
                DerivedPath::Built {
                    .drvPath = makeConstantStorePathRef(drvPath2->second),
                    .outputs = OutputsSpec::All { },
@ -500,50 +484,40 @@ try {
                bmRepair));
    }

-    if (dependencies.empty()) {
-        co_return done(BuildResult::AlreadyValid, assertPathValidity());
+    if (result.goals.empty()) {
+        return done(BuildResult::AlreadyValid, assertPathValidity());
    }

-    (co_await waitForGoals(dependencies.releaseAsArray())).value();
-    co_return co_await closureRepaired();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    state = &DerivationGoal::closureRepaired;
+    return result;
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::closureRepaired() noexcept
-try {
+Goal::WorkResult DerivationGoal::closureRepaired(bool inBuildSlot)
+{
    trace("closure repaired");
    if (nrFailed > 0)
        throw Error("some paths in the output closure of derivation '%s' could not be repaired",
            worker.store.printStorePath(drvPath));
-    return {done(BuildResult::AlreadyValid, assertPathValidity())};
-} catch (...) {
-    return {std::current_exception()};
+    return done(BuildResult::AlreadyValid, assertPathValidity());
 }


-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::inputsRealised() noexcept
-try {
+Goal::WorkResult DerivationGoal::inputsRealised(bool inBuildSlot)
+{
    trace("all inputs realised");

    if (nrFailed != 0) {
        if (!useDerivation)
            throw Error("some dependencies of '%s' are missing", worker.store.printStorePath(drvPath));
-        co_return done(
-            BuildResult::DependencyFailed,
-            {},
-            Error(
+        return done(BuildResult::DependencyFailed, {}, Error(
                "%s dependencies of derivation '%s' failed to build",
-                nrFailed,
-                worker.store.printStorePath(drvPath)
-            )
-        );
+                nrFailed, worker.store.printStorePath(drvPath)));
    }

    if (retrySubstitution == RetrySubstitution::YesNeed) {
        retrySubstitution = RetrySubstitution::AlreadyRetried;
-        co_return co_await haveDerivation();
+        return haveDerivation(inBuildSlot);
    }

    /* Gather information necessary for computing the closure and/or
@ -605,12 +579,11 @@ try {
                       worker.store.printStorePath(pathResolved),
                   });

-            auto dependency = worker.goalFactory().makeDerivationGoal(
+            resolvedDrvGoal = worker.makeDerivationGoal(
                pathResolved, wantedOutputs, buildMode);
-            resolvedDrvGoal = dependency.first;

-            (co_await waitForGoals(std::move(dependency))).value();
-            co_return co_await resolvedFinished();
+            state = &DerivationGoal::resolvedFinished;
+            return WaitForGoals{{resolvedDrvGoal}};
        }

        std::function<void(const StorePath &, const DerivedPathMap<StringSet>::ChildNode &)> accumInputPaths;
@ -674,9 +647,8 @@ try {
    /* Okay, try to build.  Note that here we don't wait for a build
       slot to become available, since we don't need one if there is a
       build hook. */
-    co_return co_await tryToBuild();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    state = &DerivationGoal::tryToBuild;
+    return ContinueImmediately{};
 }

 void DerivationGoal::started()
@ -689,12 +661,11 @@ void DerivationGoal::started()
    if (hook) msg += fmt(" on '%s'", machineName);
    act = std::make_unique<Activity>(*logger, lvlInfo, actBuild, msg,
        Logger::Fields{worker.store.printStorePath(drvPath), hook ? machineName : "", 1, 1});
-    mcRunningBuilds = worker.runningBuilds.addTemporarily(1);
+    mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds);
 }

-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::tryToBuild() noexcept
-try {
-retry:
+Goal::WorkResult DerivationGoal::tryToBuild(bool inBuildSlot)
+{
    trace("trying to build");

    /* Obtain locks on all output paths, if the paths are known a priori.
@ -728,9 +699,7 @@ retry:
        if (!actLock)
            actLock = std::make_unique<Activity>(*logger, lvlWarn, actBuildWaiting,
                fmt("waiting for lock on %s", Magenta(showPaths(lockFiles))));
-        co_await waitForAWhile();
-        // we can loop very often, and `co_return co_await` always allocates a new frame
-        goto retry;
+        return WaitForAWhile{};
    }

    actLock.reset();
@ -747,7 +716,7 @@ retry:
    if (buildMode != bmCheck && allValid) {
        debug("skipping build of derivation '%s', someone beat us to it", worker.store.printStorePath(drvPath));
        outputLocks.setDeletion(true);
-        co_return done(BuildResult::AlreadyValid, std::move(validOutputs));
+        return done(BuildResult::AlreadyValid, std::move(validOutputs));
    }

    /* If any of the outputs already exist but are not valid, delete
@ -767,63 +736,49 @@ retry:
        && settings.maxBuildJobs.get() != 0;

    if (!buildLocally) {
-        auto hookReply = tryBuildHook();
-        switch (hookReply.index()) {
-        case 0: {
-            HookReply::Accept & a = std::get<0>(hookReply);
-            /* Yes, it has started doing so.  Wait until we get
-                EOF from the hook. */
-            actLock.reset();
-            buildResult.startTime = time(0); // inexact
-            started();
-            auto r = co_await a.promise;
-            if (r.has_value()) {
-                co_return co_await buildDone();
-            } else if (r.has_error()) {
-                co_return r.assume_error();
-            } else {
-                co_return r.assume_exception();
-            }
-        }
-
-        case 1: {
-            HookReply::Decline _ [[gnu::unused]] = std::get<1>(hookReply);
-            break;
-        }
-
-        case 2: {
-            HookReply::Postpone _ [[gnu::unused]] = std::get<2>(hookReply);
-            /* Not now; wait until at least one child finishes or
-                the wake-up timeout expires. */
-            if (!actLock)
-                actLock = std::make_unique<Activity>(*logger, lvlTalkative, actBuildWaiting,
-                    fmt("waiting for a machine to build '%s'", Magenta(worker.store.printStorePath(drvPath))));
-            outputLocks.unlock();
-            co_await waitForAWhile();
-            goto retry;
-        }
-
-        default:
-            // can't static_assert this because HookReply *subclasses* variant and std::variant_size breaks
-            assert(false && "unexpected hook reply");
+        auto hookReply = tryBuildHook(inBuildSlot);
+        auto result = std::visit(
+            overloaded{
+                [&](HookReply::Accept & a) -> std::optional<WorkResult> {
+                    /* Yes, it has started doing so.  Wait until we get
+                       EOF from the hook. */
+                    actLock.reset();
+                    buildResult.startTime = time(0); // inexact
+                    state = &DerivationGoal::buildDone;
+                    started();
+                    return WaitForWorld{std::move(a.fds), false};
+                },
+                [&](HookReply::Postpone) -> std::optional<WorkResult> {
+                    /* Not now; wait until at least one child finishes or
+                       the wake-up timeout expires. */
+                    if (!actLock)
+                        actLock = std::make_unique<Activity>(*logger, lvlTalkative, actBuildWaiting,
+                            fmt("waiting for a machine to build '%s'", Magenta(worker.store.printStorePath(drvPath))));
+                    outputLocks.unlock();
+                    return WaitForAWhile{};
+                },
+                [&](HookReply::Decline) -> std::optional<WorkResult> {
+                    /* We should do it ourselves. */
+                    return std::nullopt;
+                },
+            },
+            hookReply);
+        if (result) {
+            return std::move(*result);
        }
    }

    actLock.reset();

-    co_return co_await tryLocalBuild();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    state = &DerivationGoal::tryLocalBuild;
+    return ContinueImmediately{};
 }

-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::tryLocalBuild() noexcept
-try {
+Goal::WorkResult DerivationGoal::tryLocalBuild(bool inBuildSlot) {
    throw Error(
        "unable to build with a primary store that isn't a local store; "
        "either pass a different '--store' or enable remote builds."
        "\nhttps://docs.lix.systems/manual/lix/stable/advanced-topics/distributed-builds.html");
-} catch (...) {
-    return {std::current_exception()};
 }


@ -863,7 +818,7 @@ void replaceValidPath(const Path & storePath, const Path & tmpPath)
            // attempt to recover
            movePath(oldPath, storePath);
        } catch (...) {
-            ignoreExceptionExceptInterrupt();
+            ignoreException();
        }
        throw;
    }
@ -979,11 +934,10 @@ void runPostBuildHook(
    proc.getStdout()->drainInto(sink);
 }

-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::buildDone() noexcept
-try {
+Goal::WorkResult DerivationGoal::buildDone(bool inBuildSlot)
+{
    trace("build done");

-    slotToken = {};
    Finally releaseBuildUser([&](){ this->cleanupHookFinally(); });

    cleanupPreChildKill();
@ -999,6 +953,9 @@ try {
    buildResult.timesBuilt++;
    buildResult.stopTime = time(0);

+    /* So the child is gone now. */
+    worker.childTerminated(this);
+
    /* Close the read side of the logger pipe. */
    closeReadPipes();

@ -1072,7 +1029,7 @@ try {
        outputLocks.setDeletion(true);
        outputLocks.unlock();

-        return {done(BuildResult::Built, std::move(builtOutputs))};
+        return done(BuildResult::Built, std::move(builtOutputs));
    } catch (BuildError & e) {
        outputLocks.unlock();

@ -1093,14 +1050,12 @@ try {
                BuildResult::PermanentFailure;
        }

-        return {done(st, {}, std::move(e))};
+        return done(st, {}, std::move(e));
    }
-} catch (...) {
-    return {std::current_exception()};
 }

-kj::Promise<Result<Goal::WorkResult>> DerivationGoal::resolvedFinished() noexcept
-try {
+Goal::WorkResult DerivationGoal::resolvedFinished(bool inBuildSlot)
+{
    trace("resolved derivation finished");

    assert(resolvedDrvGoal);
@ -1167,12 +1122,10 @@ try {
    if (status == BuildResult::AlreadyValid)
        status = BuildResult::ResolvesToAlreadyValid;

-    return {done(status, std::move(builtOutputs))};
-} catch (...) {
-    return {std::current_exception()};
+    return done(status, std::move(builtOutputs));
 }

-HookReply DerivationGoal::tryBuildHook()
+HookReply DerivationGoal::tryBuildHook(bool inBuildSlot)
 {
    if (!worker.hook.available || !useDerivation) return HookReply::Decline{};

@ -1184,7 +1137,7 @@ HookReply DerivationGoal::tryBuildHook()
        /* Send the request to the hook. */
        worker.hook.instance->sink
            << "try"
-            << (slotToken.valid() ? 1 : 0)
+            << (inBuildSlot ? 1 : 0)
            << drv->platform
            << worker.store.printStorePath(drvPath)
            << parsedDrv->getRequiredSystemFeatures();
@ -1270,8 +1223,12 @@ HookReply DerivationGoal::tryBuildHook()
    /* Create the log file and pipe. */
    Path logFile = openLogFile();

+    std::set<int> fds;
+    fds.insert(hook->fromHook.get());
+    fds.insert(hook->builderOut.get());
    builderOutFD = &hook->builderOut;
-    return HookReply::Accept{handleChildOutput()};
+
+    return HookReply::Accept{std::move(fds)};
 }


@ -1331,69 +1288,23 @@ void DerivationGoal::closeLogFile()
 }


-Goal::WorkResult DerivationGoal::tooMuchLogs()
+Goal::WorkResult DerivationGoal::handleChildOutput(int fd, std::string_view data)
 {
-    killChild();
-    return done(
-        BuildResult::LogLimitExceeded, {},
-        Error("%s killed after writing more than %d bytes of log output",
-            getName(), settings.maxLogSize));
-}
+    assert(builderOutFD);

-struct DerivationGoal::InputStream final : private kj::AsyncObject
-{
-    int fd;
-    kj::UnixEventPort::FdObserver observer;
-
-    InputStream(kj::UnixEventPort & ep, int fd)
-        : fd(fd)
-        , observer(ep, fd, kj::UnixEventPort::FdObserver::OBSERVE_READ)
-    {
-        int flags = fcntl(fd, F_GETFL);
-        if (flags < 0) {
-            throw SysError("fcntl(F_GETFL) failed on fd %i", fd);
-        }
-        if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
-            throw SysError("fcntl(F_SETFL) failed on fd %i", fd);
-        }
-    }
-
-    kj::Promise<std::string_view> read(kj::ArrayPtr<char> buffer)
-    {
-        const auto res = ::read(fd, buffer.begin(), buffer.size());
-        // closing a pty endpoint causes EIO on the other endpoint. stock kj streams
-        // do not handle this and throw exceptions we can't ask for errno instead :(
-        // (we can't use `errno` either because kj may well have mangled it by now.)
-        if (res == 0 || (res == -1 && errno == EIO)) {
-            return std::string_view{};
-        }
-
-        KJ_NONBLOCKING_SYSCALL(res) {}
-
-        if (res > 0) {
-            return std::string_view{buffer.begin(), static_cast<size_t>(res)};
-        }
-
-        return observer.whenBecomesReadable().then([this, buffer] {
-            return read(buffer);
-        });
-    }
-};
-
-kj::Promise<Outcome<void, Goal::WorkResult>> DerivationGoal::handleBuilderOutput(InputStream & in) noexcept
-try {
-    auto buf = kj::heapArray<char>(4096);
-    while (true) {
-        auto data = co_await in.read(buf);
-        lastChildActivity = worker.aio.provider->getTimer().now();
-
-        if (data.empty()) {
-            co_return result::success();
-        }
+    auto tooMuchLogs = [&] {
+        killChild();
+        return done(
+            BuildResult::LogLimitExceeded, {},
+            Error("%s killed after writing more than %d bytes of log output",
+                getName(), settings.maxLogSize));
+    };

+    // local & `ssh://`-builds are dealt with here.
+    if (fd == builderOutFD->get()) {
        logSize += data.size();
        if (settings.maxLogSize && logSize > settings.maxLogSize) {
-            co_return tooMuchLogs();
+            return tooMuchLogs();
        }

        for (auto c : data)
@ -1408,22 +1319,10 @@ try {
            }

        if (logSink) (*logSink)(data);
+        return StillAlive{};
    }
-} catch (...) {
-    co_return std::current_exception();
-}
-
-kj::Promise<Outcome<void, Goal::WorkResult>> DerivationGoal::handleHookOutput(InputStream & in) noexcept
-try {
-    auto buf = kj::heapArray<char>(4096);
-    while (true) {
-        auto data = co_await in.read(buf);
-        lastChildActivity = worker.aio.provider->getTimer().now();
-
-        if (data.empty()) {
-            co_return result::success();
-        }

+    if (hook && fd == hook->fromHook.get()) {
        for (auto c : data)
            if (c == '\n') {
                auto json = parseJSONMessage(currentHookLine);
@ -1439,7 +1338,7 @@ try {
                                (fields.size() > 0 ? fields[0].get<std::string>() : "") + "\n";
                            logSize += logLine.size();
                            if (settings.maxLogSize && logSize > settings.maxLogSize) {
-                                co_return tooMuchLogs();
+                                return tooMuchLogs();
                            }
                            (*logSink)(logLine);
                        } else if (type == resSetPhase && ! fields.is_null()) {
@ -1463,83 +1362,16 @@ try {
            } else
                currentHookLine += c;
    }
-} catch (...) {
-    co_return std::current_exception();
+
+    return StillAlive{};
 }

-kj::Promise<Outcome<void, Goal::WorkResult>> DerivationGoal::handleChildOutput() noexcept
-try {
-    assert(builderOutFD);

-    auto builderIn = kj::heap<InputStream>(worker.aio.unixEventPort, builderOutFD->get());
-    kj::Own<InputStream> hookIn;
-    if (hook) {
-        hookIn = kj::heap<InputStream>(worker.aio.unixEventPort, hook->fromHook.get());
-    }
-
-    auto handlers = handleChildStreams(*builderIn, hookIn.get()).attach(std::move(builderIn), std::move(hookIn));
-
-    if (respectsTimeouts() && settings.buildTimeout != 0) {
-        handlers = handlers.exclusiveJoin(
-            worker.aio.provider->getTimer()
-                .afterDelay(settings.buildTimeout.get() * kj::SECONDS)
-                .then([this]() -> Outcome<void, WorkResult> {
-                    return timedOut(
-                        Error("%1% timed out after %2% seconds", name, settings.buildTimeout)
-                    );
-                })
-        );
-    }
-
-    return handlers.then([this](auto r) -> Outcome<void, WorkResult> {
-        if (!currentLogLine.empty()) flushLine();
-        return r;
-    });
-} catch (...) {
-    return {std::current_exception()};
-}
-
-kj::Promise<Outcome<void, Goal::WorkResult>> DerivationGoal::monitorForSilence() noexcept
+void DerivationGoal::handleEOF(int fd)
 {
-    while (true) {
-        const auto stash = lastChildActivity;
-        auto waitUntil = lastChildActivity + settings.maxSilentTime.get() * kj::SECONDS;
-        co_await worker.aio.provider->getTimer().atTime(waitUntil);
-        if (lastChildActivity == stash) {
-            co_return timedOut(
-                Error("%1% timed out after %2% seconds of silence", name, settings.maxSilentTime)
-            );
-        }
-    }
+    if (!currentLogLine.empty()) flushLine();
 }

-kj::Promise<Outcome<void, Goal::WorkResult>>
-DerivationGoal::handleChildStreams(InputStream & builderIn, InputStream * hookIn) noexcept
-{
-    lastChildActivity = worker.aio.provider->getTimer().now();
-
-    auto handlers = kj::joinPromisesFailFast([&] {
-        kj::Vector<kj::Promise<Outcome<void, WorkResult>>> parts{2};
-
-        parts.add(handleBuilderOutput(builderIn));
-        if (hookIn) {
-            parts.add(handleHookOutput(*hookIn));
-        }
-
-        return parts.releaseAsArray();
-    }());
-
-    if (respectsTimeouts() && settings.maxSilentTime != 0) {
-        handlers = handlers.exclusiveJoin(monitorForSilence().then([](auto r) {
-            return kj::arr(std::move(r));
-        }));
-    }
-
-    for (auto r : co_await handlers) {
-        BOOST_OUTCOME_CO_TRYV(r);
-    }
-    co_return result::success();
-}

 void DerivationGoal::flushLine()
 {
@ -1680,13 +1512,11 @@ SingleDrvOutputs DerivationGoal::assertPathValidity()
 }


-Goal::WorkResult DerivationGoal::done(
+Goal::Finished DerivationGoal::done(
    BuildResult::Status status,
    SingleDrvOutputs builtOutputs,
    std::optional<Error> ex)
 {
-    isDone = true;
-
    outputLocks.unlock();
    buildResult.status = status;
    if (ex)
@ -1713,13 +1543,8 @@ Goal::WorkResult DerivationGoal::done(
        fs << worker.store.printStorePath(drvPath) << "\t" << buildResult.toString() << std::endl;
    }

-    if (ex && isDependency) {
-        logError(ex->info());
-    }
-
-    return WorkResult{
-        .exitCode = buildResult.success() ? ecSuccess : ecFailed,
-        .result = buildResult,
+    return Finished{
+        .result = buildResult.success() ? ecSuccess : ecFailed,
        .ex = ex ? std::make_shared<Error>(std::move(*ex)) : nullptr,
        .permanentFailure = buildResult.status == BuildResult::PermanentFailure,
        .timedOut = buildResult.status == BuildResult::TimedOut,
@ -1756,4 +1581,5 @@ void DerivationGoal::waiteeDone(GoalPtr waitee)
        }
    }
 }
+
 }
--- a/src/libstore/build/derivation-goal.hh
+++ b/src/libstore/build/derivation-goal.hh
@ -1,14 +1,12 @@
 #pragma once
 ///@file

-#include "notifying-counter.hh"
 #include "parsed-derivations.hh"
 #include "lock.hh"
 #include "outputs-spec.hh"
 #include "store-api.hh"
 #include "pathlocks.hh"
 #include "goal.hh"
-#include <kj/time.h>

 namespace nix {

@ -18,7 +16,7 @@ struct HookInstance;

 struct HookReplyBase {
    struct [[nodiscard]] Accept {
-        kj::Promise<Outcome<void, Goal::WorkResult>> promise;
+        std::set<int> fds;
    };
    struct [[nodiscard]] Decline {};
    struct [[nodiscard]] Postpone {};
@ -63,7 +61,7 @@ struct InitialOutputStatus {
 struct InitialOutput {
    bool wanted;
    Hash outputHash;
-    std::optional<InitialOutputStatus> known = {};
+    std::optional<InitialOutputStatus> known;
 };

 /**
@ -71,14 +69,6 @@ struct InitialOutput {
 */
 struct DerivationGoal : public Goal
 {
-    struct InputStream;
-
-    /**
-      * Whether this goal has completed. Completed goals can not be
-      * asked for more outputs, a new goal must be created instead.
-      */
-    bool isDone = false;
-
    /**
     * Whether to use an on-disk .drv file.
     */
@ -184,11 +174,6 @@ struct DerivationGoal : public Goal

    std::map<std::string, InitialOutput> initialOutputs;

-    /**
-     * Build result.
-     */
-    BuildResult buildResult;
-
    /**
     * File descriptor for the log file.
     */
@ -227,9 +212,12 @@ struct DerivationGoal : public Goal
     */
    std::optional<DerivationType> derivationType;

+    typedef WorkResult (DerivationGoal::*GoalState)(bool inBuildSlot);
+    GoalState state;
+
    BuildMode buildMode;

-    NotifyingCounter<uint64_t>::Bump mcExpectedBuilds, mcRunningBuilds;
+    std::unique_ptr<MaintainCount<uint64_t>> mcExpectedBuilds, mcRunningBuilds;

    std::unique_ptr<Activity> act;

@ -246,42 +234,44 @@ struct DerivationGoal : public Goal
    std::string machineName;

    DerivationGoal(const StorePath & drvPath,
-        const OutputsSpec & wantedOutputs, Worker & worker, bool isDependency,
+        const OutputsSpec & wantedOutputs, Worker & worker,
        BuildMode buildMode = bmNormal);
    DerivationGoal(const StorePath & drvPath, const BasicDerivation & drv,
-        const OutputsSpec & wantedOutputs, Worker & worker, bool isDependency,
+        const OutputsSpec & wantedOutputs, Worker & worker,
        BuildMode buildMode = bmNormal);
    virtual ~DerivationGoal() noexcept(false);

-    WorkResult timedOut(Error && ex);
+    Finished timedOut(Error && ex) override;

-    kj::Promise<Result<WorkResult>> workImpl() noexcept override;
+    std::string key() override;
+
+    WorkResult work(bool inBuildSlot) override;

    /**
     * Add wanted outputs to an already existing derivation goal.
     */
-    bool addWantedOutputs(const OutputsSpec & outputs);
+    void addWantedOutputs(const OutputsSpec & outputs);

    /**
     * The states.
     */
-    kj::Promise<Result<WorkResult>> getDerivation() noexcept;
-    kj::Promise<Result<WorkResult>> loadDerivation() noexcept;
-    kj::Promise<Result<WorkResult>> haveDerivation() noexcept;
-    kj::Promise<Result<WorkResult>> outputsSubstitutionTried() noexcept;
-    kj::Promise<Result<WorkResult>> gaveUpOnSubstitution() noexcept;
-    kj::Promise<Result<WorkResult>> closureRepaired() noexcept;
-    kj::Promise<Result<WorkResult>> inputsRealised() noexcept;
-    kj::Promise<Result<WorkResult>> tryToBuild() noexcept;
-    virtual kj::Promise<Result<WorkResult>> tryLocalBuild() noexcept;
-    kj::Promise<Result<WorkResult>> buildDone() noexcept;
+    WorkResult getDerivation(bool inBuildSlot);
+    WorkResult loadDerivation(bool inBuildSlot);
+    WorkResult haveDerivation(bool inBuildSlot);
+    WorkResult outputsSubstitutionTried(bool inBuildSlot);
+    WorkResult gaveUpOnSubstitution(bool inBuildSlot);
+    WorkResult closureRepaired(bool inBuildSlot);
+    WorkResult inputsRealised(bool inBuildSlot);
+    WorkResult tryToBuild(bool inBuildSlot);
+    virtual WorkResult tryLocalBuild(bool inBuildSlot);
+    WorkResult buildDone(bool inBuildSlot);

-    kj::Promise<Result<WorkResult>> resolvedFinished() noexcept;
+    WorkResult resolvedFinished(bool inBuildSlot);

    /**
     * Is the build hook willing to perform the build?
     */
-    HookReply tryBuildHook();
+    HookReply tryBuildHook(bool inBuildSlot);

    virtual int getChildStatus();

@ -321,19 +311,13 @@ struct DerivationGoal : public Goal
    virtual void cleanupPostOutputsRegisteredModeCheck();
    virtual void cleanupPostOutputsRegisteredModeNonCheck();

-protected:
-    kj::TimePoint lastChildActivity = kj::minValue;
-
-    kj::Promise<Outcome<void, WorkResult>> handleChildOutput() noexcept;
-    kj::Promise<Outcome<void, WorkResult>>
-    handleChildStreams(InputStream & builderIn, InputStream * hookIn) noexcept;
-    kj::Promise<Outcome<void, WorkResult>> handleBuilderOutput(InputStream & in) noexcept;
-    kj::Promise<Outcome<void, WorkResult>> handleHookOutput(InputStream & in) noexcept;
-    kj::Promise<Outcome<void, WorkResult>> monitorForSilence() noexcept;
-    WorkResult tooMuchLogs();
+    /**
+     * Callback used by the worker to write to the log.
+     */
+    WorkResult handleChildOutput(int fd, std::string_view data) override;
+    void handleEOF(int fd) override;
    void flushLine();

-public:
    /**
     * Wrappers around the corresponding Store methods that first consult the
     * derivation.  This is currently needed because when there is no drv file
@ -361,22 +345,17 @@ public:
     */
    virtual void killChild();

-    kj::Promise<Result<WorkResult>> repairClosure() noexcept;
+    WorkResult repairClosure();

    void started();

-    WorkResult done(
+    Finished done(
        BuildResult::Status status,
        SingleDrvOutputs builtOutputs = {},
        std::optional<Error> ex = {});

    void waiteeDone(GoalPtr waitee) override;

-    virtual bool respectsTimeouts()
-    {
-        return false;
-    }
-
    StorePathSet exportReferences(const StorePathSet & storePaths);

    JobCategory jobCategory() const override {
--- a/src/libstore/build/drv-output-substitution-goal.cc
+++ b/src/libstore/build/drv-output-substitution-goal.cc
@ -1,53 +1,48 @@
 #include "drv-output-substitution-goal.hh"
-#include "build-result.hh"
 #include "finally.hh"
 #include "worker.hh"
 #include "substitution-goal.hh"
 #include "signals.hh"
-#include <kj/array.h>
-#include <kj/async.h>
-#include <kj/vector.h>

 namespace nix {

 DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(
    const DrvOutput & id,
    Worker & worker,
-    bool isDependency,
    RepairFlag repair,
    std::optional<ContentAddress> ca)
-    : Goal(worker, isDependency)
+    : Goal(worker)
    , id(id)
 {
+    state = &DrvOutputSubstitutionGoal::init;
    name = fmt("substitution of '%s'", id.to_string());
    trace("created");
 }


-kj::Promise<Result<Goal::WorkResult>> DrvOutputSubstitutionGoal::workImpl() noexcept
-try {
+Goal::WorkResult DrvOutputSubstitutionGoal::init(bool inBuildSlot)
+{
    trace("init");

    /* If the derivation already exists, we’re done */
    if (worker.store.queryRealisation(id)) {
-        co_return WorkResult{ecSuccess};
+        return Finished{ecSuccess};
    }

    subs = settings.useSubstitutes ? getDefaultSubstituters() : std::list<ref<Store>>();
-    co_return co_await tryNext();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    return tryNext(inBuildSlot);
 }

-kj::Promise<Result<Goal::WorkResult>> DrvOutputSubstitutionGoal::tryNext() noexcept
-try {
+Goal::WorkResult DrvOutputSubstitutionGoal::tryNext(bool inBuildSlot)
+{
    trace("trying next substituter");

-    if (!slotToken.valid()) {
-        slotToken = co_await worker.substitutions.acquire();
+    if (!inBuildSlot) {
+        return WaitForSlot{};
    }

-    maintainRunningSubstitutions = worker.runningSubstitutions.addTemporarily(1);
+    maintainRunningSubstitutions =
+        std::make_unique<MaintainCount<uint64_t>>(worker.runningSubstitutions);

    if (subs.size() == 0) {
        /* None left.  Terminate this goal and let someone else deal
@ -61,7 +56,7 @@ try {
        /* Hack: don't indicate failure if there were no substituters.
           In that case the calling derivation should just do a
           build. */
-        co_return WorkResult{substituterFailed ? ecFailed : ecNoSubstituters};
+        return Finished{substituterFailed ? ecFailed : ecNoSubstituters};
    }

    sub = subs.front();
@ -71,26 +66,23 @@ try {
       some other error occurs), so it must not touch `this`. So put
       the shared state in a separate refcounted object. */
    downloadState = std::make_shared<DownloadState>();
-    auto pipe = kj::newPromiseAndCrossThreadFulfiller<void>();
-    downloadState->outPipe = kj::mv(pipe.fulfiller);
+    downloadState->outPipe.create();

    downloadState->result =
        std::async(std::launch::async, [downloadState{downloadState}, id{id}, sub{sub}] {
-            Finally updateStats([&]() { downloadState->outPipe->fulfill(); });
            ReceiveInterrupts receiveInterrupts;
+            Finally updateStats([&]() { downloadState->outPipe.writeSide.close(); });
            return sub->queryRealisation(id);
        });

-    co_await pipe.promise;
-    co_return co_await realisationFetched();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    state = &DrvOutputSubstitutionGoal::realisationFetched;
+    return WaitForWorld{{downloadState->outPipe.readSide.get()}, true};
 }

-kj::Promise<Result<Goal::WorkResult>> DrvOutputSubstitutionGoal::realisationFetched() noexcept
-try {
+Goal::WorkResult DrvOutputSubstitutionGoal::realisationFetched(bool inBuildSlot)
+{
+    worker.childTerminated(this);
    maintainRunningSubstitutions.reset();
-    slotToken = {};

    try {
        outputInfo = downloadState->result.get();
@ -100,10 +92,10 @@ try {
    }

    if (!outputInfo) {
-        co_return co_await tryNext();
+        return tryNext(inBuildSlot);
    }

-    kj::Vector<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies;
+    WaitForGoals result;
    for (const auto & [depId, depPath] : outputInfo->dependentRealisations) {
        if (depId != id) {
            if (auto localOutputInfo = worker.store.queryRealisation(depId);
@ -117,46 +109,55 @@ try {
                    worker.store.printStorePath(localOutputInfo->outPath),
                    worker.store.printStorePath(depPath)
                );
-                co_return co_await tryNext();
+                return tryNext(inBuildSlot);
            }
-            dependencies.add(worker.goalFactory().makeDrvOutputSubstitutionGoal(depId));
+            result.goals.insert(worker.makeDrvOutputSubstitutionGoal(depId));
        }
    }

-    dependencies.add(worker.goalFactory().makePathSubstitutionGoal(outputInfo->outPath));
+    result.goals.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));

-    if (!dependencies.empty()) {
-        (co_await waitForGoals(dependencies.releaseAsArray())).value();
+    if (result.goals.empty()) {
+        return outPathValid(inBuildSlot);
+    } else {
+        state = &DrvOutputSubstitutionGoal::outPathValid;
+        return result;
    }
-    co_return co_await outPathValid();
-} catch (...) {
-    co_return result::failure(std::current_exception());
 }

-kj::Promise<Result<Goal::WorkResult>> DrvOutputSubstitutionGoal::outPathValid() noexcept
-try {
+Goal::WorkResult DrvOutputSubstitutionGoal::outPathValid(bool inBuildSlot)
+{
    assert(outputInfo);
    trace("output path substituted");

    if (nrFailed > 0) {
        debug("The output path of the derivation output '%s' could not be substituted", id.to_string());
-        return {WorkResult{
-            nrNoSubstituters > 0 || nrIncompleteClosure > 0 ? ecIncompleteClosure : ecFailed,
-        }};
+        return Finished{
+            nrNoSubstituters > 0 || nrIncompleteClosure > 0 ? ecIncompleteClosure : ecFailed
+        };
    }

    worker.store.registerDrvOutput(*outputInfo);
    return finished();
-} catch (...) {
-    return {std::current_exception()};
 }

-kj::Promise<Result<Goal::WorkResult>> DrvOutputSubstitutionGoal::finished() noexcept
-try {
+Goal::WorkResult DrvOutputSubstitutionGoal::finished()
+{
    trace("finished");
-    return {WorkResult{ecSuccess}};
-} catch (...) {
-    return {std::current_exception()};
+    return Finished{ecSuccess};
 }

+std::string DrvOutputSubstitutionGoal::key()
+{
+    /* "a$" ensures substitution goals happen before derivation
+       goals. */
+    return "a$" + std::string(id.to_string());
+}
+
+Goal::WorkResult DrvOutputSubstitutionGoal::work(bool inBuildSlot)
+{
+    return (this->*state)(inBuildSlot);
+}
+
+
 }
--- a/src/libstore/build/drv-output-substitution-goal.hh
+++ b/src/libstore/build/drv-output-substitution-goal.hh
@ -1,7 +1,6 @@
 #pragma once
 ///@file

-#include "notifying-counter.hh"
 #include "store-api.hh"
 #include "goal.hh"
 #include "realisation.hh"
@ -41,11 +40,11 @@ class DrvOutputSubstitutionGoal : public Goal {
     */
    std::shared_ptr<Store> sub;

-    NotifyingCounter<uint64_t>::Bump maintainRunningSubstitutions;
+    std::unique_ptr<MaintainCount<uint64_t>> maintainRunningSubstitutions;

    struct DownloadState
    {
-        kj::Own<kj::CrossThreadPromiseFulfiller<void>> outPipe;
+        Pipe outPipe;
        std::future<std::shared_ptr<const Realisation>> result;
    };

@ -57,20 +56,22 @@ class DrvOutputSubstitutionGoal : public Goal {
    bool substituterFailed = false;

 public:
-    DrvOutputSubstitutionGoal(
-        const DrvOutput & id,
-        Worker & worker,
-        bool isDependency,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt
-    );
+    DrvOutputSubstitutionGoal(const DrvOutput& id, Worker & worker, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);

-    kj::Promise<Result<WorkResult>> tryNext() noexcept;
-    kj::Promise<Result<WorkResult>> realisationFetched() noexcept;
-    kj::Promise<Result<WorkResult>> outPathValid() noexcept;
-    kj::Promise<Result<WorkResult>> finished() noexcept;
+    typedef WorkResult (DrvOutputSubstitutionGoal::*GoalState)(bool inBuildSlot);
+    GoalState state;

-    kj::Promise<Result<WorkResult>> workImpl() noexcept override;
+    WorkResult init(bool inBuildSlot);
+    WorkResult tryNext(bool inBuildSlot);
+    WorkResult realisationFetched(bool inBuildSlot);
+    WorkResult outPathValid(bool inBuildSlot);
+    WorkResult finished();
+
+    Finished timedOut(Error && ex) override { abort(); };
+
+    std::string key() override;
+
+    WorkResult work(bool inBuildSlot) override;

    JobCategory jobCategory() const override {
        return JobCategory::Substitution;
--- a/src/libstore/build/entry-points.cc
+++ b/src/libstore/build/entry-points.cc
@ -2,37 +2,29 @@
 #include "substitution-goal.hh"
 #include "derivation-goal.hh"
 #include "local-store.hh"
-#include "strings.hh"

 namespace nix {

-static auto runWorker(Worker & worker, auto mkGoals)
-{
-    return worker.run(mkGoals);
-}
-
 void Store::buildPaths(const std::vector<DerivedPath> & reqs, BuildMode buildMode, std::shared_ptr<Store> evalStore)
 {
-    auto aio = kj::setupAsyncIo();
-    Worker worker(*this, evalStore ? *evalStore : *this, aio);
+    Worker worker(*this, evalStore ? *evalStore : *this);

-    auto goals = runWorker(worker, [&](GoalFactory & gf) {
-        Worker::Targets goals;
-        for (auto & br : reqs)
-            goals.emplace(gf.makeGoal(br, buildMode));
-        return goals;
-    });
+    Goals goals;
+    for (auto & br : reqs)
+        goals.insert(worker.makeGoal(br, buildMode));
+
+    worker.run(goals);

    StringSet failed;
    std::shared_ptr<Error> ex;
-    for (auto & [i, result] : goals) {
-        if (result.ex) {
+    for (auto & i : goals) {
+        if (i->ex) {
            if (ex)
-                logError(result.ex->info());
+                logError(i->ex->info());
            else
-                ex = result.ex;
+                ex = i->ex;
        }
-        if (result.exitCode != Goal::ecSuccess) {
+        if (i->exitCode != Goal::ecSuccess) {
            if (auto i2 = dynamic_cast<DerivationGoal *>(i.get()))
                failed.insert(printStorePath(i2->drvPath));
            else if (auto i2 = dynamic_cast<PathSubstitutionGoal *>(i.get()))
@ -54,25 +46,23 @@ std::vector<KeyedBuildResult> Store::buildPathsWithResults(
    BuildMode buildMode,
    std::shared_ptr<Store> evalStore)
 {
-    auto aio = kj::setupAsyncIo();
-    Worker worker(*this, evalStore ? *evalStore : *this, aio);
+    Worker worker(*this, evalStore ? *evalStore : *this);

+    Goals goals;
    std::vector<std::pair<const DerivedPath &, GoalPtr>> state;

-    auto goals = runWorker(worker, [&](GoalFactory & gf) {
-        Worker::Targets goals;
-        for (const auto & req : reqs) {
-            auto goal = gf.makeGoal(req, buildMode);
-            state.push_back({req, goal.first});
-            goals.emplace(std::move(goal));
-        }
-        return goals;
-    });
+    for (const auto & req : reqs) {
+        auto goal = worker.makeGoal(req, buildMode);
+        goals.insert(goal);
+        state.push_back({req, goal});
+    }
+
+    worker.run(goals);

    std::vector<KeyedBuildResult> results;

    for (auto & [req, goalPtr] : state)
-        results.emplace_back(goals[goalPtr].result.restrictTo(req));
+        results.emplace_back(goalPtr->buildResult.restrictTo(req));

    return results;
 }
@ -80,17 +70,12 @@ std::vector<KeyedBuildResult> Store::buildPathsWithResults(
 BuildResult Store::buildDerivation(const StorePath & drvPath, const BasicDerivation & drv,
    BuildMode buildMode)
 {
-    auto aio = kj::setupAsyncIo();
-    Worker worker(*this, *this, aio);
+    Worker worker(*this, *this);
+    auto goal = worker.makeBasicDerivationGoal(drvPath, drv, OutputsSpec::All {}, buildMode);

    try {
-        auto goals = runWorker(worker, [&](GoalFactory & gf) {
-            Worker::Targets goals;
-            goals.emplace(gf.makeBasicDerivationGoal(drvPath, drv, OutputsSpec::All{}, buildMode));
-            return goals;
-        });
-        auto [goal, result] = *goals.begin();
-        return result.result.restrictTo(DerivedPath::Built {
+        worker.run(Goals{goal});
+        return goal->buildResult.restrictTo(DerivedPath::Built {
            .drvPath = makeConstantStorePathRef(drvPath),
            .outputs = OutputsSpec::All {},
        });
@ -108,20 +93,16 @@ void Store::ensurePath(const StorePath & path)
    /* If the path is already valid, we're done. */
    if (isValidPath(path)) return;

-    auto aio = kj::setupAsyncIo();
-    Worker worker(*this, *this, aio);
+    Worker worker(*this, *this);
+    GoalPtr goal = worker.makePathSubstitutionGoal(path);
+    Goals goals = {goal};

-    auto goals = runWorker(worker, [&](GoalFactory & gf) {
-        Worker::Targets goals;
-        goals.emplace(gf.makePathSubstitutionGoal(path));
-        return goals;
-    });
-    auto [goal, result] = *goals.begin();
+    worker.run(goals);

-    if (result.exitCode != Goal::ecSuccess) {
-        if (result.ex) {
-            result.ex->withExitStatus(worker.failingExitStatus());
-            throw std::move(*result.ex);
+    if (goal->exitCode != Goal::ecSuccess) {
+        if (goal->ex) {
+            goal->ex->withExitStatus(worker.failingExitStatus());
+            throw std::move(*goal->ex);
        } else
            throw Error(worker.failingExitStatus(), "path '%s' does not exist and cannot be created", printStorePath(path));
    }
@ -130,33 +111,24 @@ void Store::ensurePath(const StorePath & path)

 void Store::repairPath(const StorePath & path)
 {
-    auto aio = kj::setupAsyncIo();
-    Worker worker(*this, *this, aio);
+    Worker worker(*this, *this);
+    GoalPtr goal = worker.makePathSubstitutionGoal(path, Repair);
+    Goals goals = {goal};

-    auto goals = runWorker(worker, [&](GoalFactory & gf) {
-        Worker::Targets goals;
-        goals.emplace(gf.makePathSubstitutionGoal(path, Repair));
-        return goals;
-    });
-    auto [goal, result] = *goals.begin();
+    worker.run(goals);

-    if (result.exitCode != Goal::ecSuccess) {
+    if (goal->exitCode != Goal::ecSuccess) {
        /* Since substituting the path didn't work, if we have a valid
           deriver, then rebuild the deriver. */
        auto info = queryPathInfo(path);
        if (info->deriver && isValidPath(*info->deriver)) {
-            worker.run([&](GoalFactory & gf) {
-                Worker::Targets goals;
-                goals.emplace(gf.makeGoal(
-                    DerivedPath::Built{
-                        .drvPath = makeConstantStorePathRef(*info->deriver),
-                        // FIXME: Should just build the specific output we need.
-                        .outputs = OutputsSpec::All{},
-                    },
-                    bmRepair
-                ));
-                return goals;
-            });
+            goals.clear();
+            goals.insert(worker.makeGoal(DerivedPath::Built {
+                .drvPath = makeConstantStorePathRef(*info->deriver),
+                // FIXME: Should just build the specific output we need.
+                .outputs = OutputsSpec::All { },
+            }, bmRepair));
+            worker.run(goals);
        } else
            throw Error(worker.failingExitStatus(), "cannot repair path '%s'", printStorePath(path));
    }
--- a/src/libstore/build/goal.cc
+++ b/src/libstore/build/goal.cc
@ -1,73 +1,18 @@
 #include "goal.hh"
-#include "async-collect.hh"
-#include "worker.hh"
-#include <boost/outcome/try.hpp>
-#include <kj/time.h>

 namespace nix {


+bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) const {
+    std::string s1 = a->key();
+    std::string s2 = b->key();
+    return s1 < s2;
+}
+
+
 void Goal::trace(std::string_view s)
 {
    debug("%1%: %2%", name, s);
 }

-kj::Promise<void> Goal::waitForAWhile()
-{
-    trace("wait for a while");
-    /* If we are polling goals that are waiting for a lock, then wake
-       up after a few seconds at most. */
-    return worker.aio.provider->getTimer().afterDelay(settings.pollInterval.get() * kj::SECONDS);
-}
-
-kj::Promise<Result<Goal::WorkResult>> Goal::work() noexcept
-try {
-    BOOST_OUTCOME_CO_TRY(auto result, co_await workImpl());
-
-    trace("done");
-
-    cleanup();
-
-    co_return std::move(result);
-} catch (...) {
-    co_return result::failure(std::current_exception());
-}
-
-kj::Promise<Result<void>>
-Goal::waitForGoals(kj::Array<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies) noexcept
-try {
-    auto left = dependencies.size();
-    for (auto & [dep, p] : dependencies) {
-        p = p.then([this, dep, &left](auto _result) -> Result<WorkResult> {
-            BOOST_OUTCOME_TRY(auto result, _result);
-
-            left--;
-            trace(fmt("waitee '%s' done; %d left", dep->name, left));
-
-            if (result.exitCode != Goal::ecSuccess) ++nrFailed;
-            if (result.exitCode == Goal::ecNoSubstituters) ++nrNoSubstituters;
-            if (result.exitCode == Goal::ecIncompleteClosure) ++nrIncompleteClosure;
-
-            return std::move(result);
-        }).eagerlyEvaluate(nullptr);
-    }
-
-    auto collectDeps = asyncCollect(std::move(dependencies));
-
-    while (auto item = co_await collectDeps.next()) {
-        auto & [dep, _result] = *item;
-        BOOST_OUTCOME_CO_TRY(auto result, _result);
-
-        waiteeDone(dep);
-
-        if (result.exitCode == ecFailed && !settings.keepGoing) {
-            co_return result::success();
-        }
-    }
-
-    co_return result::success();
-} catch (...) {
-    co_return result::failure(std::current_exception());
-}
-
 }
--- a/src/libstore/build/goal.hh
+++ b/src/libstore/build/goal.hh
@ -1,13 +1,9 @@
 #pragma once
 ///@file

-#include "async-semaphore.hh"
-#include "result.hh"
 #include "types.hh"
 #include "store-api.hh"
 #include "build-result.hh"
-#include <concepts> // IWYU pragma: keep
-#include <kj/async.h>

 namespace nix {

@ -21,11 +17,22 @@ class Worker;
 * A pointer to a goal.
 */
 typedef std::shared_ptr<Goal> GoalPtr;
+typedef std::weak_ptr<Goal> WeakGoalPtr;
+
+struct CompareGoalPtrs {
+    bool operator() (const GoalPtr & a, const GoalPtr & b) const;
+};

 /**
 * Set of goals.
 */
-typedef std::set<GoalPtr> Goals;
+typedef std::set<GoalPtr, CompareGoalPtrs> Goals;
+typedef std::set<WeakGoalPtr, std::owner_less<WeakGoalPtr>> WeakGoals;
+
+/**
+ * A map of paths to goals (and the other way around).
+ */
+typedef std::map<StorePath, WeakGoalPtr> WeakGoalMap;

 /**
 * Used as a hint to the worker on how to schedule a particular goal. For example,
@ -54,11 +61,15 @@ struct Goal
    Worker & worker;

    /**
-      * Whether this goal is only a dependency of other goals. Toplevel
-      * goals that are also dependencies of other toplevel goals do not
-      * set this, only goals that are exclusively dependencies do this.
-      */
-    const bool isDependency;
+     * Goals that this goal is waiting for.
+     */
+    Goals waitees;
+
+    /**
+     * Goals waiting for this one to finish.  Must use weak pointers
+     * here to prevent cycles.
+     */
+    WeakGoals waiters;

    /**
     * Number of goals we are/were waiting for that have failed.
@ -82,40 +93,58 @@ struct Goal
     */
    std::string name;

-protected:
-    AsyncSemaphore::Token slotToken;
+    /**
+     * Whether the goal is finished.
+     */
+    std::optional<ExitCode> exitCode;
+
+    /**
+     * Build result.
+     */
+    BuildResult buildResult;

 public:
-    struct [[nodiscard]] WorkResult {
-        ExitCode exitCode;
-        BuildResult result = {};
-        std::shared_ptr<Error> ex = {};
+
+    struct [[nodiscard]] StillAlive {};
+    struct [[nodiscard]] WaitForSlot {};
+    struct [[nodiscard]] WaitForAWhile {};
+    struct [[nodiscard]] ContinueImmediately {};
+    struct [[nodiscard]] WaitForGoals {
+        Goals goals;
+    };
+    struct [[nodiscard]] WaitForWorld {
+        std::set<int> fds;
+        bool inBuildSlot;
+    };
+    struct [[nodiscard]] Finished {
+        ExitCode result;
+        std::shared_ptr<Error> ex;
        bool permanentFailure = false;
        bool timedOut = false;
        bool hashMismatch = false;
        bool checkMismatch = false;
    };

-protected:
-    kj::Promise<void> waitForAWhile();
-    kj::Promise<Result<void>>
-    waitForGoals(kj::Array<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies) noexcept;
-
-    template<std::derived_from<Goal>... G>
-    kj::Promise<Result<void>>
-    waitForGoals(std::pair<std::shared_ptr<G>, kj::Promise<Result<WorkResult>>>... goals) noexcept
+    struct [[nodiscard]] WorkResult : std::variant<
+                                          StillAlive,
+                                          WaitForSlot,
+                                          WaitForAWhile,
+                                          ContinueImmediately,
+                                          WaitForGoals,
+                                          WaitForWorld,
+                                          Finished>
    {
-        return waitForGoals(
-            kj::arrOf<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>>(std::move(goals)...)
-        );
-    }
+        WorkResult() = delete;
+        using variant::variant;
+    };

-    virtual kj::Promise<Result<WorkResult>> workImpl() noexcept = 0;
+    /**
+     * Exception containing an error message, if any.
+     */
+    std::shared_ptr<Error> ex;

-public:
-    explicit Goal(Worker & worker, bool isDependency)
+    explicit Goal(Worker & worker)
        : worker(worker)
-        , isDependency(isDependency)
    { }

    virtual ~Goal() noexcept(false)
@ -123,10 +152,24 @@ public:
        trace("goal destroyed");
    }

-    kj::Promise<Result<WorkResult>> work() noexcept;
+    virtual WorkResult work(bool inBuildSlot) = 0;

    virtual void waiteeDone(GoalPtr waitee) { }

+    virtual WorkResult handleChildOutput(int fd, std::string_view data)
+    {
+        abort();
+    }
+
+    virtual void handleEOF(int fd)
+    {
+    }
+
+    virtual bool respectsTimeouts()
+    {
+        return false;
+    }
+
    void trace(std::string_view s);

    std::string getName() const
@ -134,6 +177,15 @@ public:
        return name;
    }

+    /**
+     * Callback in case of a timeout.  It should wake up its waiters,
+     * get rid of any running child processes that are being monitored
+     * by the worker (important!), etc.
+     */
+    virtual Finished timedOut(Error && ex) = 0;
+
+    virtual std::string key() = 0;
+
    virtual void cleanup() { }

    /**
--- a/src/libstore/build/hook-instance.cc
+++ b/src/libstore/build/hook-instance.cc
@ -1,9 +1,7 @@
 #include "child.hh"
-#include "error.hh"
 #include "file-system.hh"
 #include "globals.hh"
 #include "hook-instance.hh"
-#include "strings.hh"

 namespace nix {

@ -87,7 +85,7 @@ HookInstance::~HookInstance()
        toHook.reset();
        if (pid) pid.kill();
    } catch (...) {
-        ignoreExceptionInDestructor();
+        ignoreException();
    }
 }

--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@ -1,13 +1,15 @@
 #include "local-derivation-goal.hh"
-#include "error.hh"
 #include "indirect-root-store.hh"
+#include "hook-instance.hh"
 #include "machines.hh"
 #include "store-api.hh"
 #include "worker.hh"
 #include "builtins.hh"
 #include "builtins/buildenv.hh"
 #include "path-references.hh"
+#include "finally.hh"
 #include "archive.hh"
+#include "compression.hh"
 #include "daemon.hh"
 #include "topo-sort.hh"
 #include "json-utils.hh"
@ -17,7 +19,6 @@
 #include "child.hh"
 #include "unix-domain-socket.hh"
 #include "mount.hh"
-#include "strings.hh"

 #include <regex>
 #include <queue>
@ -99,9 +100,9 @@ LocalDerivationGoal::~LocalDerivationGoal() noexcept(false)
 {
    /* Careful: we should never ever throw an exception from a
       destructor. */
-    try { deleteTmpDir(false); } catch (...) { ignoreExceptionInDestructor(); }
-    try { killChild(); } catch (...) { ignoreExceptionInDestructor(); }
-    try { stopDaemon(); } catch (...) { ignoreExceptionInDestructor(); }
+    try { deleteTmpDir(false); } catch (...) { ignoreException(); }
+    try { killChild(); } catch (...) { ignoreException(); }
+    try { stopDaemon(); } catch (...) { ignoreException(); }
 }


@ -122,6 +123,8 @@ LocalStore & LocalDerivationGoal::getLocalStore()
 void LocalDerivationGoal::killChild()
 {
    if (pid) {
+        worker.childTerminated(this);
+
        /* If we're using a build user, then there is a tricky race
           condition: if we kill the build user before the child has
           done its setuid() to the build user uid, then it won't be
@ -148,18 +151,17 @@ void LocalDerivationGoal::killSandbox(bool getStats)
 }


-kj::Promise<Result<Goal::WorkResult>> LocalDerivationGoal::tryLocalBuild() noexcept
-try {
-retry:
+Goal::WorkResult LocalDerivationGoal::tryLocalBuild(bool inBuildSlot)
+{
 #if __APPLE__
    additionalSandboxProfile = parsedDrv->getStringAttr("__sandboxProfile").value_or("");
 #endif

-    if (!slotToken.valid()) {
+    if (!inBuildSlot) {
+        state = &DerivationGoal::tryToBuild;
        outputLocks.unlock();
-        if (worker.localBuilds.capacity() > 0) {
-            slotToken = co_await worker.localBuilds.acquire();
-            co_return co_await tryToBuild();
+        if (0U != settings.maxBuildJobs) {
+            return WaitForSlot{};
        }
        if (getMachines().empty()) {
            throw Error(
@ -214,9 +216,7 @@ retry:
            if (!actLock)
                actLock = std::make_unique<Activity>(*logger, lvlWarn, actBuildWaiting,
                    fmt("waiting for a free build user ID for '%s'", Magenta(worker.store.printStorePath(drvPath))));
-            co_await waitForAWhile();
-            // we can loop very often, and `co_return co_await` always allocates a new frame
-            goto retry;
+            return WaitForAWhile{};
        }
    }

@ -245,29 +245,22 @@ retry:
    try {

        /* Okay, we have to build. */
-        auto promise = startBuilder();
+        auto fds = startBuilder();
+
+        /* This state will be reached when we get EOF on the child's
+           log pipe. */
+        state = &DerivationGoal::buildDone;

        started();
-        auto r = co_await promise;
-        if (r.has_value()) {
-            // all good so far
-        } else if (r.has_error()) {
-            co_return r.assume_error();
-        } else {
-            co_return r.assume_exception();
-        }
+        return WaitForWorld{std::move(fds), true};

    } catch (BuildError & e) {
        outputLocks.unlock();
        buildUser.reset();
        auto report = done(BuildResult::InputRejected, {}, std::move(e));
        report.permanentFailure = true;
-        co_return report;
+        return report;
    }
-
-    co_return co_await buildDone();
-} catch (...) {
-    co_return result::failure(std::current_exception());
 }


@ -397,9 +390,7 @@ void LocalDerivationGoal::cleanupPostOutputsRegisteredModeNonCheck()
    cleanupPostOutputsRegisteredModeCheck();
 }

-// NOTE this one isn't noexcept because it's called from places that expect
-// exceptions to signal failure to launch. we should change this some time.
-kj::Promise<Outcome<void, Goal::WorkResult>> LocalDerivationGoal::startBuilder()
+std::set<int> LocalDerivationGoal::startBuilder()
 {
    if ((buildUser && buildUser->getUIDCount() != 1)
        #if __linux__
@ -788,7 +779,7 @@ kj::Promise<Outcome<void, Goal::WorkResult>> LocalDerivationGoal::startBuilder()
        msgs.push_back(std::move(msg));
    }

-    return handleChildOutput();
+    return {builderOutPTY.get()};
 }


@ -1250,7 +1241,7 @@ void LocalDerivationGoal::startDaemon()
                        NotTrusted, daemon::Recursive);
                    debug("terminated daemon connection");
                } catch (SysError &) {
-                    ignoreExceptionExceptInterrupt();
+                    ignoreException();
                }
            });

@ -1370,20 +1361,13 @@ void LocalDerivationGoal::runChild()

        bool setUser = true;

-        /* Make the contents of netrc and the CA certificate bundle
-           available to builtin:fetchurl (which may run under a
-           different uid and/or in a sandbox). */
+        /* Make the contents of netrc available to builtin:fetchurl
+           (which may run under a different uid and/or in a sandbox). */
        std::string netrcData;
-        std::string caFileData;
-        if (drv->isBuiltin() && drv->builder == "builtin:fetchurl" && !derivationType->isSandboxed()) {
-            try {
+        try {
+            if (drv->isBuiltin() && drv->builder == "builtin:fetchurl" && !derivationType->isSandboxed())
                netrcData = readFile(settings.netrcFile);
-            } catch (SysError &) { }
-
-            try {
-                caFileData = readFile(settings.caFile);
-            } catch (SysError &) { }
-        }
+        } catch (SysError &) { }

 #if __linux__
        if (useChroot) {
@ -1818,7 +1802,7 @@ void LocalDerivationGoal::runChild()
                    e.second = rewriteStrings(e.second, inputRewrites);

                if (drv->builder == "builtin:fetchurl")
-                    builtinFetchurl(drv2, netrcData, caFileData);
+                    builtinFetchurl(drv2, netrcData);
                else if (drv->builder == "builtin:buildenv")
                    builtinBuildenv(drv2);
                else if (drv->builder == "builtin:unpack-channel")
--- a/src/libstore/build/local-derivation-goal.hh
+++ b/src/libstore/build/local-derivation-goal.hh
@ -182,11 +182,10 @@ struct LocalDerivationGoal : public DerivationGoal
     * Create a LocalDerivationGoal without an on-disk .drv file,
     * possibly a platform-specific subclass
     */
-    static std::unique_ptr<LocalDerivationGoal> makeLocalDerivationGoal(
+    static std::shared_ptr<LocalDerivationGoal> makeLocalDerivationGoal(
        const StorePath & drvPath,
        const OutputsSpec & wantedOutputs,
        Worker & worker,
-        bool isDependency,
        BuildMode buildMode
    );

@ -194,12 +193,11 @@ struct LocalDerivationGoal : public DerivationGoal
     * Create a LocalDerivationGoal for an on-disk .drv file,
     * possibly a platform-specific subclass
     */
-    static std::unique_ptr<LocalDerivationGoal> makeLocalDerivationGoal(
+    static std::shared_ptr<LocalDerivationGoal> makeLocalDerivationGoal(
        const StorePath & drvPath,
        const BasicDerivation & drv,
        const OutputsSpec & wantedOutputs,
        Worker & worker,
-        bool isDependency,
        BuildMode buildMode
    );

@ -213,12 +211,12 @@ struct LocalDerivationGoal : public DerivationGoal
    /**
     * The additional states.
     */
-    kj::Promise<Result<WorkResult>> tryLocalBuild() noexcept override;
+    WorkResult tryLocalBuild(bool inBuildSlot) override;

    /**
     * Start building a derivation.
     */
-    kj::Promise<Outcome<void, WorkResult>> startBuilder();
+    std::set<int> startBuilder();

    /**
     * Fill in the environment for the builder.
--- a/src/libstore/build/substitution-goal.cc
+++ b/src/libstore/build/substitution-goal.cc
@ -3,26 +3,19 @@
 #include "nar-info.hh"
 #include "signals.hh"
 #include "finally.hh"
-#include <kj/array.h>
-#include <kj/vector.h>

 namespace nix {

-PathSubstitutionGoal::PathSubstitutionGoal(
-    const StorePath & storePath,
-    Worker & worker,
-    bool isDependency,
-    RepairFlag repair,
-    std::optional<ContentAddress> ca
-)
-    : Goal(worker, isDependency)
+PathSubstitutionGoal::PathSubstitutionGoal(const StorePath & storePath, Worker & worker, RepairFlag repair, std::optional<ContentAddress> ca)
+    : Goal(worker)
    , storePath(storePath)
    , repair(repair)
    , ca(ca)
 {
+    state = &PathSubstitutionGoal::init;
    name = fmt("substitution of '%s'", worker.store.printStorePath(this->storePath));
    trace("created");
-    maintainExpectedSubstitutions = worker.expectedSubstitutions.addTemporarily(1);
+    maintainExpectedSubstitutions = std::make_unique<MaintainCount<uint64_t>>(worker.expectedSubstitutions);
 }


@ -32,29 +25,35 @@ PathSubstitutionGoal::~PathSubstitutionGoal()
 }


-Goal::WorkResult PathSubstitutionGoal::done(
+Goal::Finished PathSubstitutionGoal::done(
    ExitCode result,
    BuildResult::Status status,
    std::optional<std::string> errorMsg)
 {
-    BuildResult buildResult{.status = status};
+    buildResult.status = status;
    if (errorMsg) {
        debug(*errorMsg);
        buildResult.errorMsg = *errorMsg;
    }
-    return WorkResult{result, std::move(buildResult)};
+    return Finished{result};
 }


-kj::Promise<Result<Goal::WorkResult>> PathSubstitutionGoal::workImpl() noexcept
-try {
+Goal::WorkResult PathSubstitutionGoal::work(bool inBuildSlot)
+{
+    return (this->*state)(inBuildSlot);
+}
+
+
+Goal::WorkResult PathSubstitutionGoal::init(bool inBuildSlot)
+{
    trace("init");

    worker.store.addTempRoot(storePath);

    /* If the path already exists we're done. */
    if (!repair && worker.store.isValidPath(storePath)) {
-        return {done(ecSuccess, BuildResult::AlreadyValid)};
+        return done(ecSuccess, BuildResult::AlreadyValid);
    }

    if (settings.readOnlyMode)
@ -62,14 +61,12 @@ try {

    subs = settings.useSubstitutes ? getDefaultSubstituters() : std::list<ref<Store>>();

-    return tryNext();
-} catch (...) {
-    return {std::current_exception()};
+    return tryNext(inBuildSlot);
 }


-kj::Promise<Result<Goal::WorkResult>> PathSubstitutionGoal::tryNext() noexcept
-try {
+Goal::WorkResult PathSubstitutionGoal::tryNext(bool inBuildSlot)
+{
    trace("trying next substituter");

    cleanup();
@ -84,7 +81,7 @@ try {
        /* Hack: don't indicate failure if there were no substituters.
           In that case the calling derivation should just do a
           build. */
-        co_return done(
+        return done(
            substituterFailed ? ecFailed : ecNoSubstituters,
            BuildResult::NoSubstituters,
            fmt("path '%s' is required, but there is no substituter that can build it", worker.store.printStorePath(storePath)));
@ -100,28 +97,26 @@ try {
        if (sub->storeDir == worker.store.storeDir)
            assert(subPath == storePath);
    } else if (sub->storeDir != worker.store.storeDir) {
-        co_return co_await tryNext();
+        return tryNext(inBuildSlot);
    }

-    do {
-        try {
-            // FIXME: make async
-            info = sub->queryPathInfo(subPath ? *subPath : storePath);
-            break;
-        } catch (InvalidPath &) {
-        } catch (SubstituterDisabled &) {
-            if (!settings.tryFallback) {
-                throw;
-            }
-        } catch (Error & e) {
-            if (settings.tryFallback) {
-                logError(e.info());
-            } else {
-                throw;
-            }
+    try {
+        // FIXME: make async
+        info = sub->queryPathInfo(subPath ? *subPath : storePath);
+    } catch (InvalidPath &) {
+        return tryNext(inBuildSlot);
+    } catch (SubstituterDisabled &) {
+        if (settings.tryFallback) {
+            return tryNext(inBuildSlot);
        }
-        co_return co_await tryNext();
-    } while (false);
+        throw;
+    } catch (Error & e) {
+        if (settings.tryFallback) {
+            logError(e.info());
+            return tryNext(inBuildSlot);
+        }
+        throw;
+    }

    if (info->path != storePath) {
        if (info->isContentAddressed(*sub) && info->references.empty()) {
@ -131,18 +126,18 @@ try {
        } else {
            printError("asked '%s' for '%s' but got '%s'",
                sub->getUri(), worker.store.printStorePath(storePath), sub->printStorePath(info->path));
-            co_return co_await tryNext();
+            return tryNext(inBuildSlot);
        }
    }

    /* Update the total expected download size. */
    auto narInfo = std::dynamic_pointer_cast<const NarInfo>(info);

-    maintainExpectedNar = worker.expectedNarSize.addTemporarily(info->narSize);
+    maintainExpectedNar = std::make_unique<MaintainCount<uint64_t>>(worker.expectedNarSize, info->narSize);

    maintainExpectedDownload =
        narInfo && narInfo->fileSize
-        ? worker.expectedDownloadSize.addTemporarily(narInfo->fileSize)
+        ? std::make_unique<MaintainCount<uint64_t>>(worker.expectedDownloadSize, narInfo->fileSize)
        : nullptr;

    /* Bail out early if this substituter lacks a valid
@ -152,67 +147,65 @@ try {
    {
        warn("ignoring substitute for '%s' from '%s', as it's not signed by any of the keys in 'trusted-public-keys'",
            worker.store.printStorePath(storePath), sub->getUri());
-        co_return co_await tryNext();
+        return tryNext(inBuildSlot);
    }

    /* To maintain the closure invariant, we first have to realise the
       paths referenced by this one. */
-    kj::Vector<std::pair<GoalPtr, kj::Promise<Result<WorkResult>>>> dependencies;
+    WaitForGoals result;
    for (auto & i : info->references)
        if (i != storePath) /* ignore self-references */
-            dependencies.add(worker.goalFactory().makePathSubstitutionGoal(i));
+            result.goals.insert(worker.makePathSubstitutionGoal(i));

-    if (!dependencies.empty()) {/* to prevent hang (no wake-up event) */
-        (co_await waitForGoals(dependencies.releaseAsArray())).value();
+    if (result.goals.empty()) {/* to prevent hang (no wake-up event) */
+        return referencesValid(inBuildSlot);
+    } else {
+        state = &PathSubstitutionGoal::referencesValid;
+        return result;
    }
-    co_return co_await referencesValid();
-} catch (...) {
-    co_return result::failure(std::current_exception());
 }


-kj::Promise<Result<Goal::WorkResult>> PathSubstitutionGoal::referencesValid() noexcept
-try {
+Goal::WorkResult PathSubstitutionGoal::referencesValid(bool inBuildSlot)
+{
    trace("all references realised");

    if (nrFailed > 0) {
-        return {done(
+        return done(
            nrNoSubstituters > 0 || nrIncompleteClosure > 0 ? ecIncompleteClosure : ecFailed,
            BuildResult::DependencyFailed,
-            fmt("some references of path '%s' could not be realised", worker.store.printStorePath(storePath)))};
+            fmt("some references of path '%s' could not be realised", worker.store.printStorePath(storePath)));
    }

    for (auto & i : info->references)
        if (i != storePath) /* ignore self-references */
            assert(worker.store.isValidPath(i));

-    return tryToRun();
-} catch (...) {
-    return {std::current_exception()};
+    state = &PathSubstitutionGoal::tryToRun;
+    return ContinueImmediately{};
 }


-kj::Promise<Result<Goal::WorkResult>> PathSubstitutionGoal::tryToRun() noexcept
-try {
+Goal::WorkResult PathSubstitutionGoal::tryToRun(bool inBuildSlot)
+{
    trace("trying to run");

-    if (!slotToken.valid()) {
-        slotToken = co_await worker.substitutions.acquire();
+    if (!inBuildSlot) {
+        return WaitForSlot{};
    }

-    maintainRunningSubstitutions = worker.runningSubstitutions.addTemporarily(1);
+    maintainRunningSubstitutions = std::make_unique<MaintainCount<uint64_t>>(worker.runningSubstitutions);

-    auto pipe = kj::newPromiseAndCrossThreadFulfiller<void>();
-    outPipe = kj::mv(pipe.fulfiller);
+    outPipe.create();

    thr = std::async(std::launch::async, [this]() {
-        /* Wake up the worker loop when we're done. */
-        Finally updateStats([this]() { outPipe->fulfill(); });
-
        auto & fetchPath = subPath ? *subPath : storePath;
        try {
            ReceiveInterrupts receiveInterrupts;

+            /* Wake up the worker loop when we're done. */
+            Finally updateStats([this]() { outPipe.writeSide.close(); });
+
            Activity act(*logger, actSubstitute, Logger::Fields{worker.store.printStorePath(storePath), sub->getUri()});
            PushActivity pact(act.id);

@ -228,39 +221,37 @@ try {
        }
    });

-    co_await pipe.promise;
-    co_return co_await finished();
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    state = &PathSubstitutionGoal::finished;
+    return WaitForWorld{{outPipe.readSide.get()}, true};
 }


-kj::Promise<Result<Goal::WorkResult>> PathSubstitutionGoal::finished() noexcept
-try {
+Goal::WorkResult PathSubstitutionGoal::finished(bool inBuildSlot)
+{
    trace("substitute finished");

-    do {
-        try {
-            slotToken = {};
-            thr.get();
-            break;
-        } catch (std::exception & e) {
-            printError(e.what());
+    worker.childTerminated(this);

-            /* Cause the parent build to fail unless --fallback is given,
-               or the substitute has disappeared. The latter case behaves
-               the same as the substitute never having existed in the
-               first place. */
-            try {
-                throw;
-            } catch (SubstituteGone &) {
-            } catch (...) {
-                substituterFailed = true;
-            }
+    try {
+        thr.get();
+    } catch (std::exception & e) {
+        printError(e.what());
+
+        /* Cause the parent build to fail unless --fallback is given,
+           or the substitute has disappeared. The latter case behaves
+           the same as the substitute never having existed in the
+           first place. */
+        try {
+            throw;
+        } catch (SubstituteGone &) {
+        } catch (...) {
+            substituterFailed = true;
        }
+
        /* Try the next substitute. */
-        co_return co_await tryNext();
-    } while (false);
+        state = &PathSubstitutionGoal::tryNext;
+        return ContinueImmediately{};
+    }

    worker.markContentsGood(storePath);

@ -271,15 +262,22 @@ try {
    maintainExpectedSubstitutions.reset();
    worker.doneSubstitutions++;

-    worker.doneDownloadSize += maintainExpectedDownload.delta();
-    maintainExpectedDownload.reset();
+    if (maintainExpectedDownload) {
+        auto fileSize = maintainExpectedDownload->delta;
+        maintainExpectedDownload.reset();
+        worker.doneDownloadSize += fileSize;
+    }

-    worker.doneNarSize += maintainExpectedNar.delta();
+    worker.doneNarSize += maintainExpectedNar->delta;
    maintainExpectedNar.reset();

-    co_return done(ecSuccess, BuildResult::Substituted);
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    return done(ecSuccess, BuildResult::Substituted);
+}
+
+
+Goal::WorkResult PathSubstitutionGoal::handleChildOutput(int fd, std::string_view data)
+{
+    return StillAlive{};
 }


@ -289,9 +287,12 @@ void PathSubstitutionGoal::cleanup()
        if (thr.valid()) {
            // FIXME: signal worker thread to quit.
            thr.get();
+            worker.childTerminated(this);
        }
+
+        outPipe.close();
    } catch (...) {
-        ignoreExceptionInDestructor();
+        ignoreException();
    }
 }

--- a/src/libstore/build/substitution-goal.hh
+++ b/src/libstore/build/substitution-goal.hh
@ -2,7 +2,6 @@
 ///@file

 #include "lock.hh"
-#include "notifying-counter.hh"
 #include "store-api.hh"
 #include "goal.hh"

@ -46,7 +45,7 @@ struct PathSubstitutionGoal : public Goal
    /**
     * Pipe for the substituter's standard output.
     */
-    kj::Own<kj::CrossThreadPromiseFulfiller<void>> outPipe;
+    Pipe outPipe;

    /**
     * The substituter thread.
@ -64,38 +63,52 @@ struct PathSubstitutionGoal : public Goal
     */
    Path destPath;

-    NotifyingCounter<uint64_t>::Bump maintainExpectedSubstitutions,
+    std::unique_ptr<MaintainCount<uint64_t>> maintainExpectedSubstitutions,
        maintainRunningSubstitutions, maintainExpectedNar, maintainExpectedDownload;

+    typedef WorkResult (PathSubstitutionGoal::*GoalState)(bool inBuildSlot);
+    GoalState state;
+
    /**
     * Content address for recomputing store path
     */
    std::optional<ContentAddress> ca;

-    WorkResult done(
+    Finished done(
        ExitCode result,
        BuildResult::Status status,
        std::optional<std::string> errorMsg = {});

 public:
-    PathSubstitutionGoal(
-        const StorePath & storePath,
-        Worker & worker,
-        bool isDependency,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt
-    );
+    PathSubstitutionGoal(const StorePath & storePath, Worker & worker, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);
    ~PathSubstitutionGoal();

-    kj::Promise<Result<WorkResult>> workImpl() noexcept override;
+    Finished timedOut(Error && ex) override { abort(); };
+
+    /**
+     * We prepend "a$" to the key name to ensure substitution goals
+     * happen before derivation goals.
+     */
+    std::string key() override
+    {
+        return "a$" + std::string(storePath.name()) + "$" + worker.store.printStorePath(storePath);
+    }
+
+    WorkResult work(bool inBuildSlot) override;

    /**
     * The states.
     */
-    kj::Promise<Result<WorkResult>> tryNext() noexcept;
-    kj::Promise<Result<WorkResult>> referencesValid() noexcept;
-    kj::Promise<Result<WorkResult>> tryToRun() noexcept;
-    kj::Promise<Result<WorkResult>> finished() noexcept;
+    WorkResult init(bool inBuildSlot);
+    WorkResult tryNext(bool inBuildSlot);
+    WorkResult referencesValid(bool inBuildSlot);
+    WorkResult tryToRun(bool inBuildSlot);
+    WorkResult finished(bool inBuildSlot);
+
+    /**
+     * Callback used by the worker to write to the log.
+     */
+    WorkResult handleChildOutput(int fd, std::string_view data) override;

    /* Called by destructor, can't be overridden */
    void cleanup() override final;
--- a/src/libstore/build/worker.cc
+++ b/src/libstore/build/worker.cc
@ -1,42 +1,26 @@
-#include "async-collect.hh"
 #include "charptr-cast.hh"
 #include "worker.hh"
-#include "finally.hh"
 #include "substitution-goal.hh"
 #include "drv-output-substitution-goal.hh"
 #include "local-derivation-goal.hh"
 #include "signals.hh"
 #include "hook-instance.hh" // IWYU pragma: keep
-#include <boost/outcome/try.hpp>
-#include <kj/vector.h>
+
+#include <poll.h>

 namespace nix {

-namespace {
-struct ErrorHandler : kj::TaskSet::ErrorHandler
-{
-    void taskFailed(kj::Exception && e) override
-    {
-        printError("unexpected async failure in Worker: %s", kj::str(e).cStr());
-        abort();
-    }
-} errorHandler;
-}
-
-Worker::Worker(Store & store, Store & evalStore, kj::AsyncIoContext & aio)
+Worker::Worker(Store & store, Store & evalStore)
    : act(*logger, actRealise)
    , actDerivations(*logger, actBuilds)
    , actSubstitutions(*logger, actCopyPaths)
    , store(store)
    , evalStore(evalStore)
-    , aio(aio)
-      /* Make sure that we are always allowed to run at least one substitution.
-         This prevents infinite waiting. */
-    , substitutions(std::max<unsigned>(1, settings.maxSubstitutionJobs))
-    , localBuilds(settings.maxBuildJobs)
-    , children(errorHandler)
 {
    /* Debugging: prevent recursive workers. */
+    nrLocalBuilds = 0;
+    nrSubstitutions = 0;
+    lastWokenUp = steady_time_point::min();
 }


@ -46,11 +30,7 @@ Worker::~Worker()
       goals that refer to this worker should be gone.  (Otherwise we
       are in trouble, since goals may call childTerminated() etc. in
       their destructors). */
-    children.clear();
-
-    derivationGoals.clear();
-    drvOutputSubstitutionGoals.clear();
-    substitutionGoals.clear();
+    topGoals.clear();

    assert(expectedSubstitutions == 0);
    assert(expectedDownloadSize == 0);
@ -58,246 +38,506 @@ Worker::~Worker()
 }


-template<typename ID, std::derived_from<Goal> G>
-std::pair<std::shared_ptr<G>, kj::Promise<Result<Goal::WorkResult>>> Worker::makeGoalCommon(
-    std::map<ID, CachedGoal<G>> & map,
-    const ID & key,
-    InvocableR<std::unique_ptr<G>> auto create,
-    InvocableR<bool, G &> auto modify
-)
-{
-    auto [it, _inserted] = map.try_emplace(key);
-    // try twice to create the goal. we can only loop if we hit the continue,
-    // and then we only want to recreate the goal *once*. concurrent accesses
-    // to the worker are not sound, we want to catch them if at all possible.
-    for ([[maybe_unused]] auto _attempt : {1, 2}) {
-        auto & cachedGoal = it->second;
-        auto & goal = cachedGoal.goal;
-        if (!goal) {
-            goal = create();
-            // do not start working immediately. if we are not yet running we
-            // may create dependencies as though they were toplevel goals, in
-            // which case the dependencies will not report build errors. when
-            // we are running we may be called for this same goal more times,
-            // and then we want to modify rather than recreate when possible.
-            auto removeWhenDone = [goal, &map, it] {
-                // c++ lambda coroutine capture semantics are *so* fucked up.
-                return [](auto goal, auto & map, auto it) -> kj::Promise<Result<Goal::WorkResult>> {
-                    auto result = co_await goal->work();
-                    // a concurrent call to makeGoalCommon may have reset our
-                    // cached goal and replaced it with a new instance. don't
-                    // remove the goal in this case, otherwise we will crash.
-                    if (goal == it->second.goal) {
-                        map.erase(it);
-                    }
-                    co_return result;
-                }(goal, map, it);
-            };
-            cachedGoal.promise = kj::evalLater(std::move(removeWhenDone)).fork();
-            children.add(cachedGoal.promise.addBranch().then([this](auto _result) {
-                if (_result.has_value()) {
-                    auto & result = _result.value();
-                    permanentFailure |= result.permanentFailure;
-                    timedOut |= result.timedOut;
-                    hashMismatch |= result.hashMismatch;
-                    checkMismatch |= result.checkMismatch;
-                }
-            }));
-        } else {
-            if (!modify(*goal)) {
-                cachedGoal = {};
-                continue;
-            }
-        }
-        return {goal, cachedGoal.promise.addBranch()};
-    }
-    assert(false && "could not make a goal. possible concurrent worker access");
-}
-
-
-std::pair<std::shared_ptr<DerivationGoal>, kj::Promise<Result<Goal::WorkResult>>> Worker::makeDerivationGoal(
-    const StorePath & drvPath, const OutputsSpec & wantedOutputs, BuildMode buildMode
-)
-{
-    return makeGoalCommon(
-        derivationGoals,
-        drvPath,
-        [&]() -> std::unique_ptr<DerivationGoal> {
-            return !dynamic_cast<LocalStore *>(&store)
-                ? std::make_unique<DerivationGoal>(
-                    drvPath, wantedOutputs, *this, running, buildMode
-                )
-                : LocalDerivationGoal::makeLocalDerivationGoal(
-                    drvPath, wantedOutputs, *this, running, buildMode
-                );
-        },
-        [&](DerivationGoal & g) { return g.addWantedOutputs(wantedOutputs); }
-    );
-}
-
-
-std::pair<std::shared_ptr<DerivationGoal>, kj::Promise<Result<Goal::WorkResult>>> Worker::makeBasicDerivationGoal(
+std::shared_ptr<DerivationGoal> Worker::makeDerivationGoalCommon(
    const StorePath & drvPath,
-    const BasicDerivation & drv,
    const OutputsSpec & wantedOutputs,
-    BuildMode buildMode
-)
+    std::function<std::shared_ptr<DerivationGoal>()> mkDrvGoal)
 {
-    return makeGoalCommon(
-        derivationGoals,
-        drvPath,
-        [&]() -> std::unique_ptr<DerivationGoal> {
-            return !dynamic_cast<LocalStore *>(&store)
-                ? std::make_unique<DerivationGoal>(
-                    drvPath, drv, wantedOutputs, *this, running, buildMode
-                )
-                : LocalDerivationGoal::makeLocalDerivationGoal(
-                    drvPath, drv, wantedOutputs, *this, running, buildMode
-                );
-        },
-        [&](DerivationGoal & g) { return g.addWantedOutputs(wantedOutputs); }
-    );
+    std::weak_ptr<DerivationGoal> & goal_weak = derivationGoals[drvPath];
+    std::shared_ptr<DerivationGoal> goal = goal_weak.lock();
+    if (!goal) {
+        goal = mkDrvGoal();
+        goal_weak = goal;
+        wakeUp(goal);
+    } else {
+        goal->addWantedOutputs(wantedOutputs);
+    }
+    return goal;
 }


-std::pair<std::shared_ptr<PathSubstitutionGoal>, kj::Promise<Result<Goal::WorkResult>>>
-Worker::makePathSubstitutionGoal(
-    const StorePath & path, RepairFlag repair, std::optional<ContentAddress> ca
-)
+std::shared_ptr<DerivationGoal> Worker::makeDerivationGoal(const StorePath & drvPath,
+    const OutputsSpec & wantedOutputs, BuildMode buildMode)
 {
-    return makeGoalCommon(
-        substitutionGoals,
-        path,
-        [&] { return std::make_unique<PathSubstitutionGoal>(path, *this, running, repair, ca); },
-        [&](auto &) { return true; }
-    );
+    return makeDerivationGoalCommon(drvPath, wantedOutputs, [&]() -> std::shared_ptr<DerivationGoal> {
+        return !dynamic_cast<LocalStore *>(&store)
+            ? std::make_shared<DerivationGoal>(drvPath, wantedOutputs, *this, buildMode)
+            : LocalDerivationGoal::makeLocalDerivationGoal(drvPath, wantedOutputs, *this, buildMode);
+    });
 }


-std::pair<std::shared_ptr<DrvOutputSubstitutionGoal>, kj::Promise<Result<Goal::WorkResult>>>
-Worker::makeDrvOutputSubstitutionGoal(
-    const DrvOutput & id, RepairFlag repair, std::optional<ContentAddress> ca
-)
+std::shared_ptr<DerivationGoal> Worker::makeBasicDerivationGoal(const StorePath & drvPath,
+    const BasicDerivation & drv, const OutputsSpec & wantedOutputs, BuildMode buildMode)
 {
-    return makeGoalCommon(
-        drvOutputSubstitutionGoals,
-        id,
-        [&] { return std::make_unique<DrvOutputSubstitutionGoal>(id, *this, running, repair, ca); },
-        [&](auto &) { return true; }
-    );
+    return makeDerivationGoalCommon(drvPath, wantedOutputs, [&]() -> std::shared_ptr<DerivationGoal> {
+        return !dynamic_cast<LocalStore *>(&store)
+            ? std::make_shared<DerivationGoal>(drvPath, drv, wantedOutputs, *this, buildMode)
+            : LocalDerivationGoal::makeLocalDerivationGoal(drvPath, drv, wantedOutputs, *this, buildMode);
+    });
 }


-std::pair<GoalPtr, kj::Promise<Result<Goal::WorkResult>>> Worker::makeGoal(const DerivedPath & req, BuildMode buildMode)
+std::shared_ptr<PathSubstitutionGoal> Worker::makePathSubstitutionGoal(const StorePath & path, RepairFlag repair, std::optional<ContentAddress> ca)
+{
+    std::weak_ptr<PathSubstitutionGoal> & goal_weak = substitutionGoals[path];
+    auto goal = goal_weak.lock(); // FIXME
+    if (!goal) {
+        goal = std::make_shared<PathSubstitutionGoal>(path, *this, repair, ca);
+        goal_weak = goal;
+        wakeUp(goal);
+    }
+    return goal;
+}
+
+
+std::shared_ptr<DrvOutputSubstitutionGoal> Worker::makeDrvOutputSubstitutionGoal(const DrvOutput& id, RepairFlag repair, std::optional<ContentAddress> ca)
+{
+    std::weak_ptr<DrvOutputSubstitutionGoal> & goal_weak = drvOutputSubstitutionGoals[id];
+    auto goal = goal_weak.lock(); // FIXME
+    if (!goal) {
+        goal = std::make_shared<DrvOutputSubstitutionGoal>(id, *this, repair, ca);
+        goal_weak = goal;
+        wakeUp(goal);
+    }
+    return goal;
+}
+
+
+GoalPtr Worker::makeGoal(const DerivedPath & req, BuildMode buildMode)
 {
    return std::visit(overloaded {
-        [&](const DerivedPath::Built & bfd) -> std::pair<GoalPtr, kj::Promise<Result<Goal::WorkResult>>> {
+        [&](const DerivedPath::Built & bfd) -> GoalPtr {
            if (auto bop = std::get_if<DerivedPath::Opaque>(&*bfd.drvPath))
                return makeDerivationGoal(bop->path, bfd.outputs, buildMode);
            else
                throw UnimplementedError("Building dynamic derivations in one shot is not yet implemented.");
        },
-        [&](const DerivedPath::Opaque & bo) -> std::pair<GoalPtr, kj::Promise<Result<Goal::WorkResult>>> {
+        [&](const DerivedPath::Opaque & bo) -> GoalPtr {
            return makePathSubstitutionGoal(bo.path, buildMode == bmRepair ? Repair : NoRepair);
        },
    }, req.raw());
 }

-kj::Promise<Result<Worker::Results>> Worker::updateStatistics()
-try {
-    while (true) {
-        statisticsUpdateInhibitor = co_await statisticsUpdateSignal.acquire();

-        // only update progress info while running. this notably excludes updating
-        // progress info while destroying, which causes the progress bar to assert
-        actDerivations.progress(
-            doneBuilds, expectedBuilds + doneBuilds, runningBuilds, failedBuilds
-        );
-        actSubstitutions.progress(
-            doneSubstitutions,
-            expectedSubstitutions + doneSubstitutions,
-            runningSubstitutions,
-            failedSubstitutions
-        );
-        act.setExpected(actFileTransfer, expectedDownloadSize + doneDownloadSize);
-        act.setExpected(actCopyPath, expectedNarSize + doneNarSize);
-
-        // limit to 50fps. that should be more than good enough for anything we do
-        co_await aio.provider->getTimer().afterDelay(20 * kj::MILLISECONDS);
-    }
-} catch (...) {
-    co_return result::failure(std::current_exception());
-}
-
-Worker::Results Worker::run(std::function<Targets (GoalFactory &)> req)
+template<typename K, typename G>
+static void removeGoal(std::shared_ptr<G> goal, std::map<K, std::weak_ptr<G>> & goalMap)
 {
-    auto topGoals = req(goalFactory());
-
-    assert(!running);
-    running = true;
-    Finally const _stop([&] { running = false; });
-
-    auto onInterrupt = kj::newPromiseAndCrossThreadFulfiller<Result<Results>>();
-    auto interruptCallback = createInterruptCallback([&] {
-        return result::failure(std::make_exception_ptr(makeInterrupted()));
-    });
-
-    auto promise = runImpl(std::move(topGoals))
-                       .exclusiveJoin(updateStatistics())
-                       .exclusiveJoin(std::move(onInterrupt.promise));
-
-    // TODO GC interface?
-    if (auto localStore = dynamic_cast<LocalStore *>(&store); localStore && settings.minFree != 0u) {
-        // Periodically wake up to see if we need to run the garbage collector.
-        promise = promise.exclusiveJoin(boopGC(*localStore));
-    }
-
-    return promise.wait(aio.waitScope).value();
+    /* !!! inefficient */
+    for (auto i = goalMap.begin();
+         i != goalMap.end(); )
+        if (i->second.lock() == goal) {
+            auto j = i; ++j;
+            goalMap.erase(i);
+            i = j;
+        }
+        else ++i;
 }

-kj::Promise<Result<Worker::Results>> Worker::runImpl(Targets topGoals)
-try {
-    debug("entered goal loop");

-    kj::Vector<Targets::value_type> promises(topGoals.size());
-    for (auto & gp : topGoals) {
-        promises.add(std::move(gp));
+void Worker::goalFinished(GoalPtr goal, Goal::Finished & f)
+{
+    goal->trace("done");
+    assert(!goal->exitCode.has_value());
+    goal->exitCode = f.result;
+
+    permanentFailure |= f.permanentFailure;
+    timedOut |= f.timedOut;
+    hashMismatch |= f.hashMismatch;
+    checkMismatch |= f.checkMismatch;
+
+    if (f.ex) {
+        if (!goal->waiters.empty())
+            logError(f.ex->info());
+        else
+            goal->ex = f.ex;
    }

-    Results results;
+    for (auto & i : goal->waiters) {
+        if (GoalPtr waiting = i.lock()) {
+            assert(waiting->waitees.count(goal));
+            waiting->waitees.erase(goal);

-    auto collect = AsyncCollect(promises.releaseAsArray());
-    while (auto done = co_await collect.next()) {
-        // propagate goal exceptions outward
-        BOOST_OUTCOME_CO_TRY(auto result, done->second);
-        results.emplace(done->first, result);
+            waiting->trace(fmt("waitee '%s' done; %d left", goal->name, waiting->waitees.size()));

+            if (f.result != Goal::ecSuccess) ++waiting->nrFailed;
+            if (f.result == Goal::ecNoSubstituters) ++waiting->nrNoSubstituters;
+            if (f.result == Goal::ecIncompleteClosure) ++waiting->nrIncompleteClosure;
+
+            if (waiting->waitees.empty() || (f.result == Goal::ecFailed && !settings.keepGoing)) {
+                /* If we failed and keepGoing is not set, we remove all
+                   remaining waitees. */
+                for (auto & i : waiting->waitees) {
+                    i->waiters.extract(waiting);
+                }
+                waiting->waitees.clear();
+
+                wakeUp(waiting);
+            }
+
+            waiting->waiteeDone(goal);
+        }
+    }
+    goal->waiters.clear();
+    removeGoal(goal);
+    goal->cleanup();
+}
+
+void Worker::handleWorkResult(GoalPtr goal, Goal::WorkResult how)
+{
+    std::visit(
+        overloaded{
+            [&](Goal::StillAlive) {},
+            [&](Goal::WaitForSlot) { waitForBuildSlot(goal); },
+            [&](Goal::WaitForAWhile) { waitForAWhile(goal); },
+            [&](Goal::ContinueImmediately) { wakeUp(goal); },
+            [&](Goal::WaitForGoals & w) {
+                for (auto & dep : w.goals) {
+                    goal->waitees.insert(dep);
+                    dep->waiters.insert(goal);
+                }
+            },
+            [&](Goal::WaitForWorld & w) { childStarted(goal, w.fds, w.inBuildSlot); },
+            [&](Goal::Finished & f) { goalFinished(goal, f); },
+        },
+        how
+    );
+}
+
+void Worker::removeGoal(GoalPtr goal)
+{
+    if (auto drvGoal = std::dynamic_pointer_cast<DerivationGoal>(goal))
+        nix::removeGoal(drvGoal, derivationGoals);
+    else if (auto subGoal = std::dynamic_pointer_cast<PathSubstitutionGoal>(goal))
+        nix::removeGoal(subGoal, substitutionGoals);
+    else if (auto subGoal = std::dynamic_pointer_cast<DrvOutputSubstitutionGoal>(goal))
+        nix::removeGoal(subGoal, drvOutputSubstitutionGoals);
+    else
+        assert(false);
+
+    if (topGoals.find(goal) != topGoals.end()) {
+        topGoals.erase(goal);
        /* If a top-level goal failed, then kill all other goals
           (unless keepGoing was set). */
-        if (result.exitCode == Goal::ecFailed && !settings.keepGoing) {
-            children.clear();
+        if (goal->exitCode == Goal::ecFailed && !settings.keepGoing)
+            topGoals.clear();
+    }
+}
+
+
+void Worker::wakeUp(GoalPtr goal)
+{
+    goal->trace("woken up");
+    awake.insert(goal);
+}
+
+
+void Worker::childStarted(GoalPtr goal, const std::set<int> & fds,
+    bool inBuildSlot)
+{
+    Child child;
+    child.goal = goal;
+    child.goal2 = goal.get();
+    child.fds = fds;
+    child.timeStarted = child.lastOutput = steady_time_point::clock::now();
+    child.inBuildSlot = inBuildSlot;
+    children.emplace_back(child);
+    if (inBuildSlot) {
+        switch (goal->jobCategory()) {
+        case JobCategory::Substitution:
+            nrSubstitutions++;
            break;
+        case JobCategory::Build:
+            nrLocalBuilds++;
+            break;
+        default:
+            abort();
+        }
+    }
+}
+
+
+void Worker::childTerminated(Goal * goal)
+{
+    auto i = std::find_if(children.begin(), children.end(),
+        [&](const Child & child) { return child.goal2 == goal; });
+    if (i == children.end()) return;
+
+    if (i->inBuildSlot) {
+        switch (goal->jobCategory()) {
+        case JobCategory::Substitution:
+            assert(nrSubstitutions > 0);
+            nrSubstitutions--;
+            break;
+        case JobCategory::Build:
+            assert(nrLocalBuilds > 0);
+            nrLocalBuilds--;
+            break;
+        default:
+            abort();
+        }
+    }
+
+    children.erase(i);
+
+    /* Wake up goals waiting for a build slot. */
+    for (auto & j : wantingToBuild) {
+        GoalPtr goal = j.lock();
+        if (goal) wakeUp(goal);
+    }
+
+    wantingToBuild.clear();
+}
+
+
+void Worker::waitForBuildSlot(GoalPtr goal)
+{
+    goal->trace("wait for build slot");
+    bool isSubstitutionGoal = goal->jobCategory() == JobCategory::Substitution;
+    if ((!isSubstitutionGoal && nrLocalBuilds < settings.maxBuildJobs) ||
+        (isSubstitutionGoal && nrSubstitutions < settings.maxSubstitutionJobs))
+        wakeUp(goal); /* we can do it right away */
+    else
+        wantingToBuild.insert(goal);
+}
+
+
+void Worker::waitForAWhile(GoalPtr goal)
+{
+    debug("wait for a while");
+    waitingForAWhile.insert(goal);
+}
+
+
+void Worker::run(const Goals & _topGoals)
+{
+    std::vector<nix::DerivedPath> topPaths;
+
+    for (auto & i : _topGoals) {
+        topGoals.insert(i);
+        if (auto goal = dynamic_cast<DerivationGoal *>(i.get())) {
+            topPaths.push_back(DerivedPath::Built {
+                .drvPath = makeConstantStorePathRef(goal->drvPath),
+                .outputs = goal->wantedOutputs,
+            });
+        } else if (auto goal = dynamic_cast<PathSubstitutionGoal *>(i.get())) {
+            topPaths.push_back(DerivedPath::Opaque{goal->storePath});
+        }
+    }
+
+    /* Call queryMissing() to efficiently query substitutes. */
+    StorePathSet willBuild, willSubstitute, unknown;
+    uint64_t downloadSize, narSize;
+    store.queryMissing(topPaths, willBuild, willSubstitute, unknown, downloadSize, narSize);
+
+    debug("entered goal loop");
+
+    while (1) {
+
+        checkInterrupt();
+
+        // TODO GC interface?
+        if (auto localStore = dynamic_cast<LocalStore *>(&store))
+            localStore->autoGC(false);
+
+        /* Call every wake goal (in the ordering established by
+           CompareGoalPtrs). */
+        while (!awake.empty() && !topGoals.empty()) {
+            Goals awake2;
+            for (auto & i : awake) {
+                GoalPtr goal = i.lock();
+                if (goal) awake2.insert(goal);
+            }
+            awake.clear();
+            for (auto & goal : awake2) {
+                checkInterrupt();
+                /* Make sure that we are always allowed to run at least one substitution.
+                   This prevents infinite waiting. */
+                const bool inSlot = goal->jobCategory() == JobCategory::Substitution
+                    ? nrSubstitutions < std::max(1U, (unsigned int) settings.maxSubstitutionJobs)
+                    : nrLocalBuilds < settings.maxBuildJobs;
+                handleWorkResult(goal, goal->work(inSlot));
+
+                actDerivations.progress(
+                    doneBuilds, expectedBuilds + doneBuilds, runningBuilds, failedBuilds
+                );
+                actSubstitutions.progress(
+                    doneSubstitutions,
+                    expectedSubstitutions + doneSubstitutions,
+                    runningSubstitutions,
+                    failedSubstitutions
+                );
+                act.setExpected(actFileTransfer, expectedDownloadSize + doneDownloadSize);
+                act.setExpected(actCopyPath, expectedNarSize + doneNarSize);
+
+                if (topGoals.empty()) break; // stuff may have been cancelled
+            }
+        }
+
+        if (topGoals.empty()) break;
+
+        /* Wait for input. */
+        if (!children.empty() || !waitingForAWhile.empty())
+            waitForInput();
+        else {
+            assert(!awake.empty());
        }
    }

    /* If --keep-going is not set, it's possible that the main goal
       exited while some of its subgoals were still active.  But if
       --keep-going *is* set, then they must all be finished now. */
-    assert(!settings.keepGoing || children.isEmpty());
-
-    co_return std::move(results);
-} catch (...) {
-    co_return result::failure(std::current_exception());
+    assert(!settings.keepGoing || awake.empty());
+    assert(!settings.keepGoing || wantingToBuild.empty());
+    assert(!settings.keepGoing || children.empty());
 }

-kj::Promise<Result<Worker::Results>> Worker::boopGC(LocalStore & localStore)
-try {
-    while (true) {
-        co_await aio.provider->getTimer().afterDelay(10 * kj::SECONDS);
-        localStore.autoGC(false);
+void Worker::waitForInput()
+{
+    printMsg(lvlVomit, "waiting for children");
+
+    /* Process output from the file descriptors attached to the
+       children, namely log output and output path creation commands.
+       We also use this to detect child termination: if we get EOF on
+       the logger pipe of a build, we assume that the builder has
+       terminated. */
+
+    bool useTimeout = false;
+    long timeout = 0;
+    auto before = steady_time_point::clock::now();
+
+    /* If we're monitoring for silence on stdout/stderr, or if there
+       is a build timeout, then wait for input until the first
+       deadline for any child. */
+    auto nearest = steady_time_point::max(); // nearest deadline
+    if (settings.minFree.get() != 0)
+        // Periodicallty wake up to see if we need to run the garbage collector.
+        nearest = before + std::chrono::seconds(10);
+    for (auto & i : children) {
+        if (auto goal = i.goal.lock()) {
+            if (!goal->respectsTimeouts()) continue;
+            if (0 != settings.maxSilentTime)
+                nearest = std::min(nearest, i.lastOutput + std::chrono::seconds(settings.maxSilentTime));
+            if (0 != settings.buildTimeout)
+                nearest = std::min(nearest, i.timeStarted + std::chrono::seconds(settings.buildTimeout));
+        }
+    }
+    if (nearest != steady_time_point::max()) {
+        timeout = std::max(1L, (long) std::chrono::duration_cast<std::chrono::seconds>(nearest - before).count());
+        useTimeout = true;
+    }
+
+    /* If we are polling goals that are waiting for a lock, then wake
+       up after a few seconds at most. */
+    if (!waitingForAWhile.empty()) {
+        useTimeout = true;
+        if (lastWokenUp == steady_time_point::min() || lastWokenUp > before) lastWokenUp = before;
+        timeout = std::max(1L,
+            (long) std::chrono::duration_cast<std::chrono::seconds>(
+                lastWokenUp + std::chrono::seconds(settings.pollInterval) - before).count());
+    } else lastWokenUp = steady_time_point::min();
+
+    if (useTimeout)
+        vomit("sleeping %d seconds", timeout);
+
+    /* Use select() to wait for the input side of any logger pipe to
+       become `available'.  Note that `available' (i.e., non-blocking)
+       includes EOF. */
+    std::vector<struct pollfd> pollStatus;
+    std::map<int, size_t> fdToPollStatus;
+    for (auto & i : children) {
+        for (auto & j : i.fds) {
+            pollStatus.push_back((struct pollfd) { .fd = j, .events = POLLIN });
+            fdToPollStatus[j] = pollStatus.size() - 1;
+        }
+    }
+
+    if (poll(pollStatus.data(), pollStatus.size(),
+            useTimeout ? timeout * 1000 : -1) == -1) {
+        if (errno == EINTR) return;
+        throw SysError("waiting for input");
+    }
+
+    auto after = steady_time_point::clock::now();
+
+    /* Process all available file descriptors. FIXME: this is
+       O(children * fds). */
+    decltype(children)::iterator i;
+    for (auto j = children.begin(); j != children.end(); j = i) {
+        i = std::next(j);
+
+        checkInterrupt();
+
+        GoalPtr goal = j->goal.lock();
+        assert(goal);
+
+        if (!goal->exitCode.has_value() &&
+            0 != settings.maxSilentTime &&
+            goal->respectsTimeouts() &&
+            after - j->lastOutput >= std::chrono::seconds(settings.maxSilentTime))
+        {
+            handleWorkResult(
+                goal,
+                goal->timedOut(Error(
+                    "%1% timed out after %2% seconds of silence",
+                    goal->getName(),
+                    settings.maxSilentTime
+                ))
+            );
+            continue;
+        }
+
+        else if (!goal->exitCode.has_value() &&
+            0 != settings.buildTimeout &&
+            goal->respectsTimeouts() &&
+            after - j->timeStarted >= std::chrono::seconds(settings.buildTimeout))
+        {
+            handleWorkResult(
+                goal,
+                goal->timedOut(
+                    Error("%1% timed out after %2% seconds", goal->getName(), settings.buildTimeout)
+                )
+            );
+            continue;
+        }
+
+        std::set<int> fds2(j->fds);
+        std::vector<unsigned char> buffer(4096);
+        for (auto & k : fds2) {
+            const auto fdPollStatusId = get(fdToPollStatus, k);
+            assert(fdPollStatusId);
+            assert(*fdPollStatusId < pollStatus.size());
+            if (pollStatus.at(*fdPollStatusId).revents) {
+                ssize_t rd = ::read(k, buffer.data(), buffer.size());
+                // FIXME: is there a cleaner way to handle pt close
+                // than EIO? Is this even standard?
+                if (rd == 0 || (rd == -1 && errno == EIO)) {
+                    debug("%1%: got EOF", goal->getName());
+                    goal->handleEOF(k);
+                    handleWorkResult(goal, Goal::ContinueImmediately{});
+                    j->fds.erase(k);
+                } else if (rd == -1) {
+                    if (errno != EINTR)
+                        throw SysError("%s: read failed", goal->getName());
+                } else {
+                    printMsg(lvlVomit, "%1%: read %2% bytes",
+                        goal->getName(), rd);
+                    std::string_view data(charptr_cast<char *>(buffer.data()), rd);
+                    j->lastOutput = after;
+                    handleWorkResult(goal, goal->handleChildOutput(k, data));
+                }
+            }
+        }
+    }
+
+    if (!waitingForAWhile.empty() && lastWokenUp + std::chrono::seconds(settings.pollInterval) <= after) {
+        lastWokenUp = after;
+        for (auto & i : waitingForAWhile) {
+            GoalPtr goal = i.lock();
+            if (goal) wakeUp(goal);
+        }
+        waitingForAWhile.clear();
    }
-} catch (...) {
-    co_return result::failure(std::current_exception());
 }


--- a/src/libstore/build/worker.hh
+++ b/src/libstore/build/worker.hh
@ -1,9 +1,6 @@
 #pragma once
 ///@file

-#include "async-semaphore.hh"
-#include "concepts.hh"
-#include "notifying-counter.hh"
 #include "types.hh"
 #include "lock.hh"
 #include "store-api.hh"
@ -11,7 +8,6 @@
 #include "realisation.hh"

 #include <future>
-#include <kj/async-io.h>
 #include <thread>

 namespace nix {
@ -20,91 +16,88 @@ namespace nix {
 struct DerivationGoal;
 struct PathSubstitutionGoal;
 class DrvOutputSubstitutionGoal;
-class LocalStore;

 typedef std::chrono::time_point<std::chrono::steady_clock> steady_time_point;

+/**
+ * A mapping used to remember for each child process to what goal it
+ * belongs, and file descriptors for receiving log data and output
+ * path creation commands.
+ */
+struct Child
+{
+    WeakGoalPtr goal;
+    Goal * goal2; // ugly hackery
+    std::set<int> fds;
+    bool inBuildSlot;
+    /**
+     * Time we last got output on stdout/stderr
+     */
+    steady_time_point lastOutput;
+    steady_time_point timeStarted;
+};
+
 /* Forward definition. */
 struct HookInstance;

-class GoalFactory
-{
-public:
-    virtual std::pair<std::shared_ptr<DerivationGoal>, kj::Promise<Result<Goal::WorkResult>>>
-    makeDerivationGoal(
-        const StorePath & drvPath, const OutputsSpec & wantedOutputs, BuildMode buildMode = bmNormal
-    ) = 0;
-    virtual std::pair<std::shared_ptr<DerivationGoal>, kj::Promise<Result<Goal::WorkResult>>>
-    makeBasicDerivationGoal(
-        const StorePath & drvPath,
-        const BasicDerivation & drv,
-        const OutputsSpec & wantedOutputs,
-        BuildMode buildMode = bmNormal
-    ) = 0;
-
-    /**
-     * @ref SubstitutionGoal "substitution goal"
-     */
-    virtual std::pair<std::shared_ptr<PathSubstitutionGoal>, kj::Promise<Result<Goal::WorkResult>>>
-    makePathSubstitutionGoal(
-        const StorePath & storePath,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt
-    ) = 0;
-    virtual std::pair<std::shared_ptr<DrvOutputSubstitutionGoal>, kj::Promise<Result<Goal::WorkResult>>>
-    makeDrvOutputSubstitutionGoal(
-        const DrvOutput & id,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt
-    ) = 0;
-
-    /**
-     * Make a goal corresponding to the `DerivedPath`.
-     *
-     * It will be a `DerivationGoal` for a `DerivedPath::Built` or
-     * a `SubstitutionGoal` for a `DerivedPath::Opaque`.
-     */
-    virtual std::pair<GoalPtr, kj::Promise<Result<Goal::WorkResult>>>
-    makeGoal(const DerivedPath & req, BuildMode buildMode = bmNormal) = 0;
-};
-
-// elaborate hoax to let goals access factory methods while hiding them from the public
-class WorkerBase : protected GoalFactory
-{
-    friend struct DerivationGoal;
-    friend struct PathSubstitutionGoal;
-    friend class DrvOutputSubstitutionGoal;
-
-protected:
-    GoalFactory & goalFactory() { return *this; }
-};
-
 /**
 * The worker class.
 */
-class Worker : public WorkerBase
+class Worker
 {
-public:
-    using Targets = std::map<GoalPtr, kj::Promise<Result<Goal::WorkResult>>>;
-    using Results = std::map<GoalPtr, Goal::WorkResult>;
-
 private:

-    bool running = false;
+    /* Note: the worker should only have strong pointers to the
+       top-level goals. */
+
+    /**
+     * The top-level goals of the worker.
+     */
+    Goals topGoals;
+
+    /**
+     * Goals that are ready to do some work.
+     */
+    WeakGoals awake;
+
+    /**
+     * Goals waiting for a build slot.
+     */
+    WeakGoals wantingToBuild;
+
+    /**
+     * Child processes currently running.
+     */
+    std::list<Child> children;
+
+    /**
+     * Number of build slots occupied.  This includes local builds but does not
+     * include substitutions or remote builds via the build hook.
+     */
+    unsigned int nrLocalBuilds;
+
+    /**
+     * Number of substitution slots occupied.
+     */
+    unsigned int nrSubstitutions;

-    template<typename G>
-    struct CachedGoal
-    {
-        std::shared_ptr<G> goal;
-        kj::ForkedPromise<Result<Goal::WorkResult>> promise{nullptr};
-    };
    /**
     * Maps used to prevent multiple instantiations of a goal for the
     * same derivation / path.
     */
-    std::map<StorePath, CachedGoal<DerivationGoal>> derivationGoals;
-    std::map<StorePath, CachedGoal<PathSubstitutionGoal>> substitutionGoals;
-    std::map<DrvOutput, CachedGoal<DrvOutputSubstitutionGoal>> drvOutputSubstitutionGoals;
+    std::map<StorePath, std::weak_ptr<DerivationGoal>> derivationGoals;
+    std::map<StorePath, std::weak_ptr<PathSubstitutionGoal>> substitutionGoals;
+    std::map<DrvOutput, std::weak_ptr<DrvOutputSubstitutionGoal>> drvOutputSubstitutionGoals;
+
+    /**
+     * Goals sleeping for a few seconds (polling a lock).
+     */
+    WeakGoals waitingForAWhile;
+
+    /**
+     * Last time the goals in `waitingForAWhile` where woken up.
+     */
+    steady_time_point lastWokenUp;

    /**
     * Cache for pathContentsGood().
@ -132,24 +125,44 @@ private:
     */
    bool checkMismatch = false;

-    /**
-      * Pass current stats counters to the logger for progress bar updates.
-      */
-    kj::Promise<Result<Results>> updateStatistics();
-
-    AsyncSemaphore statisticsUpdateSignal{1};
-    std::optional<AsyncSemaphore::Token> statisticsUpdateInhibitor;
+    void goalFinished(GoalPtr goal, Goal::Finished & f);
+    void handleWorkResult(GoalPtr goal, Goal::WorkResult how);

    /**
-      * Mark statistics as outdated, such that `updateStatistics` will be called.
-      */
-    void updateStatisticsLater()
-    {
-        statisticsUpdateInhibitor = {};
-    }
+     * Put `goal` to sleep until a build slot becomes available (which
+     * might be right away).
+     */
+    void waitForBuildSlot(GoalPtr goal);

-    kj::Promise<Result<Results>> runImpl(Targets topGoals);
-    kj::Promise<Result<Results>> boopGC(LocalStore & localStore);
+    /**
+     * Wait for a few seconds and then retry this goal.  Used when
+     * waiting for a lock held by another process.  This kind of
+     * polling is inefficient, but POSIX doesn't really provide a way
+     * to wait for multiple locks in the main select() loop.
+     */
+    void waitForAWhile(GoalPtr goal);
+
+    /**
+     * Wake up a goal (i.e., there is something for it to do).
+     */
+    void wakeUp(GoalPtr goal);
+
+    /**
+     * Wait for input to become available.
+     */
+    void waitForInput();
+
+    /**
+     * Remove a dead goal.
+     */
+    void removeGoal(GoalPtr goal);
+
+    /**
+     * Registers a running child process.  `inBuildSlot` means that
+     * the process counts towards the jobs limit.
+     */
+    void childStarted(GoalPtr goal, const std::set<int> & fds,
+        bool inBuildSlot);

 public:

@ -159,13 +172,7 @@ public:

    Store & store;
    Store & evalStore;
-    kj::AsyncIoContext & aio;
-    AsyncSemaphore substitutions, localBuilds;

-private:
-    kj::TaskSet children;
-
-public:
    struct HookState {
        std::unique_ptr<HookInstance> instance;

@ -178,21 +185,21 @@ public:

    HookState hook;

-    NotifyingCounter<uint64_t> expectedBuilds{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> doneBuilds{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> failedBuilds{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> runningBuilds{[this] { updateStatisticsLater(); }};
+    uint64_t expectedBuilds = 0;
+    uint64_t doneBuilds = 0;
+    uint64_t failedBuilds = 0;
+    uint64_t runningBuilds = 0;

-    NotifyingCounter<uint64_t> expectedSubstitutions{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> doneSubstitutions{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> failedSubstitutions{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> runningSubstitutions{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> expectedDownloadSize{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> doneDownloadSize{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> expectedNarSize{[this] { updateStatisticsLater(); }};
-    NotifyingCounter<uint64_t> doneNarSize{[this] { updateStatisticsLater(); }};
+    uint64_t expectedSubstitutions = 0;
+    uint64_t doneSubstitutions = 0;
+    uint64_t failedSubstitutions = 0;
+    uint64_t runningSubstitutions = 0;
+    uint64_t expectedDownloadSize = 0;
+    uint64_t doneDownloadSize = 0;
+    uint64_t expectedNarSize = 0;
+    uint64_t doneNarSize = 0;

-    Worker(Store & store, Store & evalStore, kj::AsyncIoContext & aio);
+    Worker(Store & store, Store & evalStore);
    ~Worker();

    /**
@ -203,35 +210,22 @@ public:
     * @ref DerivationGoal "derivation goal"
     */
 private:
-    template<typename ID, std::derived_from<Goal> G>
-    std::pair<std::shared_ptr<G>, kj::Promise<Result<Goal::WorkResult>>> makeGoalCommon(
-        std::map<ID, CachedGoal<G>> & map,
-        const ID & key,
-        InvocableR<std::unique_ptr<G>> auto create,
-        InvocableR<bool, G &> auto modify
-    );
-    std::pair<std::shared_ptr<DerivationGoal>, kj::Promise<Result<Goal::WorkResult>>> makeDerivationGoal(
+    std::shared_ptr<DerivationGoal> makeDerivationGoalCommon(
+        const StorePath & drvPath, const OutputsSpec & wantedOutputs,
+        std::function<std::shared_ptr<DerivationGoal>()> mkDrvGoal);
+public:
+    std::shared_ptr<DerivationGoal> makeDerivationGoal(
        const StorePath & drvPath,
-        const OutputsSpec & wantedOutputs, BuildMode buildMode = bmNormal) override;
-    std::pair<std::shared_ptr<DerivationGoal>, kj::Promise<Result<Goal::WorkResult>>> makeBasicDerivationGoal(
+        const OutputsSpec & wantedOutputs, BuildMode buildMode = bmNormal);
+    std::shared_ptr<DerivationGoal> makeBasicDerivationGoal(
        const StorePath & drvPath, const BasicDerivation & drv,
-        const OutputsSpec & wantedOutputs, BuildMode buildMode = bmNormal) override;
+        const OutputsSpec & wantedOutputs, BuildMode buildMode = bmNormal);

    /**
     * @ref SubstitutionGoal "substitution goal"
     */
-    std::pair<std::shared_ptr<PathSubstitutionGoal>, kj::Promise<Result<Goal::WorkResult>>>
-    makePathSubstitutionGoal(
-        const StorePath & storePath,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt
-    ) override;
-    std::pair<std::shared_ptr<DrvOutputSubstitutionGoal>, kj::Promise<Result<Goal::WorkResult>>>
-    makeDrvOutputSubstitutionGoal(
-        const DrvOutput & id,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt
-    ) override;
+    std::shared_ptr<PathSubstitutionGoal> makePathSubstitutionGoal(const StorePath & storePath, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);
+    std::shared_ptr<DrvOutputSubstitutionGoal> makeDrvOutputSubstitutionGoal(const DrvOutput & id, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);

    /**
     * Make a goal corresponding to the `DerivedPath`.
@ -239,14 +233,17 @@ private:
     * It will be a `DerivationGoal` for a `DerivedPath::Built` or
     * a `SubstitutionGoal` for a `DerivedPath::Opaque`.
     */
-    std::pair<GoalPtr, kj::Promise<Result<Goal::WorkResult>>>
-    makeGoal(const DerivedPath & req, BuildMode buildMode = bmNormal) override;
+    GoalPtr makeGoal(const DerivedPath & req, BuildMode buildMode = bmNormal);
+
+    /**
+     * Unregisters a running child process.
+     */
+    void childTerminated(Goal * goal);

-public:
    /**
     * Loop until the specified top-level goals have finished.
     */
-    Results run(std::function<Targets (GoalFactory &)> req);
+    void run(const Goals & topGoals);

    /***
     * The exit status in case of failure.
--- a/src/libstore/builtins.hh
+++ b/src/libstore/builtins.hh
@ -6,7 +6,7 @@
 namespace nix {

 // TODO: make pluggable.
-void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData, const std::string & caFileData);
+void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData);
 void builtinUnpackChannel(const BasicDerivation & drv);

 }
--- a/src/libstore/builtins/buildenv.cc
+++ b/src/libstore/builtins/buildenv.cc
@ -1,5 +1,4 @@
 #include "buildenv.hh"
-#include "strings.hh"

 #include <sys/stat.h>
 #include <sys/types.h>
--- a/src/libstore/builtins/fetchurl.cc
+++ b/src/libstore/builtins/fetchurl.cc
@ -3,11 +3,10 @@
 #include "store-api.hh"
 #include "archive.hh"
 #include "compression.hh"
-#include "strings.hh"

 namespace nix {

-void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData, const std::string & caFileData)
+void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData)
 {
    /* Make the host's netrc data available. Too bad curl requires
       this to be stored in a file. It would be nice if we could just
@ -17,9 +16,6 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData,
        writeFile(settings.netrcFile, netrcData, 0600);
    }

-    settings.caFile = "ca-certificates.crt";
-    writeFile(settings.caFile, caFileData, 0600);
-
    auto getAttr = [&](const std::string & name) {
        auto i = drv.env.find(name);
        if (i == drv.env.end()) throw Error("attribute '%s' missing", name);
@ -36,7 +32,10 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData,

    auto fetch = [&](const std::string & url) {

+        /* No need to do TLS verification, because we check the hash of
+           the result anyway. */
        FileTransferRequest request(url);
+        request.verifyTLS = false;

        auto raw = fileTransfer->download(std::move(request));
        auto decompressor = makeDecompressionSource(
--- a/src/libstore/common-protocol-impl.hh
+++ b/src/libstore/common-protocol-impl.hh
@ -20,7 +20,6 @@ namespace nix {
    { \
        return LengthPrefixedProtoHelper<CommonProto, T >::read(store, conn); \
    } \
-    /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
    TEMPLATE [[nodiscard]] WireFormatGenerator CommonProto::Serialise< T >::write(const Store & store, CommonProto::WriteConn conn, const T & t) \
    { \
        return LengthPrefixedProtoHelper<CommonProto, T >::write(store, conn, t); \
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@ -1,7 +1,6 @@
 #include "args.hh"
 #include "content-address.hh"
 #include "split.hh"
-#include "strings.hh"

 namespace nix {

--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@ -2,7 +2,7 @@
 #include "monitor-fd.hh"
 #include "worker-protocol.hh"
 #include "worker-protocol-impl.hh"
-#include "build-result.hh" // IWYU pragma: keep
+#include "build-result.hh"
 #include "store-api.hh"
 #include "store-cast.hh"
 #include "gc-store.hh"
@ -12,7 +12,6 @@
 #include "finally.hh"
 #include "archive.hh"
 #include "derivations.hh"
-#include "strings.hh"
 #include "args.hh"

 #include <sstream>
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@ -3,12 +3,11 @@
 #include "store-api.hh"
 #include "globals.hh"
 #include "types.hh"
+#include "split.hh"
 #include "common-protocol.hh"
 #include "common-protocol-impl.hh"
+#include "fs-accessor.hh"
 #include "json-utils.hh"
-#include "strings.hh"
-#include "backed-string-view.hh"
-
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>

--- a/src/libstore/derived-path.hh
+++ b/src/libstore/derived-path.hh
@ -5,7 +5,6 @@
 #include "path.hh"
 #include "outputs-spec.hh"
 #include "comparator.hh"
-#include "ref.hh"

 #include <variant>

@ -79,12 +78,10 @@ struct SingleDerivedPathBuilt {
    DECLARE_CMP(SingleDerivedPathBuilt);
 };

-namespace derived_path::detail {
-using SingleDerivedPathRaw = std::variant<
+using _SingleDerivedPathRaw = std::variant<
    DerivedPathOpaque,
    SingleDerivedPathBuilt
 >;
-}

 /**
 * A "derived path" is a very simple sort of expression (not a Nix
@ -97,8 +94,8 @@ using SingleDerivedPathRaw = std::variant<
 * - built, in which case it is a pair of a derivation path and an
 *   output name.
 */
-struct SingleDerivedPath : derived_path::detail::SingleDerivedPathRaw {
-    using Raw = derived_path::detail::SingleDerivedPathRaw;
+struct SingleDerivedPath : _SingleDerivedPathRaw {
+    using Raw = _SingleDerivedPathRaw;
    using Raw::Raw;

    using Opaque = DerivedPathOpaque;
@ -204,12 +201,10 @@ struct DerivedPathBuilt {
    DECLARE_CMP(DerivedPathBuilt);
 };

-namespace derived_path::detail {
-using DerivedPathRaw = std::variant<
+using _DerivedPathRaw = std::variant<
    DerivedPathOpaque,
    DerivedPathBuilt
 >;
-}

 /**
 * A "derived path" is a very simple sort of expression that evaluates
@ -221,8 +216,8 @@ using DerivedPathRaw = std::variant<
 * - built, in which case it is a pair of a derivation path and some
 *   output names.
 */
-struct DerivedPath : derived_path::detail::DerivedPathRaw {
-    using Raw = derived_path::detail::DerivedPathRaw;
+struct DerivedPath : _DerivedPathRaw {
+    using Raw = _DerivedPathRaw;
    using Raw::Raw;

    using Opaque = DerivedPathOpaque;
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@ -1,4 +1,3 @@
-#include "dummy-store.hh"
 #include "store-api.hh"

 namespace nix {
@ -74,8 +73,6 @@ struct DummyStore : public virtual DummyStoreConfig, public virtual Store
    { unsupported("getFSAccessor"); }
 };

-void registerDummyStore() {
-    StoreImplementations::add<DummyStore, DummyStoreConfig>();
-}
+static RegisterStoreImplementation<DummyStore, DummyStoreConfig> regDummyStore;

 }
--- a/src/libstore/dummy-store.hh
+++ b/src/libstore/dummy-store.hh
@ -1,8 +0,0 @@
-#pragma once
-///@file
-
-namespace nix {
-
-void registerDummyStore();
-
-}
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@ -5,8 +5,6 @@
 #include "s3.hh"
 #include "signals.hh"
 #include "compression.hh"
-#include "strings.hh"
-#include <cstddef>

 #if ENABLE_S3
 #include <aws/core/client/ClientConfiguration.h>
@ -116,7 +114,7 @@ struct curlFileTransfer : public FileTransfer
                if (!done)
                    fail(FileTransferError(Interrupted, {}, "download of '%s' was interrupted", request.uri));
            } catch (...) {
-                ignoreExceptionInDestructor();
+                ignoreException();
            }
        }

@ -338,7 +336,7 @@ struct curlFileTransfer : public FileTransfer
            // wrapping user `callback`s instead is not possible because the
            // Callback api expects std::functions, and copying Callbacks is
            // not possible due the promises they hold.
-            if (code == CURLE_OK && !dataCallback && result.data.length() > 0) {
+            if (code == CURLE_OK && !dataCallback) {
                result.data = decompress(encoding, result.data);
            }

@ -785,10 +783,8 @@ struct curlFileTransfer : public FileTransfer

            size_t read(char * data, size_t len) override
            {
-                auto readPartial = [this](char * data, size_t len) -> size_t {
+                auto readPartial = [this](char * data, size_t len) {
                    const auto available = std::min(len, buffered.size());
-                    if (available == 0u) return 0u;
-
                    memcpy(data, buffered.data(), available);
                    buffered.remove_prefix(available);
                    return available;
--- a/src/libstore/filetransfer.hh
+++ b/src/libstore/filetransfer.hh
@ -2,7 +2,6 @@
 ///@file

 #include "box_ptr.hh"
-#include "ref.hh"
 #include "logging.hh"
 #include "serialise.hh"
 #include "types.hh"
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@ -5,7 +5,6 @@
 #include "signals.hh"
 #include "finally.hh"
 #include "unix-domain-socket.hh"
-#include "strings.hh"

 #include <queue>
 #include <regex>
@ -923,8 +922,8 @@ void LocalStore::autoGC(bool sync)

            } catch (...) {
                // FIXME: we could propagate the exception to the
-                // future, but we don't really care. (what??)
-                ignoreExceptionInDestructor();
+                // future, but we don't really care.
+                ignoreException();
            }

        }).detach();
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@ -33,16 +33,6 @@
 #include <sys/sysctl.h>
 #endif

-// All built-in store implementations.
-#include "dummy-store.hh"
-#include "http-binary-cache-store.hh"
-#include "legacy-ssh-store.hh"
-#include "local-binary-cache-store.hh"
-#include "local-store.hh"
-#include "s3-binary-cache-store.hh"
-#include "ssh-store.hh"
-#include "uds-remote-store.hh"
-
 namespace nix {


@ -126,30 +116,29 @@ Settings::Settings()

 void loadConfFile()
 {
-    auto applyConfigFile = [&](const ApplyConfigOptions & options) {
+    auto applyConfigFile = [&](const Path & path) {
        try {
-            std::string contents = readFile(*options.path);
-            globalConfig.applyConfig(contents, options);
-        } catch (SysError &) {
-        }
+            std::string contents = readFile(path);
+            globalConfig.applyConfig(contents, path);
+        } catch (SysError &) { }
    };

-    applyConfigFile(ApplyConfigOptions{.path = settings.nixConfDir + "/nix.conf"});
+    applyConfigFile(settings.nixConfDir + "/nix.conf");

    /* We only want to send overrides to the daemon, i.e. stuff from
       ~/.nix/nix.conf or the command line. */
    globalConfig.resetOverridden();

    auto files = settings.nixUserConfFiles;
-    auto home = getHome();
    for (auto file = files.rbegin(); file != files.rend(); file++) {
-        applyConfigFile(ApplyConfigOptions{.path = *file, .home = home});
+        applyConfigFile(*file);
    }

    auto nixConfEnv = getEnv("NIX_CONFIG");
    if (nixConfEnv.has_value()) {
-        globalConfig.applyConfig(nixConfEnv.value(), ApplyConfigOptions{.fromEnvVar = true});
+        globalConfig.applyConfig(nixConfEnv.value(), "NIX_CONFIG");
    }
+
 }

 std::vector<Path> getUserConfigFiles()
@ -269,33 +258,13 @@ Path Settings::getDefaultSSLCertFile()

 const std::string nixVersion = PACKAGE_VERSION;

-void to_json(nlohmann::json & j, const SandboxMode & e)
-{
-    if (e == SandboxMode::smEnabled) {
-        j = true;
-    } else if (e == SandboxMode::smRelaxed) {
-        j = "relaxed";
-    } else if (e == SandboxMode::smDisabled) {
-        j = false;
-    } else {
-        abort();
-    }
-}
+NLOHMANN_JSON_SERIALIZE_ENUM(SandboxMode, {
+    {SandboxMode::smEnabled, true},
+    {SandboxMode::smRelaxed, "relaxed"},
+    {SandboxMode::smDisabled, false},
+});

-void from_json(const nlohmann::json & j, SandboxMode & e)
-{
-    if (j == true) {
-        e = SandboxMode::smEnabled;
-    } else if (j == "relaxed") {
-        e = SandboxMode::smRelaxed;
-    } else if (j == false) {
-        e = SandboxMode::smDisabled;
-    } else {
-        throw Error("Invalid sandbox mode '%s'", std::string(j));
-    }
-}
-
-template<> SandboxMode BaseSetting<SandboxMode>::parse(const std::string & str, const ApplyConfigOptions & options) const
+template<> SandboxMode BaseSetting<SandboxMode>::parse(const std::string & str) const
 {
    if (str == "true") return smEnabled;
    else if (str == "relaxed") return smRelaxed;
@ -338,7 +307,7 @@ template<> void BaseSetting<SandboxMode>::convertToArg(Args & args, const std::s
    });
 }

-unsigned int MaxBuildJobsSetting::parse(const std::string & str, const ApplyConfigOptions & options) const
+unsigned int MaxBuildJobsSetting::parse(const std::string & str) const
 {
    if (str == "auto") return std::max(1U, std::thread::hardware_concurrency());
    else {
@ -346,15 +315,15 @@ unsigned int MaxBuildJobsSetting::parse(const std::string & str, const ApplyConf
            return *n;
        else
            throw UsageError("configuration setting '%s' should be 'auto' or an integer", name);
-        }
    }
+}


-Paths PluginFilesSetting::parse(const std::string & str, const ApplyConfigOptions & options) const
+Paths PluginFilesSetting::parse(const std::string & str) const
 {
    if (pluginsLoaded)
        throw UsageError("plugin-files set after plugins were loaded, you may need to move the flag before the subcommand");
-    return BaseSetting<Paths>::parse(str, options);
+    return BaseSetting<Paths>::parse(str);
 }


@ -427,23 +396,12 @@ static void preloadNSS()
    });
 }

-static void registerStoreImplementations() {
-  registerDummyStore();
-  registerHttpBinaryCacheStore();
-  registerLegacySSHStore();
-  registerLocalBinaryCacheStore();
-  registerLocalStore();
-  registerS3BinaryCacheStore();
-  registerSSHStore();
-  registerUDSRemoteStore();
-}
-
 static bool initLibStoreDone = false;

 void assertLibStoreInitialized() {
    if (!initLibStoreDone) {
        printError("The program must call nix::initNix() before calling any libstore library functions.");
-        std::terminate();
+        abort();
    };
 }

@ -475,8 +433,6 @@ void initLibStore() {
        unsetenv("TMPDIR");
 #endif

-    registerStoreImplementations();
-
    initLibStoreDone = true;
 }

--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@ -14,9 +14,6 @@ namespace nix {

 typedef enum { smEnabled, smRelaxed, smDisabled } SandboxMode;

-void to_json(nlohmann::json & j, const SandboxMode & e);
-void from_json(const nlohmann::json & j, SandboxMode & e);
-
 struct MaxBuildJobsSetting : public BaseSetting<unsigned int>
 {
    MaxBuildJobsSetting(Config * options,
@ -29,7 +26,7 @@ struct MaxBuildJobsSetting : public BaseSetting<unsigned int>
        options->addSetting(this);
    }

-    unsigned int parse(const std::string & str, const ApplyConfigOptions & options) const override;
+    unsigned int parse(const std::string & str) const override;
 };

 struct PluginFilesSetting : public BaseSetting<Paths>
@ -46,7 +43,7 @@ struct PluginFilesSetting : public BaseSetting<Paths>
        options->addSetting(this);
    }

-    Paths parse(const std::string & str, const ApplyConfigOptions & options) const override;
+    Paths parse(const std::string & str) const override;
 };

 const uint32_t maxIdsPerBuild =
@ -640,10 +637,10 @@ public:
    PathsSetting<std::optional<Path>> diffHook{
        this, std::nullopt, "diff-hook",
        R"(
-          Path to an executable capable of diffing build results. The hook is
-          executed if `run-diff-hook` is true, and the output of a build is
-          known to not be the same. This program is not executed to determine
-          if two results are the same.
+          Absolute path to an executable capable of diffing build
+          results. The hook is executed if `run-diff-hook` is true, and the
+          output of a build is known to not be the same. This program is not
+          executed to determine if two results are the same.

          The diff hook is executed by the same user and group who ran the
          build. However, the diff hook does not have write access to the
@ -1091,7 +1088,6 @@ void loadConfFile();

 // Used by the Settings constructor
 std::vector<Path> getUserConfigFiles();
-std::vector<Path> getHomeConfigFile();

 extern const std::string nixVersion;

--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@ -1,4 +1,3 @@
-#include "http-binary-cache-store.hh"
 #include "binary-cache-store.hh"
 #include "filetransfer.hh"
 #include "globals.hh"
@ -195,8 +194,6 @@ protected:
    }
 };

-void registerHttpBinaryCacheStore() {
-    StoreImplementations::add<HttpBinaryCacheStore, HttpBinaryCacheStoreConfig>();
-}
+static RegisterStoreImplementation<HttpBinaryCacheStore, HttpBinaryCacheStoreConfig> regHttpBinaryCacheStore;

 }
--- a/src/libstore/http-binary-cache-store.hh
+++ b/src/libstore/http-binary-cache-store.hh
@ -1,8 +0,0 @@
-#pragma once
-///@file
-
-namespace nix {
-
-void registerHttpBinaryCacheStore();
-
-}
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@ -1,4 +1,4 @@
-#include "legacy-ssh-store.hh"
+#include "ssh-store-config.hh"
 #include "archive.hh"
 #include "pool.hh"
 #include "remote-store.hh"
@ -8,8 +8,6 @@
 #include "store-api.hh"
 #include "path-with-outputs.hh"
 #include "ssh.hh"
-#include "ssh-store.hh"
-#include "strings.hh"
 #include "derivations.hh"

 namespace nix {
@ -414,8 +412,6 @@ public:
    { unsupported("queryRealisation"); }
 };

-void registerLegacySSHStore() {
-    StoreImplementations::add<LegacySSHStore, LegacySSHStoreConfig>();
-}
+static RegisterStoreImplementation<LegacySSHStore, LegacySSHStoreConfig> regLegacySSHStore;

 }
--- a/src/libstore/legacy-ssh-store.hh
+++ b/src/libstore/legacy-ssh-store.hh
@ -1,8 +0,0 @@
-#pragma once
-///@file
-
-namespace nix {
-
-void registerLegacySSHStore();
-
-}
--- a/src/libstore/length-prefixed-protocol-helper.hh
+++ b/src/libstore/length-prefixed-protocol-helper.hh
@ -61,9 +61,9 @@ template<class Inner, typename... Ts>
 LENGTH_PREFIXED_PROTO_HELPER(Inner, std::tuple<Ts...>);

 template<class Inner, typename K, typename V>
-#define DONT_SUBSTITUTE_KV_TYPE std::map<K, V>
-LENGTH_PREFIXED_PROTO_HELPER(Inner, DONT_SUBSTITUTE_KV_TYPE);
-#undef DONT_SUBSTITUTE_KV_TYPE
+#define _X std::map<K, V>
+LENGTH_PREFIXED_PROTO_HELPER(Inner, _X);
+#undef _X

 template<class Inner, typename T>
 std::vector<T>
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@ -1,4 +1,3 @@
-#include "local-binary-cache-store.hh"
 #include "binary-cache-store.hh"
 #include "globals.hh"
 #include "nar-info-disk-cache.hh"
@ -125,8 +124,6 @@ std::set<std::string> LocalBinaryCacheStore::uriSchemes()
        return {"file"};
 }

-void registerLocalBinaryCacheStore() {
-    StoreImplementations::add<LocalBinaryCacheStore, LocalBinaryCacheStoreConfig>();
-}
+static RegisterStoreImplementation<LocalBinaryCacheStore, LocalBinaryCacheStoreConfig> regLocalBinaryCacheStore;

 }
--- a/src/libstore/local-binary-cache-store.hh
+++ b/src/libstore/local-binary-cache-store.hh
@ -1,8 +0,0 @@
-#pragma once
-///@file
-
-namespace nix {
-
-void registerLocalBinaryCacheStore();
-
-}
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@ -10,7 +10,6 @@
 #include "signals.hh"
 #include "finally.hh"
 #include "compression.hh"
-#include "strings.hh"

 #include <algorithm>
 #include <cstring>
@ -481,7 +480,7 @@ LocalStore::~LocalStore()
            unlink(fnTempRoots.c_str());
        }
    } catch (...) {
-        ignoreExceptionInDestructor();
+        ignoreException();
    }
 }

@ -664,20 +663,6 @@ static void canonicalisePathMetaData_(
    if (!(S_ISREG(st.st_mode) || S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode)))
        throw Error("file '%1%' has an unsupported type", path);

-    /* Fail if the file is not owned by the build user.  This prevents
-       us from messing up the ownership/permissions of files
-       hard-linked into the output (e.g. "ln /etc/shadow $out/foo").
-       However, ignore files that we chown'ed ourselves previously to
-       ensure that we don't fail on hard links within the same build
-       (i.e. "touch $out/foo; ln $out/foo $out/bar"). */
-    if (uidRange && (st.st_uid < uidRange->first || st.st_uid > uidRange->second)) {
-        if (S_ISDIR(st.st_mode) || !inodesSeen.count(Inode(st.st_dev, st.st_ino)))
-            throw BuildError("invalid ownership on file '%1%'", path);
-        mode_t mode = st.st_mode & ~S_IFMT;
-        assert(S_ISLNK(st.st_mode) || (st.st_uid == geteuid() && (mode == 0444 || mode == 0555) && st.st_mtime == mtimeStore));
-        return;
-    }
-
 #if __linux__
    /* Remove extended attributes / ACLs. */
    ssize_t eaSize = llistxattr(path.c_str(), nullptr, 0);
@ -691,8 +676,6 @@ static void canonicalisePathMetaData_(
        if ((eaSize = llistxattr(path.c_str(), eaBuf.data(), eaBuf.size())) < 0)
            throw SysError("querying extended attributes of '%s'", path);

-        if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode))
-            chmod(path.c_str(), st.st_mode | S_IWUSR);
        for (auto & eaName: tokenizeString<Strings>(std::string(eaBuf.data(), eaSize), std::string("\000", 1))) {
            if (settings.ignoredAcls.get().count(eaName)) continue;
            if (lremovexattr(path.c_str(), eaName.c_str()) == -1)
@ -701,6 +684,20 @@ static void canonicalisePathMetaData_(
     }
 #endif

+    /* Fail if the file is not owned by the build user.  This prevents
+       us from messing up the ownership/permissions of files
+       hard-linked into the output (e.g. "ln /etc/shadow $out/foo").
+       However, ignore files that we chown'ed ourselves previously to
+       ensure that we don't fail on hard links within the same build
+       (i.e. "touch $out/foo; ln $out/foo $out/bar"). */
+    if (uidRange && (st.st_uid < uidRange->first || st.st_uid > uidRange->second)) {
+        if (S_ISDIR(st.st_mode) || !inodesSeen.count(Inode(st.st_dev, st.st_ino)))
+            throw BuildError("invalid ownership on file '%1%'", path);
+        mode_t mode = st.st_mode & ~S_IFMT;
+        assert(S_ISLNK(st.st_mode) || (st.st_uid == geteuid() && (mode == 0444 || mode == 0555) && st.st_mtime == mtimeStore));
+        return;
+    }
+
    inodesSeen.insert(Inode(st.st_dev, st.st_ino));

    canonicaliseTimestampAndPermissions(path, st);
@ -1218,11 +1215,11 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source,
    bool narRead = false;
    Finally cleanup = [&]() {
        if (!narRead) {
-            NARParseVisitor sink;
+            ParseSink sink;
            try {
                parseDump(sink, source);
            } catch (...) {
-                ignoreExceptionExceptInterrupt();
+                ignoreException();
            }
        }
    };
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@ -421,7 +421,4 @@ void canonicaliseTimestampAndPermissions(const Path & path);

 MakeError(PathInUse, Error);

-// Implemented by the relevant platform/ module being used.
-void registerLocalStore();
-
 }
--- a/src/libstore/lock.cc
+++ b/src/libstore/lock.cc
@ -73,16 +73,8 @@ struct SimpleUserLock : UserLock
            debug("trying user '%s'", i);

            struct passwd * pw = getpwnam(i.c_str());
-            if (!pw) {
-#ifdef __APPLE__
-#define APPLE_HINT "\n\nhint: this may be caused by an update to macOS Sequoia breaking existing Lix installations.\n" \
-                "See the macOS Sequoia page on the Lix wiki for detailed repair instructions: https://wiki.lix.systems/link/81"
-#else
-#define APPLE_HINT
-#endif
-                throw Error("the user '%s' in the group '%s' does not exist" APPLE_HINT, i, settings.buildUsersGroup);
-#undef APPLE_HINT
-            }
+            if (!pw)
+                throw Error("the user '%s' in the group '%s' does not exist", i, settings.buildUsersGroup);

            auto fnUserLock = fmt("%s/userpool/%s", settings.nixStateDir,pw->pw_uid);

--- a/src/libstore/lock.hh
+++ b/src/libstore/lock.hh
@ -1,10 +1,11 @@
 #pragma once
 ///@file

-#include <memory>
+#include "types.hh"
+
+#include <optional>

 #include <sys/types.h>
-#include <vector>

 namespace nix {

--- a/src/libstore/machines.hh
+++ b/src/libstore/machines.hh
@ -1,9 +1,7 @@
 #pragma once
 ///@file

-#include "ref.hh"
-#include <set>
-#include <vector>
+#include "types.hh"

 namespace nix {

--- a/Show more
+++ b/Show more