From 5d35424445a4fbdd2f46f57614e8a6de98177653 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 14 Oct 2024 16:17:18 +0200
Subject: [PATCH 01/43] path fetcher: Allow the lastModified attribute to be
 overriden again

Fixes #11660.
---
 src/libfetchers/path.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc
index fca0df84b..fe1534aba 100644
--- a/src/libfetchers/path.cc
+++ b/src/libfetchers/path.cc
@@ -157,7 +157,11 @@ struct PathInputScheme : InputScheme
             });
             storePath = store->addToStoreFromDump(*src, "source");
         }
-        input.attrs.insert_or_assign("lastModified", uint64_t(mtime));
+
+        /* Trust the lastModified value supplied by the user, if
+           any. It's not a "secure" attribute so we don't care. */
+        if (!input.getLastModified())
+            input.attrs.insert_or_assign("lastModified", uint64_t(mtime));
 
         return {makeStorePathAccessor(store, *storePath), std::move(input)};
     }

From eb7d7780b18bce679639336cfd8ba6af1fe6139d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 Oct 2024 12:04:33 -0400
Subject: [PATCH 02/43] Rename `doc/manual{src -> source}`

This is needed to avoid this
https://github.com/mesonbuild/meson/issues/13774 when we go back to
making our subproject directory `src`.
---
 .../ISSUE_TEMPLATE/missing_documentation.md   |   2 +-
 .github/labeler.yml                           |   2 +-
 .gitignore                                    |  22 +++----
 CONTRIBUTING.md                               |   4 +-
 HACKING.md                                    |   2 +-
 doc/manual/book.toml                          |   3 +-
 doc/manual/generate-store-types.nix           |   2 +-
 doc/manual/local.mk                           |  56 +++++++++---------
 doc/manual/meson.build                        |  16 ++---
 doc/manual/redirects.js                       |   2 +-
 doc/manual/{src => source}/SUMMARY.md.in      |   0
 doc/manual/{src => source}/_redirects         |   0
 .../advanced-topics/cores-vs-jobs.md          |   0
 .../advanced-topics/diff-hook.md              |   0
 .../advanced-topics/distributed-builds.md     |   0
 .../{src => source}/advanced-topics/index.md  |   0
 .../advanced-topics/post-build-hook.md        |   0
 .../architecture/architecture.md              |   0
 doc/manual/{src => source}/c-api.md           |   0
 .../command-ref/conf-file-prefix.md           |   0
 .../{src => source}/command-ref/env-common.md |   0
 .../command-ref/experimental-commands.md      |   0
 .../{src => source}/command-ref/files.md      |   0
 .../command-ref/files/channels.md             |   0
 .../files/default-nix-expression.md           |   0
 .../command-ref/files/manifest.json.md        |   0
 .../command-ref/files/manifest.nix.md         |   0
 .../command-ref/files/profiles.md             |   0
 .../{src => source}/command-ref/index.md      |   0
 .../command-ref/main-commands.md              |   0
 .../{src => source}/command-ref/meson.build   |   0
 .../{src => source}/command-ref/nix-build.md  |   0
 .../command-ref/nix-channel.md                |   0
 .../command-ref/nix-collect-garbage.md        |   0
 .../command-ref/nix-copy-closure.md           |   0
 .../{src => source}/command-ref/nix-daemon.md |   0
 .../{src => source}/command-ref/nix-env.md    |   0
 .../command-ref/nix-env/delete-generations.md |   0
 .../command-ref/nix-env/env-common.md         |   0
 .../command-ref/nix-env/install.md            |   0
 .../command-ref/nix-env/list-generations.md   |   0
 .../command-ref/nix-env/opt-common.md         |   0
 .../command-ref/nix-env/query.md              |   0
 .../command-ref/nix-env/rollback.md           |   0
 .../command-ref/nix-env/set-flag.md           |   0
 .../command-ref/nix-env/set.md                |   0
 .../command-ref/nix-env/switch-generation.md  |   0
 .../command-ref/nix-env/switch-profile.md     |   0
 .../command-ref/nix-env/uninstall.md          |   0
 .../command-ref/nix-env/upgrade.md            |   0
 .../{src => source}/command-ref/nix-hash.md   |   0
 .../command-ref/nix-instantiate.md            |   0
 .../command-ref/nix-prefetch-url.md           |   0
 .../{src => source}/command-ref/nix-shell.md  |   0
 .../{src => source}/command-ref/nix-store.md  |   0
 .../command-ref/nix-store/add-fixed.md        |   0
 .../command-ref/nix-store/add.md              |   0
 .../command-ref/nix-store/delete.md           |   0
 .../command-ref/nix-store/dump-db.md          |   0
 .../command-ref/nix-store/dump.md             |   0
 .../command-ref/nix-store/export.md           |   0
 .../command-ref/nix-store/gc.md               |   0
 .../nix-store/generate-binary-cache-key.md    |   0
 .../command-ref/nix-store/import.md           |   0
 .../command-ref/nix-store/load-db.md          |   0
 .../command-ref/nix-store/opt-common.md       |   0
 .../command-ref/nix-store/optimise.md         |   0
 .../command-ref/nix-store/print-env.md        |   0
 .../command-ref/nix-store/query.md            |   0
 .../command-ref/nix-store/read-log.md         |   0
 .../command-ref/nix-store/realise.md          |   0
 .../command-ref/nix-store/repair-path.md      |   0
 .../command-ref/nix-store/restore.md          |   0
 .../command-ref/nix-store/serve.md            |   0
 .../command-ref/nix-store/verify-path.md      |   0
 .../command-ref/nix-store/verify.md           |   0
 .../{src => source}/command-ref/opt-common.md |   0
 .../command-ref/status-build-failure.md       |   0
 .../{src => source}/command-ref/utilities.md  |   0
 .../{src => source}/development/building.md   |   0
 .../development/cli-guideline.md              |   0
 .../development/contributing.md               |   0
 doc/manual/{src => source}/development/cxx.md |   0
 .../development/documentation.md              |   4 +-
 .../development/experimental-features.md      |   0
 .../{src => source}/development/index.md      |   0
 .../development/json-guideline.md             |   0
 .../{src => source}/development/meson.build   |   0
 .../{src => source}/development/testing.md    |   0
 doc/manual/{src => source}/favicon.png        | Bin
 doc/manual/{src => source}/favicon.svg        |   0
 .../figures/user-environments.png             | Bin
 .../figures/user-environments.sxd             | Bin
 doc/manual/{src => source}/glossary.md        |   0
 .../installation/building-source.md           |   0
 .../installation/env-variables.md             |   0
 .../{src => source}/installation/index.md     |   0
 .../installation/installing-binary.md         |   0
 .../installation/installing-docker.md         |   0
 .../installation/installing-source.md         |   0
 .../installation/multi-user.md                |   0
 .../installation/nix-security.md              |   0
 .../installation/obtaining-source.md          |   0
 .../installation/prerequisites-source.md      |   0
 .../installation/single-user.md               |   0
 .../installation/supported-platforms.md       |   0
 .../{src => source}/installation/uninstall.md |   0
 .../{src => source}/installation/upgrading.md |   0
 doc/manual/{src => source}/introduction.md    |   0
 .../language/advanced-attributes.md           |   0
 .../language/builtins-prefix.md               |   0
 .../language/builtins-suffix.md               |   0
 .../{src => source}/language/constructs.md    |   0
 .../language/constructs/lookup-path.md        |   0
 .../{src => source}/language/derivations.md   |   0
 .../{src => source}/language/identifiers.md   |   0
 .../language/import-from-derivation.md        |   0
 doc/manual/{src => source}/language/index.md  |   0
 .../{src => source}/language/meson.build      |   0
 .../{src => source}/language/operators.md     |   0
 doc/manual/{src => source}/language/scope.md  |   0
 .../language/string-context.md                |   0
 .../language/string-interpolation.md          |   0
 .../language/string-literals.md               |   0
 doc/manual/{src => source}/language/syntax.md |   0
 doc/manual/{src => source}/language/types.md  |   0
 doc/manual/{src => source}/language/values.md |   0
 .../{src => source}/language/variables.md     |   0
 doc/manual/{src => source}/meson.build        |   0
 .../binary-cache-substituter.md               |   0
 .../package-management/garbage-collection.md  |   0
 .../garbage-collector-roots.md                |   0
 .../package-management/index.md               |   0
 .../package-management/profiles.md            |   0
 .../package-management/sharing-packages.md    |   0
 .../package-management/ssh-substituter.md     |   0
 .../protocols/derivation-aterm.md             |   0
 doc/manual/{src => source}/protocols/index.md |   0
 .../protocols/json/derivation.md              |   0
 .../{src => source}/protocols/json/index.md   |   0
 .../protocols/json/store-object-info.md       |   0
 .../{src => source}/protocols/nix-archive.md  |   0
 .../{src => source}/protocols/store-path.md   |   0
 .../protocols/tarball-fetcher.md              |   0
 doc/manual/{src => source}/quick-start.md     |   0
 .../{src => source}/release-notes/index.md    |   0
 .../{src => source}/release-notes/meson.build |   0
 .../release-notes/rl-0.10.1.md                |   0
 .../{src => source}/release-notes/rl-0.10.md  |   0
 .../{src => source}/release-notes/rl-0.11.md  |   0
 .../{src => source}/release-notes/rl-0.12.md  |   0
 .../{src => source}/release-notes/rl-0.13.md  |   0
 .../{src => source}/release-notes/rl-0.14.md  |   0
 .../{src => source}/release-notes/rl-0.15.md  |   0
 .../{src => source}/release-notes/rl-0.16.md  |   0
 .../{src => source}/release-notes/rl-0.5.md   |   0
 .../{src => source}/release-notes/rl-0.6.md   |   0
 .../{src => source}/release-notes/rl-0.7.md   |   0
 .../{src => source}/release-notes/rl-0.8.1.md |   0
 .../{src => source}/release-notes/rl-0.8.md   |   0
 .../{src => source}/release-notes/rl-0.9.1.md |   0
 .../{src => source}/release-notes/rl-0.9.2.md |   0
 .../{src => source}/release-notes/rl-0.9.md   |   0
 .../{src => source}/release-notes/rl-1.0.md   |   0
 .../{src => source}/release-notes/rl-1.1.md   |   0
 .../{src => source}/release-notes/rl-1.10.md  |   0
 .../release-notes/rl-1.11.10.md               |   0
 .../{src => source}/release-notes/rl-1.11.md  |   0
 .../{src => source}/release-notes/rl-1.2.md   |   0
 .../{src => source}/release-notes/rl-1.3.md   |   0
 .../{src => source}/release-notes/rl-1.4.md   |   0
 .../{src => source}/release-notes/rl-1.5.1.md |   0
 .../{src => source}/release-notes/rl-1.5.2.md |   0
 .../{src => source}/release-notes/rl-1.5.md   |   0
 .../{src => source}/release-notes/rl-1.6.1.md |   0
 .../{src => source}/release-notes/rl-1.6.md   |   0
 .../{src => source}/release-notes/rl-1.7.md   |   0
 .../{src => source}/release-notes/rl-1.8.md   |   0
 .../{src => source}/release-notes/rl-1.9.md   |   0
 .../{src => source}/release-notes/rl-2.0.md   |   0
 .../{src => source}/release-notes/rl-2.1.md   |   0
 .../{src => source}/release-notes/rl-2.10.md  |   0
 .../{src => source}/release-notes/rl-2.11.md  |   0
 .../{src => source}/release-notes/rl-2.12.md  |   0
 .../{src => source}/release-notes/rl-2.13.md  |   0
 .../{src => source}/release-notes/rl-2.14.md  |   0
 .../{src => source}/release-notes/rl-2.15.md  |   0
 .../{src => source}/release-notes/rl-2.16.md  |   0
 .../{src => source}/release-notes/rl-2.17.md  |   0
 .../{src => source}/release-notes/rl-2.18.md  |   0
 .../{src => source}/release-notes/rl-2.19.md  |   0
 .../{src => source}/release-notes/rl-2.2.md   |   0
 .../{src => source}/release-notes/rl-2.20.md  |   0
 .../{src => source}/release-notes/rl-2.21.md  |   0
 .../{src => source}/release-notes/rl-2.22.md  |   0
 .../{src => source}/release-notes/rl-2.23.md  |   0
 .../{src => source}/release-notes/rl-2.24.md  |   0
 .../{src => source}/release-notes/rl-2.3.md   |   0
 .../{src => source}/release-notes/rl-2.4.md   |   0
 .../{src => source}/release-notes/rl-2.5.md   |   0
 .../{src => source}/release-notes/rl-2.6.md   |   0
 .../{src => source}/release-notes/rl-2.7.md   |   0
 .../{src => source}/release-notes/rl-2.8.md   |   0
 .../{src => source}/release-notes/rl-2.9.md   |   0
 .../store/file-system-object.md               |   0
 .../file-system-object/content-address.md     |   0
 doc/manual/{src => source}/store/index.md     |   0
 doc/manual/{src => source}/store/meson.build  |   0
 .../{src => source}/store/store-object.md     |   0
 .../store/store-object/content-address.md     |   0
 .../{src => source}/store/store-path.md       |   0
 .../{src => source}/store/types/index.md.in   |   0
 doc/manual/substitute.py                      |   4 +-
 maintainers/release-notes                     |   8 +--
 .../unix/build/local-derivation-goal.cc       |   4 +-
 src/nix/help-stores.md                        |   2 +-
 src/nix/package.nix                           |   4 +-
 src/nix/profiles.md                           |   2 +-
 tests/functional/check.sh                     |   2 +-
 tests/functional/common/functions.sh          |   2 +-
 tests/functional/linux-sandbox.sh             |   6 +-
 221 files changed, 75 insertions(+), 74 deletions(-)
 rename doc/manual/{src => source}/SUMMARY.md.in (100%)
 rename doc/manual/{src => source}/_redirects (100%)
 rename doc/manual/{src => source}/advanced-topics/cores-vs-jobs.md (100%)
 rename doc/manual/{src => source}/advanced-topics/diff-hook.md (100%)
 rename doc/manual/{src => source}/advanced-topics/distributed-builds.md (100%)
 rename doc/manual/{src => source}/advanced-topics/index.md (100%)
 rename doc/manual/{src => source}/advanced-topics/post-build-hook.md (100%)
 rename doc/manual/{src => source}/architecture/architecture.md (100%)
 rename doc/manual/{src => source}/c-api.md (100%)
 rename doc/manual/{src => source}/command-ref/conf-file-prefix.md (100%)
 rename doc/manual/{src => source}/command-ref/env-common.md (100%)
 rename doc/manual/{src => source}/command-ref/experimental-commands.md (100%)
 rename doc/manual/{src => source}/command-ref/files.md (100%)
 rename doc/manual/{src => source}/command-ref/files/channels.md (100%)
 rename doc/manual/{src => source}/command-ref/files/default-nix-expression.md (100%)
 rename doc/manual/{src => source}/command-ref/files/manifest.json.md (100%)
 rename doc/manual/{src => source}/command-ref/files/manifest.nix.md (100%)
 rename doc/manual/{src => source}/command-ref/files/profiles.md (100%)
 rename doc/manual/{src => source}/command-ref/index.md (100%)
 rename doc/manual/{src => source}/command-ref/main-commands.md (100%)
 rename doc/manual/{src => source}/command-ref/meson.build (100%)
 rename doc/manual/{src => source}/command-ref/nix-build.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-channel.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-collect-garbage.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-copy-closure.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-daemon.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/delete-generations.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/env-common.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/install.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/list-generations.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/opt-common.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/query.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/rollback.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/set-flag.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/set.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/switch-generation.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/switch-profile.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/uninstall.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-env/upgrade.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-hash.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-instantiate.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-prefetch-url.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-shell.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/add-fixed.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/add.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/delete.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/dump-db.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/dump.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/export.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/gc.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/generate-binary-cache-key.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/import.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/load-db.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/opt-common.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/optimise.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/print-env.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/query.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/read-log.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/realise.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/repair-path.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/restore.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/serve.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/verify-path.md (100%)
 rename doc/manual/{src => source}/command-ref/nix-store/verify.md (100%)
 rename doc/manual/{src => source}/command-ref/opt-common.md (100%)
 rename doc/manual/{src => source}/command-ref/status-build-failure.md (100%)
 rename doc/manual/{src => source}/command-ref/utilities.md (100%)
 rename doc/manual/{src => source}/development/building.md (100%)
 rename doc/manual/{src => source}/development/cli-guideline.md (100%)
 rename doc/manual/{src => source}/development/contributing.md (100%)
 rename doc/manual/{src => source}/development/cxx.md (100%)
 rename doc/manual/{src => source}/development/documentation.md (98%)
 rename doc/manual/{src => source}/development/experimental-features.md (100%)
 rename doc/manual/{src => source}/development/index.md (100%)
 rename doc/manual/{src => source}/development/json-guideline.md (100%)
 rename doc/manual/{src => source}/development/meson.build (100%)
 rename doc/manual/{src => source}/development/testing.md (100%)
 rename doc/manual/{src => source}/favicon.png (100%)
 rename doc/manual/{src => source}/favicon.svg (100%)
 rename doc/manual/{src => source}/figures/user-environments.png (100%)
 rename doc/manual/{src => source}/figures/user-environments.sxd (100%)
 rename doc/manual/{src => source}/glossary.md (100%)
 rename doc/manual/{src => source}/installation/building-source.md (100%)
 rename doc/manual/{src => source}/installation/env-variables.md (100%)
 rename doc/manual/{src => source}/installation/index.md (100%)
 rename doc/manual/{src => source}/installation/installing-binary.md (100%)
 rename doc/manual/{src => source}/installation/installing-docker.md (100%)
 rename doc/manual/{src => source}/installation/installing-source.md (100%)
 rename doc/manual/{src => source}/installation/multi-user.md (100%)
 rename doc/manual/{src => source}/installation/nix-security.md (100%)
 rename doc/manual/{src => source}/installation/obtaining-source.md (100%)
 rename doc/manual/{src => source}/installation/prerequisites-source.md (100%)
 rename doc/manual/{src => source}/installation/single-user.md (100%)
 rename doc/manual/{src => source}/installation/supported-platforms.md (100%)
 rename doc/manual/{src => source}/installation/uninstall.md (100%)
 rename doc/manual/{src => source}/installation/upgrading.md (100%)
 rename doc/manual/{src => source}/introduction.md (100%)
 rename doc/manual/{src => source}/language/advanced-attributes.md (100%)
 rename doc/manual/{src => source}/language/builtins-prefix.md (100%)
 rename doc/manual/{src => source}/language/builtins-suffix.md (100%)
 rename doc/manual/{src => source}/language/constructs.md (100%)
 rename doc/manual/{src => source}/language/constructs/lookup-path.md (100%)
 rename doc/manual/{src => source}/language/derivations.md (100%)
 rename doc/manual/{src => source}/language/identifiers.md (100%)
 rename doc/manual/{src => source}/language/import-from-derivation.md (100%)
 rename doc/manual/{src => source}/language/index.md (100%)
 rename doc/manual/{src => source}/language/meson.build (100%)
 rename doc/manual/{src => source}/language/operators.md (100%)
 rename doc/manual/{src => source}/language/scope.md (100%)
 rename doc/manual/{src => source}/language/string-context.md (100%)
 rename doc/manual/{src => source}/language/string-interpolation.md (100%)
 rename doc/manual/{src => source}/language/string-literals.md (100%)
 rename doc/manual/{src => source}/language/syntax.md (100%)
 rename doc/manual/{src => source}/language/types.md (100%)
 rename doc/manual/{src => source}/language/values.md (100%)
 rename doc/manual/{src => source}/language/variables.md (100%)
 rename doc/manual/{src => source}/meson.build (100%)
 rename doc/manual/{src => source}/package-management/binary-cache-substituter.md (100%)
 rename doc/manual/{src => source}/package-management/garbage-collection.md (100%)
 rename doc/manual/{src => source}/package-management/garbage-collector-roots.md (100%)
 rename doc/manual/{src => source}/package-management/index.md (100%)
 rename doc/manual/{src => source}/package-management/profiles.md (100%)
 rename doc/manual/{src => source}/package-management/sharing-packages.md (100%)
 rename doc/manual/{src => source}/package-management/ssh-substituter.md (100%)
 rename doc/manual/{src => source}/protocols/derivation-aterm.md (100%)
 rename doc/manual/{src => source}/protocols/index.md (100%)
 rename doc/manual/{src => source}/protocols/json/derivation.md (100%)
 rename doc/manual/{src => source}/protocols/json/index.md (100%)
 rename doc/manual/{src => source}/protocols/json/store-object-info.md (100%)
 rename doc/manual/{src => source}/protocols/nix-archive.md (100%)
 rename doc/manual/{src => source}/protocols/store-path.md (100%)
 rename doc/manual/{src => source}/protocols/tarball-fetcher.md (100%)
 rename doc/manual/{src => source}/quick-start.md (100%)
 rename doc/manual/{src => source}/release-notes/index.md (100%)
 rename doc/manual/{src => source}/release-notes/meson.build (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.10.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.10.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.11.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.12.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.13.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.14.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.15.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.16.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.5.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.6.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.7.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.8.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.8.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.9.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.9.2.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-0.9.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.0.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.10.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.11.10.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.11.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.2.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.3.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.4.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.5.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.5.2.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.5.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.6.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.6.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.7.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.8.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-1.9.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.0.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.1.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.10.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.11.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.12.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.13.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.14.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.15.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.16.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.17.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.18.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.19.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.2.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.20.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.21.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.22.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.23.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.24.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.3.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.4.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.5.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.6.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.7.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.8.md (100%)
 rename doc/manual/{src => source}/release-notes/rl-2.9.md (100%)
 rename doc/manual/{src => source}/store/file-system-object.md (100%)
 rename doc/manual/{src => source}/store/file-system-object/content-address.md (100%)
 rename doc/manual/{src => source}/store/index.md (100%)
 rename doc/manual/{src => source}/store/meson.build (100%)
 rename doc/manual/{src => source}/store/store-object.md (100%)
 rename doc/manual/{src => source}/store/store-object/content-address.md (100%)
 rename doc/manual/{src => source}/store/store-path.md (100%)
 rename doc/manual/{src => source}/store/types/index.md.in (100%)

diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md
index be3f6af97..cf663e28d 100644
--- a/.github/ISSUE_TEMPLATE/missing_documentation.md
+++ b/.github/ISSUE_TEMPLATE/missing_documentation.md
@@ -23,7 +23,7 @@ assignees: ''
 - [ ] checked [open documentation issues and pull requests] for possible duplicates
 
 [latest Nix manual]: https://nixos.org/manual/nix/unstable/
-[source]: https://github.com/NixOS/nix/tree/master/doc/manual/src
+[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
 [open documentation issues and pull requests]: https://github.com/NixOS/nix/labels/documentation
 
 ## Priorities
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0e6fd3e26..9f7cb76c5 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -9,7 +9,7 @@
     - any-glob-to-any-file: "CONTRIBUTING.md"
     - any-glob-to-any-file: ".github/ISSUE_TEMPLATE/*"
     - any-glob-to-any-file: ".github/PULL_REQUEST_TEMPLATE.md"
-    - any-glob-to-any-file: "doc/manual/src/contributing/**"
+    - any-glob-to-any-file: "doc/manual/source/contributing/**"
 
 "documentation":
   - changed-files:
diff --git a/.gitignore b/.gitignore
index a17b627f4..8d6693984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,17 +23,17 @@ perl/Makefile.config
 /doc/manual/conf-file.json
 /doc/manual/language.json
 /doc/manual/xp-features.json
-/doc/manual/src/SUMMARY.md
-/doc/manual/src/SUMMARY-rl-next.md
-/doc/manual/src/store/types/*
-!/doc/manual/src/store/types/index.md.in
-/doc/manual/src/command-ref/new-cli
-/doc/manual/src/command-ref/conf-file.md
-/doc/manual/src/command-ref/experimental-features-shortlist.md
-/doc/manual/src/contributing/experimental-feature-descriptions.md
-/doc/manual/src/language/builtins.md
-/doc/manual/src/language/builtin-constants.md
-/doc/manual/src/release-notes/rl-next.md
+/doc/manual/source/SUMMARY.md
+/doc/manual/source/SUMMARY-rl-next.md
+/doc/manual/source/store/types/*
+!/doc/manual/source/store/types/index.md.in
+/doc/manual/source/command-ref/new-cli
+/doc/manual/source/command-ref/conf-file.md
+/doc/manual/source/command-ref/experimental-features-shortlist.md
+/doc/manual/source/contributing/experimental-feature-descriptions.md
+/doc/manual/source/language/builtins.md
+/doc/manual/source/language/builtin-constants.md
+/doc/manual/source/release-notes/rl-next.md
 
 # /scripts/
 /scripts/nix-profile.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 56508df34..ad8678962 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -79,7 +79,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
      - Functional tests – [`tests/functional/**.sh`](./tests/functional)
      - Unit tests – [`src/*/tests`](./src/)
      - Integration tests – [`tests/nixos/*`](./tests/nixos)
-   - [ ] User documentation in the [manual](./doc/manual/src)
+   - [ ] User documentation in the [manual](./doc/manual/source)
    - [ ] API documentation in header files
    - [ ] Code and comments are self-explanatory
    - [ ] Commit message explains **why** the change was made
@@ -90,7 +90,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
 ## Making changes to the Nix manual
 
 The Nix reference manual is hosted on https://nixos.org/manual/nix.
-The underlying source files are located in [`doc/manual/src`](./doc/manual/src).
+The underlying source files are located in [`doc/manual/source`](./doc/manual/source).
 For small changes you can [use GitHub to edit these files](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files)
 For larger changes see the [Nix reference manual](https://nix.dev/manual/nix/development/development/contributing.html).
 
diff --git a/HACKING.md b/HACKING.md
index d3576d60d..02971da3e 120000
--- a/HACKING.md
+++ b/HACKING.md
@@ -1 +1 @@
-doc/manual/src/development/building.md
\ No newline at end of file
+doc/manual/source/development/building.md
\ No newline at end of file
diff --git a/doc/manual/book.toml b/doc/manual/book.toml
index acae7aec7..213739174 100644
--- a/doc/manual/book.toml
+++ b/doc/manual/book.toml
@@ -1,5 +1,6 @@
 [book]
 title = "Nix Reference Manual"
+src = "source"
 
 [output.html]
 additional-css = ["custom.css"]
@@ -7,7 +8,7 @@ additional-js = ["redirects.js"]
 edit-url-template = "https://github.com/NixOS/nix/tree/master/doc/manual/{path}"
 git-repository-url = "https://github.com/NixOS/nix"
 
-# Handles replacing @docroot@ with a path to ./src relative to that markdown file,
+# Handles replacing @docroot@ with a path to ./source relative to that markdown file,
 # {{#include handlebars}}, and the @generated@ syntax used within these. it mostly
 # but not entirely replaces the links preprocessor (which we cannot simply use due
 # to @generated@ files living in a different directory to make meson happy). we do
diff --git a/doc/manual/generate-store-types.nix b/doc/manual/generate-store-types.nix
index 3b78a0e1b..46179abc5 100644
--- a/doc/manual/generate-store-types.nix
+++ b/doc/manual/generate-store-types.nix
@@ -21,7 +21,7 @@ let
 
   "index.md" = replaceStrings
     [ "@store-types@" ] [ index ]
-    (readFile ./src/store/types/index.md.in);
+    (readFile ./source/store/types/index.md.in);
 
   tableOfContents =
     let
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 3c777efc3..36cccc506 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -4,8 +4,8 @@
 doc_nix = $(nix_PATH)
 
 MANUAL_SRCS := \
-	$(call rwildcard, $(d)/src, *.md) \
-	$(call rwildcard, $(d)/src, */*.md)
+	$(call rwildcard, $(d)/source, *.md) \
+	$(call rwildcard, $(d)/source, */*.md)
 
 man-pages := $(foreach n, \
 	nix-env.1 nix-store.1 \
@@ -18,11 +18,11 @@ man-pages := $(foreach n, \
 , $(d)/$(n))
 
 # man pages for subcommands
-# convert from `$(d)/src/command-ref/nix-{1}/{2}.md` to `$(d)/nix-{1}-{2}.1`
+# convert from `$(d)/source/command-ref/nix-{1}/{2}.md` to `$(d)/nix-{1}-{2}.1`
 # FIXME: unify with how nix3-cli man pages are generated
 man-pages += $(foreach subcommand, \
-	$(filter-out %opt-common.md %env-common.md, $(wildcard $(d)/src/command-ref/nix-*/*.md)), \
-	$(d)/$(subst /,-,$(subst $(d)/src/command-ref/,,$(subst .md,.1,$(subcommand)))))
+	$(filter-out %opt-common.md %env-common.md, $(wildcard $(d)/source/command-ref/nix-*/*.md)), \
+	$(d)/$(subst /,-,$(subst $(d)/source/command-ref/,,$(subst .md,.1,$(subcommand)))))
 
 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
@@ -49,11 +49,11 @@ define process-includes
 	done < <(grep '{{#include' $(1))
 endef
 
-$(d)/nix-env-%.1: $(d)/src/command-ref/nix-env/%.md
+$(d)/nix-env-%.1: $(d)/source/command-ref/nix-env/%.md
 	@printf "Title: %s\n\n" "$(subst nix-env-,nix-env --,$$(basename "$@" .1))" > $^.tmp
 	$(render-subcommand)
 
-$(d)/nix-store-%.1: $(d)/src/command-ref/nix-store/%.md
+$(d)/nix-store-%.1: $(d)/source/command-ref/nix-store/%.md
 	@printf -- 'Title: %s\n\n' "$(subst nix-store-,nix-store --,$$(basename "$@" .1))" > $^.tmp
 	$(render-subcommand)
 
@@ -69,50 +69,50 @@ define render-subcommand
 endef
 
 
-$(d)/%.1: $(d)/src/command-ref/%.md
+$(d)/%.1: $(d)/source/command-ref/%.md
 	@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
 	@cat $^ >> $^.tmp
 	@$(call process-includes,$^,$^.tmp)
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=1 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/%.8: $(d)/src/command-ref/%.md
+$(d)/%.8: $(d)/source/command-ref/%.md
 	@printf "Title: %s\n\n" "$$(basename $@ .8)" > $^.tmp
 	@cat $^ >> $^.tmp
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=8 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
+$(d)/nix.conf.5: $(d)/source/command-ref/conf-file.md
 	@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
 	@cat $^ >> $^.tmp
 	@$(call process-includes,$^,$^.tmp)
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=5 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/nix-profiles.5: $(d)/src/command-ref/files/profiles.md
+$(d)/nix-profiles.5: $(d)/source/command-ref/files/profiles.md
 	@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
 	@cat $^ >> $^.tmp
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=5 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/SUMMARY-rl-next.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/development/experimental-feature-descriptions.md
+$(d)/source/SUMMARY.md: $(d)/source/SUMMARY.md.in $(d)/source/SUMMARY-rl-next.md $(d)/source/store/types $(d)/source/command-ref/new-cli $(d)/source/development/experimental-feature-descriptions.md
 	@cp $< $@
 	@$(call process-includes,$@,$@)
 
-$(d)/src/store/types: $(d)/nix.json $(d)/utils.nix $(d)/generate-store-info.nix  $(d)/generate-store-types.nix $(d)/src/store/types/index.md.in $(doc_nix)
+$(d)/source/store/types: $(d)/nix.json $(d)/utils.nix $(d)/generate-store-info.nix  $(d)/generate-store-types.nix $(d)/source/store/types/index.md.in $(doc_nix)
 	@# FIXME: build out of tree!
 	@rm -rf $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-store-types.nix (builtins.fromJSON (builtins.readFile $<)).stores'
 	@# do not destroy existing contents
 	@mv $@.tmp/* $@/
 
-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(d)/generate-settings.nix $(d)/generate-store-info.nix $(doc_nix)
+$(d)/source/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(d)/generate-settings.nix $(d)/generate-store-info.nix $(doc_nix)
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix true (builtins.readFile $<)'
 	@mv $@.tmp $@
 
-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/generate-settings.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(doc_nix)
-	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
+$(d)/source/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/generate-settings.nix $(d)/source/command-ref/conf-file-prefix.md $(d)/source/command-ref/experimental-features-shortlist.md $(doc_nix)
+	@cat doc/manual/source/command-ref/conf-file-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-settings.nix { prefix = "conf"; } (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
 	@mv $@.tmp $@
 
@@ -124,12 +124,12 @@ $(d)/conf-file.json: $(doc_nix)
 	$(trace-gen) $(dummy-env) $(doc_nix) config show --json --experimental-features nix-command > $@.tmp
 	@mv $@.tmp $@
 
-$(d)/src/development/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
+$(d)/source/development/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features.nix (builtins.fromJSON (builtins.readFile $<))'
 	@mv $@.tmp $@
 
-$(d)/src/command-ref/experimental-features-shortlist.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(doc_nix)
+$(d)/source/command-ref/experimental-features-shortlist.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(doc_nix)
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features-shortlist.nix (builtins.fromJSON (builtins.readFile $<))'
 	@mv $@.tmp $@
@@ -138,10 +138,10 @@ $(d)/xp-features.json: $(doc_nix)
 	$(trace-gen) $(dummy-env) $(doc_nix) __dump-xp-features > $@.tmp
 	@mv $@.tmp $@
 
-$(d)/src/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(doc_nix)
-	@cat doc/manual/src/language/builtins-prefix.md > $@.tmp
+$(d)/source/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/source/language/builtins-prefix.md $(doc_nix)
+	@cat doc/manual/source/language/builtins-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
-	@cat doc/manual/src/language/builtins-suffix.md >> $@.tmp
+	@cat doc/manual/source/language/builtins-suffix.md >> $@.tmp
 	@mv $@.tmp $@
 
 $(d)/language.json: $(doc_nix)
@@ -149,7 +149,7 @@ $(d)/language.json: $(doc_nix)
 	@mv $@.tmp $@
 
 # Generate "Upcoming release" notes (or clear it and remove from menu)
-$(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
+$(d)/source/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
 	@if type -p changelog-d > /dev/null; then \
 		echo "  GEN   " $@; \
 		changelog-d doc/manual/rl-next > $@; \
@@ -158,7 +158,7 @@ $(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
 		true > $@; \
 	fi
 
-$(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md
+$(d)/source/SUMMARY-rl-next.md: $(d)/source/release-notes/rl-next.md
 	$(trace-gen) true
 	@if [ -s $< ]; then \
 		echo '  - [Upcoming release](release-notes/rl-next.md)' > $@; \
@@ -194,9 +194,9 @@ $(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages
 	@mkdir -p $(DESTDIR)$$(dirname $@)
 	$(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@)
 
-doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
+doc/manual/generated/man1/nix3-manpages: $(d)/source/command-ref/new-cli
 	@mkdir -p $(DESTDIR)$$(dirname $@)
-	$(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \
+	$(trace-gen) for i in doc/manual/source/command-ref/new-cli/*.md; do \
 		name=$$(basename $$i .md); \
 		tmpFile=$$(mktemp); \
 		if [[ $$name = SUMMARY ]]; then continue; fi; \
@@ -211,7 +211,7 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
 # `@docroot@` is to be preserved for documenting the mechanism
 # FIXME: maybe contributing guides should live right next to the code
 # instead of in the manual
-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/development/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/release-notes/rl-next.md $(d)/src/figures $(d)/src/favicon.png $(d)/src/favicon.svg
+$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/source/SUMMARY.md $(d)/source/store/types $(d)/source/command-ref/new-cli $(d)/source/development/experimental-feature-descriptions.md $(d)/source/command-ref/conf-file.md $(d)/source/language/builtins.md $(d)/source/release-notes/rl-next.md $(d)/source/figures $(d)/source/favicon.png $(d)/source/favicon.svg
 	$(trace-gen) \
 		tmp="$$(mktemp -d)"; \
 		cp -r doc/manual "$$tmp"; \
@@ -219,14 +219,14 @@ $(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/
 			$(call process-includes,$$file,$$file); \
 		done; \
 		find "$$tmp" -name '*.md' ! -name 'documentation.md' | while read -r file; do \
-			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \
+			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/source)"; \
 			sed -i "s,@docroot@,$$docroot,g" "$$file"; \
 		done; \
 		set -euo pipefail; \
 		( \
 		    cd "$$tmp/manual"; \
 		    RUST_LOG=warn \
-		        MDBOOK_SUBSTITUTE_SEARCH=$(d)/src \
+		        MDBOOK_SUBSTITUTE_SEARCH=$(d)/source \
 		        mdbook build -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \
 			    | { grep -Fv "because fragment resolution isn't implemented" || :; } \
 		); \
diff --git a/doc/manual/meson.build b/doc/manual/meson.build
index 31d1814d7..3630e2dc8 100644
--- a/doc/manual/meson.build
+++ b/doc/manual/meson.build
@@ -55,16 +55,16 @@ generate_manual_deps = files(
 )
 
 # Generates types
-subdir('src/store')
+subdir('source/store')
 # Generates builtins.md and builtin-constants.md.
-subdir('src/language')
+subdir('source/language')
 # Generates new-cli pages, experimental-features-shortlist.md, and conf-file.md.
-subdir('src/command-ref')
+subdir('source/command-ref')
 # Generates experimental-feature-descriptions.md.
-subdir('src/development')
+subdir('source/development')
 # Generates rl-next-generated.md.
-subdir('src/release-notes')
-subdir('src')
+subdir('source/release-notes')
+subdir('source')
 
 # Hacky way to figure out if `nix` is an `ExternalProgram` or
 # `Exectuable`. Only the latter can occur in custom target input lists.
@@ -82,7 +82,7 @@ manual = custom_target(
     '-c',
     '''
         @0@ @INPUT0@ @CURRENT_SOURCE_DIR@ > @DEPFILE@
-        @0@ @INPUT1@ summary @2@ < @CURRENT_SOURCE_DIR@/src/SUMMARY.md.in > @2@/src/SUMMARY.md
+        @0@ @INPUT1@ summary @2@ < @CURRENT_SOURCE_DIR@/source/SUMMARY.md.in > @2@/source/SUMMARY.md
         rsync -r --include='*.md' @CURRENT_SOURCE_DIR@/ @2@/
         (cd @2@; RUST_LOG=warn @1@ build -d @2@ 3>&2 2>&1 1>&3) | { grep -Fv "because fragment resolution isn't implemented" || :; } 3>&2 2>&1 1>&3
         rm -rf @2@/manual
@@ -117,7 +117,7 @@ manual = custom_target(
   depfile : 'manual.d',
   env : {
     'RUST_LOG': 'info',
-    'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'src',
+    'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'source',
   },
 )
 manual_html = manual[0]
diff --git a/doc/manual/redirects.js b/doc/manual/redirects.js
index cb8cd18fa..dea141391 100644
--- a/doc/manual/redirects.js
+++ b/doc/manual/redirects.js
@@ -1,7 +1,7 @@
 // redirect rules for URL fragments (client-side) to prevent link rot.
 // this must be done on the client side, as web servers do not see the fragment part of the URL.
 // it will only work with JavaScript enabled in the browser, but this is the best we can do here.
-// see src/_redirects for path redirects (server-side)
+// see source/_redirects for path redirects (server-side)
 
 // redirects are declared as follows:
 // each entry has as its key a path matching the requested URL path, relative to the mdBook document root.
diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in
similarity index 100%
rename from doc/manual/src/SUMMARY.md.in
rename to doc/manual/source/SUMMARY.md.in
diff --git a/doc/manual/src/_redirects b/doc/manual/source/_redirects
similarity index 100%
rename from doc/manual/src/_redirects
rename to doc/manual/source/_redirects
diff --git a/doc/manual/src/advanced-topics/cores-vs-jobs.md b/doc/manual/source/advanced-topics/cores-vs-jobs.md
similarity index 100%
rename from doc/manual/src/advanced-topics/cores-vs-jobs.md
rename to doc/manual/source/advanced-topics/cores-vs-jobs.md
diff --git a/doc/manual/src/advanced-topics/diff-hook.md b/doc/manual/source/advanced-topics/diff-hook.md
similarity index 100%
rename from doc/manual/src/advanced-topics/diff-hook.md
rename to doc/manual/source/advanced-topics/diff-hook.md
diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/source/advanced-topics/distributed-builds.md
similarity index 100%
rename from doc/manual/src/advanced-topics/distributed-builds.md
rename to doc/manual/source/advanced-topics/distributed-builds.md
diff --git a/doc/manual/src/advanced-topics/index.md b/doc/manual/source/advanced-topics/index.md
similarity index 100%
rename from doc/manual/src/advanced-topics/index.md
rename to doc/manual/source/advanced-topics/index.md
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/source/advanced-topics/post-build-hook.md
similarity index 100%
rename from doc/manual/src/advanced-topics/post-build-hook.md
rename to doc/manual/source/advanced-topics/post-build-hook.md
diff --git a/doc/manual/src/architecture/architecture.md b/doc/manual/source/architecture/architecture.md
similarity index 100%
rename from doc/manual/src/architecture/architecture.md
rename to doc/manual/source/architecture/architecture.md
diff --git a/doc/manual/src/c-api.md b/doc/manual/source/c-api.md
similarity index 100%
rename from doc/manual/src/c-api.md
rename to doc/manual/source/c-api.md
diff --git a/doc/manual/src/command-ref/conf-file-prefix.md b/doc/manual/source/command-ref/conf-file-prefix.md
similarity index 100%
rename from doc/manual/src/command-ref/conf-file-prefix.md
rename to doc/manual/source/command-ref/conf-file-prefix.md
diff --git a/doc/manual/src/command-ref/env-common.md b/doc/manual/source/command-ref/env-common.md
similarity index 100%
rename from doc/manual/src/command-ref/env-common.md
rename to doc/manual/source/command-ref/env-common.md
diff --git a/doc/manual/src/command-ref/experimental-commands.md b/doc/manual/source/command-ref/experimental-commands.md
similarity index 100%
rename from doc/manual/src/command-ref/experimental-commands.md
rename to doc/manual/source/command-ref/experimental-commands.md
diff --git a/doc/manual/src/command-ref/files.md b/doc/manual/source/command-ref/files.md
similarity index 100%
rename from doc/manual/src/command-ref/files.md
rename to doc/manual/source/command-ref/files.md
diff --git a/doc/manual/src/command-ref/files/channels.md b/doc/manual/source/command-ref/files/channels.md
similarity index 100%
rename from doc/manual/src/command-ref/files/channels.md
rename to doc/manual/source/command-ref/files/channels.md
diff --git a/doc/manual/src/command-ref/files/default-nix-expression.md b/doc/manual/source/command-ref/files/default-nix-expression.md
similarity index 100%
rename from doc/manual/src/command-ref/files/default-nix-expression.md
rename to doc/manual/source/command-ref/files/default-nix-expression.md
diff --git a/doc/manual/src/command-ref/files/manifest.json.md b/doc/manual/source/command-ref/files/manifest.json.md
similarity index 100%
rename from doc/manual/src/command-ref/files/manifest.json.md
rename to doc/manual/source/command-ref/files/manifest.json.md
diff --git a/doc/manual/src/command-ref/files/manifest.nix.md b/doc/manual/source/command-ref/files/manifest.nix.md
similarity index 100%
rename from doc/manual/src/command-ref/files/manifest.nix.md
rename to doc/manual/source/command-ref/files/manifest.nix.md
diff --git a/doc/manual/src/command-ref/files/profiles.md b/doc/manual/source/command-ref/files/profiles.md
similarity index 100%
rename from doc/manual/src/command-ref/files/profiles.md
rename to doc/manual/source/command-ref/files/profiles.md
diff --git a/doc/manual/src/command-ref/index.md b/doc/manual/source/command-ref/index.md
similarity index 100%
rename from doc/manual/src/command-ref/index.md
rename to doc/manual/source/command-ref/index.md
diff --git a/doc/manual/src/command-ref/main-commands.md b/doc/manual/source/command-ref/main-commands.md
similarity index 100%
rename from doc/manual/src/command-ref/main-commands.md
rename to doc/manual/source/command-ref/main-commands.md
diff --git a/doc/manual/src/command-ref/meson.build b/doc/manual/source/command-ref/meson.build
similarity index 100%
rename from doc/manual/src/command-ref/meson.build
rename to doc/manual/source/command-ref/meson.build
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/source/command-ref/nix-build.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-build.md
rename to doc/manual/source/command-ref/nix-build.md
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/source/command-ref/nix-channel.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-channel.md
rename to doc/manual/source/command-ref/nix-channel.md
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/source/command-ref/nix-collect-garbage.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-collect-garbage.md
rename to doc/manual/source/command-ref/nix-collect-garbage.md
diff --git a/doc/manual/src/command-ref/nix-copy-closure.md b/doc/manual/source/command-ref/nix-copy-closure.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-copy-closure.md
rename to doc/manual/source/command-ref/nix-copy-closure.md
diff --git a/doc/manual/src/command-ref/nix-daemon.md b/doc/manual/source/command-ref/nix-daemon.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-daemon.md
rename to doc/manual/source/command-ref/nix-daemon.md
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/source/command-ref/nix-env.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env.md
rename to doc/manual/source/command-ref/nix-env.md
diff --git a/doc/manual/src/command-ref/nix-env/delete-generations.md b/doc/manual/source/command-ref/nix-env/delete-generations.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/delete-generations.md
rename to doc/manual/source/command-ref/nix-env/delete-generations.md
diff --git a/doc/manual/src/command-ref/nix-env/env-common.md b/doc/manual/source/command-ref/nix-env/env-common.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/env-common.md
rename to doc/manual/source/command-ref/nix-env/env-common.md
diff --git a/doc/manual/src/command-ref/nix-env/install.md b/doc/manual/source/command-ref/nix-env/install.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/install.md
rename to doc/manual/source/command-ref/nix-env/install.md
diff --git a/doc/manual/src/command-ref/nix-env/list-generations.md b/doc/manual/source/command-ref/nix-env/list-generations.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/list-generations.md
rename to doc/manual/source/command-ref/nix-env/list-generations.md
diff --git a/doc/manual/src/command-ref/nix-env/opt-common.md b/doc/manual/source/command-ref/nix-env/opt-common.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/opt-common.md
rename to doc/manual/source/command-ref/nix-env/opt-common.md
diff --git a/doc/manual/src/command-ref/nix-env/query.md b/doc/manual/source/command-ref/nix-env/query.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/query.md
rename to doc/manual/source/command-ref/nix-env/query.md
diff --git a/doc/manual/src/command-ref/nix-env/rollback.md b/doc/manual/source/command-ref/nix-env/rollback.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/rollback.md
rename to doc/manual/source/command-ref/nix-env/rollback.md
diff --git a/doc/manual/src/command-ref/nix-env/set-flag.md b/doc/manual/source/command-ref/nix-env/set-flag.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/set-flag.md
rename to doc/manual/source/command-ref/nix-env/set-flag.md
diff --git a/doc/manual/src/command-ref/nix-env/set.md b/doc/manual/source/command-ref/nix-env/set.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/set.md
rename to doc/manual/source/command-ref/nix-env/set.md
diff --git a/doc/manual/src/command-ref/nix-env/switch-generation.md b/doc/manual/source/command-ref/nix-env/switch-generation.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/switch-generation.md
rename to doc/manual/source/command-ref/nix-env/switch-generation.md
diff --git a/doc/manual/src/command-ref/nix-env/switch-profile.md b/doc/manual/source/command-ref/nix-env/switch-profile.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/switch-profile.md
rename to doc/manual/source/command-ref/nix-env/switch-profile.md
diff --git a/doc/manual/src/command-ref/nix-env/uninstall.md b/doc/manual/source/command-ref/nix-env/uninstall.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/uninstall.md
rename to doc/manual/source/command-ref/nix-env/uninstall.md
diff --git a/doc/manual/src/command-ref/nix-env/upgrade.md b/doc/manual/source/command-ref/nix-env/upgrade.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/upgrade.md
rename to doc/manual/source/command-ref/nix-env/upgrade.md
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/source/command-ref/nix-hash.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-hash.md
rename to doc/manual/source/command-ref/nix-hash.md
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/source/command-ref/nix-instantiate.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-instantiate.md
rename to doc/manual/source/command-ref/nix-instantiate.md
diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/source/command-ref/nix-prefetch-url.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-prefetch-url.md
rename to doc/manual/source/command-ref/nix-prefetch-url.md
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/source/command-ref/nix-shell.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-shell.md
rename to doc/manual/source/command-ref/nix-shell.md
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/source/command-ref/nix-store.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store.md
rename to doc/manual/source/command-ref/nix-store.md
diff --git a/doc/manual/src/command-ref/nix-store/add-fixed.md b/doc/manual/source/command-ref/nix-store/add-fixed.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/add-fixed.md
rename to doc/manual/source/command-ref/nix-store/add-fixed.md
diff --git a/doc/manual/src/command-ref/nix-store/add.md b/doc/manual/source/command-ref/nix-store/add.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/add.md
rename to doc/manual/source/command-ref/nix-store/add.md
diff --git a/doc/manual/src/command-ref/nix-store/delete.md b/doc/manual/source/command-ref/nix-store/delete.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/delete.md
rename to doc/manual/source/command-ref/nix-store/delete.md
diff --git a/doc/manual/src/command-ref/nix-store/dump-db.md b/doc/manual/source/command-ref/nix-store/dump-db.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/dump-db.md
rename to doc/manual/source/command-ref/nix-store/dump-db.md
diff --git a/doc/manual/src/command-ref/nix-store/dump.md b/doc/manual/source/command-ref/nix-store/dump.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/dump.md
rename to doc/manual/source/command-ref/nix-store/dump.md
diff --git a/doc/manual/src/command-ref/nix-store/export.md b/doc/manual/source/command-ref/nix-store/export.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/export.md
rename to doc/manual/source/command-ref/nix-store/export.md
diff --git a/doc/manual/src/command-ref/nix-store/gc.md b/doc/manual/source/command-ref/nix-store/gc.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/gc.md
rename to doc/manual/source/command-ref/nix-store/gc.md
diff --git a/doc/manual/src/command-ref/nix-store/generate-binary-cache-key.md b/doc/manual/source/command-ref/nix-store/generate-binary-cache-key.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/generate-binary-cache-key.md
rename to doc/manual/source/command-ref/nix-store/generate-binary-cache-key.md
diff --git a/doc/manual/src/command-ref/nix-store/import.md b/doc/manual/source/command-ref/nix-store/import.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/import.md
rename to doc/manual/source/command-ref/nix-store/import.md
diff --git a/doc/manual/src/command-ref/nix-store/load-db.md b/doc/manual/source/command-ref/nix-store/load-db.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/load-db.md
rename to doc/manual/source/command-ref/nix-store/load-db.md
diff --git a/doc/manual/src/command-ref/nix-store/opt-common.md b/doc/manual/source/command-ref/nix-store/opt-common.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/opt-common.md
rename to doc/manual/source/command-ref/nix-store/opt-common.md
diff --git a/doc/manual/src/command-ref/nix-store/optimise.md b/doc/manual/source/command-ref/nix-store/optimise.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/optimise.md
rename to doc/manual/source/command-ref/nix-store/optimise.md
diff --git a/doc/manual/src/command-ref/nix-store/print-env.md b/doc/manual/source/command-ref/nix-store/print-env.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/print-env.md
rename to doc/manual/source/command-ref/nix-store/print-env.md
diff --git a/doc/manual/src/command-ref/nix-store/query.md b/doc/manual/source/command-ref/nix-store/query.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/query.md
rename to doc/manual/source/command-ref/nix-store/query.md
diff --git a/doc/manual/src/command-ref/nix-store/read-log.md b/doc/manual/source/command-ref/nix-store/read-log.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/read-log.md
rename to doc/manual/source/command-ref/nix-store/read-log.md
diff --git a/doc/manual/src/command-ref/nix-store/realise.md b/doc/manual/source/command-ref/nix-store/realise.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/realise.md
rename to doc/manual/source/command-ref/nix-store/realise.md
diff --git a/doc/manual/src/command-ref/nix-store/repair-path.md b/doc/manual/source/command-ref/nix-store/repair-path.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/repair-path.md
rename to doc/manual/source/command-ref/nix-store/repair-path.md
diff --git a/doc/manual/src/command-ref/nix-store/restore.md b/doc/manual/source/command-ref/nix-store/restore.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/restore.md
rename to doc/manual/source/command-ref/nix-store/restore.md
diff --git a/doc/manual/src/command-ref/nix-store/serve.md b/doc/manual/source/command-ref/nix-store/serve.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/serve.md
rename to doc/manual/source/command-ref/nix-store/serve.md
diff --git a/doc/manual/src/command-ref/nix-store/verify-path.md b/doc/manual/source/command-ref/nix-store/verify-path.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/verify-path.md
rename to doc/manual/source/command-ref/nix-store/verify-path.md
diff --git a/doc/manual/src/command-ref/nix-store/verify.md b/doc/manual/source/command-ref/nix-store/verify.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/verify.md
rename to doc/manual/source/command-ref/nix-store/verify.md
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/source/command-ref/opt-common.md
similarity index 100%
rename from doc/manual/src/command-ref/opt-common.md
rename to doc/manual/source/command-ref/opt-common.md
diff --git a/doc/manual/src/command-ref/status-build-failure.md b/doc/manual/source/command-ref/status-build-failure.md
similarity index 100%
rename from doc/manual/src/command-ref/status-build-failure.md
rename to doc/manual/source/command-ref/status-build-failure.md
diff --git a/doc/manual/src/command-ref/utilities.md b/doc/manual/source/command-ref/utilities.md
similarity index 100%
rename from doc/manual/src/command-ref/utilities.md
rename to doc/manual/source/command-ref/utilities.md
diff --git a/doc/manual/src/development/building.md b/doc/manual/source/development/building.md
similarity index 100%
rename from doc/manual/src/development/building.md
rename to doc/manual/source/development/building.md
diff --git a/doc/manual/src/development/cli-guideline.md b/doc/manual/source/development/cli-guideline.md
similarity index 100%
rename from doc/manual/src/development/cli-guideline.md
rename to doc/manual/source/development/cli-guideline.md
diff --git a/doc/manual/src/development/contributing.md b/doc/manual/source/development/contributing.md
similarity index 100%
rename from doc/manual/src/development/contributing.md
rename to doc/manual/source/development/contributing.md
diff --git a/doc/manual/src/development/cxx.md b/doc/manual/source/development/cxx.md
similarity index 100%
rename from doc/manual/src/development/cxx.md
rename to doc/manual/source/development/cxx.md
diff --git a/doc/manual/src/development/documentation.md b/doc/manual/source/development/documentation.md
similarity index 98%
rename from doc/manual/src/development/documentation.md
rename to doc/manual/source/development/documentation.md
index d5a95e0c1..d51373e7b 100644
--- a/doc/manual/src/development/documentation.md
+++ b/doc/manual/source/development/documentation.md
@@ -35,7 +35,7 @@ In order to reflect changes to the [Makefile for the manual], clear all generate
 [Makefile for the manual]: https://github.com/NixOS/nix/blob/master/doc/manual/local.mk
 
 ```console
-rm $(git ls-files doc/manual/ -o | grep -F '.md') && rmdir doc/manual/src/command-ref/new-cli && make manual-html -j $NIX_BUILD_CORES
+rm $(git ls-files doc/manual/ -o | grep -F '.md') && rmdir doc/manual/source/command-ref/new-cli && make manual-html -j $NIX_BUILD_CORES
 ```
 
 ## Style guide
@@ -182,7 +182,7 @@ Please observe these guidelines to ease reviews:
 
 `@docroot@` provides a base path for links that occur in reusable snippets or other documentation that doesn't have a base path of its own.
 
-If a broken link occurs in a snippet that was inserted into multiple generated files in different directories, use `@docroot@` to reference the `doc/manual/src` directory.
+If a broken link occurs in a snippet that was inserted into multiple generated files in different directories, use `@docroot@` to reference the `doc/manual/source` directory.
 
 If the `@docroot@` literal appears in an error message from the [`mdbook-linkcheck`] tool, the `@docroot@` replacement needs to be applied to the generated source file that mentions it.
 See existing `@docroot@` logic in the [Makefile for the manual].
diff --git a/doc/manual/src/development/experimental-features.md b/doc/manual/source/development/experimental-features.md
similarity index 100%
rename from doc/manual/src/development/experimental-features.md
rename to doc/manual/source/development/experimental-features.md
diff --git a/doc/manual/src/development/index.md b/doc/manual/source/development/index.md
similarity index 100%
rename from doc/manual/src/development/index.md
rename to doc/manual/source/development/index.md
diff --git a/doc/manual/src/development/json-guideline.md b/doc/manual/source/development/json-guideline.md
similarity index 100%
rename from doc/manual/src/development/json-guideline.md
rename to doc/manual/source/development/json-guideline.md
diff --git a/doc/manual/src/development/meson.build b/doc/manual/source/development/meson.build
similarity index 100%
rename from doc/manual/src/development/meson.build
rename to doc/manual/source/development/meson.build
diff --git a/doc/manual/src/development/testing.md b/doc/manual/source/development/testing.md
similarity index 100%
rename from doc/manual/src/development/testing.md
rename to doc/manual/source/development/testing.md
diff --git a/doc/manual/src/favicon.png b/doc/manual/source/favicon.png
similarity index 100%
rename from doc/manual/src/favicon.png
rename to doc/manual/source/favicon.png
diff --git a/doc/manual/src/favicon.svg b/doc/manual/source/favicon.svg
similarity index 100%
rename from doc/manual/src/favicon.svg
rename to doc/manual/source/favicon.svg
diff --git a/doc/manual/src/figures/user-environments.png b/doc/manual/source/figures/user-environments.png
similarity index 100%
rename from doc/manual/src/figures/user-environments.png
rename to doc/manual/source/figures/user-environments.png
diff --git a/doc/manual/src/figures/user-environments.sxd b/doc/manual/source/figures/user-environments.sxd
similarity index 100%
rename from doc/manual/src/figures/user-environments.sxd
rename to doc/manual/source/figures/user-environments.sxd
diff --git a/doc/manual/src/glossary.md b/doc/manual/source/glossary.md
similarity index 100%
rename from doc/manual/src/glossary.md
rename to doc/manual/source/glossary.md
diff --git a/doc/manual/src/installation/building-source.md b/doc/manual/source/installation/building-source.md
similarity index 100%
rename from doc/manual/src/installation/building-source.md
rename to doc/manual/source/installation/building-source.md
diff --git a/doc/manual/src/installation/env-variables.md b/doc/manual/source/installation/env-variables.md
similarity index 100%
rename from doc/manual/src/installation/env-variables.md
rename to doc/manual/source/installation/env-variables.md
diff --git a/doc/manual/src/installation/index.md b/doc/manual/source/installation/index.md
similarity index 100%
rename from doc/manual/src/installation/index.md
rename to doc/manual/source/installation/index.md
diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/source/installation/installing-binary.md
similarity index 100%
rename from doc/manual/src/installation/installing-binary.md
rename to doc/manual/source/installation/installing-binary.md
diff --git a/doc/manual/src/installation/installing-docker.md b/doc/manual/source/installation/installing-docker.md
similarity index 100%
rename from doc/manual/src/installation/installing-docker.md
rename to doc/manual/source/installation/installing-docker.md
diff --git a/doc/manual/src/installation/installing-source.md b/doc/manual/source/installation/installing-source.md
similarity index 100%
rename from doc/manual/src/installation/installing-source.md
rename to doc/manual/source/installation/installing-source.md
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/source/installation/multi-user.md
similarity index 100%
rename from doc/manual/src/installation/multi-user.md
rename to doc/manual/source/installation/multi-user.md
diff --git a/doc/manual/src/installation/nix-security.md b/doc/manual/source/installation/nix-security.md
similarity index 100%
rename from doc/manual/src/installation/nix-security.md
rename to doc/manual/source/installation/nix-security.md
diff --git a/doc/manual/src/installation/obtaining-source.md b/doc/manual/source/installation/obtaining-source.md
similarity index 100%
rename from doc/manual/src/installation/obtaining-source.md
rename to doc/manual/source/installation/obtaining-source.md
diff --git a/doc/manual/src/installation/prerequisites-source.md b/doc/manual/source/installation/prerequisites-source.md
similarity index 100%
rename from doc/manual/src/installation/prerequisites-source.md
rename to doc/manual/source/installation/prerequisites-source.md
diff --git a/doc/manual/src/installation/single-user.md b/doc/manual/source/installation/single-user.md
similarity index 100%
rename from doc/manual/src/installation/single-user.md
rename to doc/manual/source/installation/single-user.md
diff --git a/doc/manual/src/installation/supported-platforms.md b/doc/manual/source/installation/supported-platforms.md
similarity index 100%
rename from doc/manual/src/installation/supported-platforms.md
rename to doc/manual/source/installation/supported-platforms.md
diff --git a/doc/manual/src/installation/uninstall.md b/doc/manual/source/installation/uninstall.md
similarity index 100%
rename from doc/manual/src/installation/uninstall.md
rename to doc/manual/source/installation/uninstall.md
diff --git a/doc/manual/src/installation/upgrading.md b/doc/manual/source/installation/upgrading.md
similarity index 100%
rename from doc/manual/src/installation/upgrading.md
rename to doc/manual/source/installation/upgrading.md
diff --git a/doc/manual/src/introduction.md b/doc/manual/source/introduction.md
similarity index 100%
rename from doc/manual/src/introduction.md
rename to doc/manual/source/introduction.md
diff --git a/doc/manual/src/language/advanced-attributes.md b/doc/manual/source/language/advanced-attributes.md
similarity index 100%
rename from doc/manual/src/language/advanced-attributes.md
rename to doc/manual/source/language/advanced-attributes.md
diff --git a/doc/manual/src/language/builtins-prefix.md b/doc/manual/source/language/builtins-prefix.md
similarity index 100%
rename from doc/manual/src/language/builtins-prefix.md
rename to doc/manual/source/language/builtins-prefix.md
diff --git a/doc/manual/src/language/builtins-suffix.md b/doc/manual/source/language/builtins-suffix.md
similarity index 100%
rename from doc/manual/src/language/builtins-suffix.md
rename to doc/manual/source/language/builtins-suffix.md
diff --git a/doc/manual/src/language/constructs.md b/doc/manual/source/language/constructs.md
similarity index 100%
rename from doc/manual/src/language/constructs.md
rename to doc/manual/source/language/constructs.md
diff --git a/doc/manual/src/language/constructs/lookup-path.md b/doc/manual/source/language/constructs/lookup-path.md
similarity index 100%
rename from doc/manual/src/language/constructs/lookup-path.md
rename to doc/manual/source/language/constructs/lookup-path.md
diff --git a/doc/manual/src/language/derivations.md b/doc/manual/source/language/derivations.md
similarity index 100%
rename from doc/manual/src/language/derivations.md
rename to doc/manual/source/language/derivations.md
diff --git a/doc/manual/src/language/identifiers.md b/doc/manual/source/language/identifiers.md
similarity index 100%
rename from doc/manual/src/language/identifiers.md
rename to doc/manual/source/language/identifiers.md
diff --git a/doc/manual/src/language/import-from-derivation.md b/doc/manual/source/language/import-from-derivation.md
similarity index 100%
rename from doc/manual/src/language/import-from-derivation.md
rename to doc/manual/source/language/import-from-derivation.md
diff --git a/doc/manual/src/language/index.md b/doc/manual/source/language/index.md
similarity index 100%
rename from doc/manual/src/language/index.md
rename to doc/manual/source/language/index.md
diff --git a/doc/manual/src/language/meson.build b/doc/manual/source/language/meson.build
similarity index 100%
rename from doc/manual/src/language/meson.build
rename to doc/manual/source/language/meson.build
diff --git a/doc/manual/src/language/operators.md b/doc/manual/source/language/operators.md
similarity index 100%
rename from doc/manual/src/language/operators.md
rename to doc/manual/source/language/operators.md
diff --git a/doc/manual/src/language/scope.md b/doc/manual/source/language/scope.md
similarity index 100%
rename from doc/manual/src/language/scope.md
rename to doc/manual/source/language/scope.md
diff --git a/doc/manual/src/language/string-context.md b/doc/manual/source/language/string-context.md
similarity index 100%
rename from doc/manual/src/language/string-context.md
rename to doc/manual/source/language/string-context.md
diff --git a/doc/manual/src/language/string-interpolation.md b/doc/manual/source/language/string-interpolation.md
similarity index 100%
rename from doc/manual/src/language/string-interpolation.md
rename to doc/manual/source/language/string-interpolation.md
diff --git a/doc/manual/src/language/string-literals.md b/doc/manual/source/language/string-literals.md
similarity index 100%
rename from doc/manual/src/language/string-literals.md
rename to doc/manual/source/language/string-literals.md
diff --git a/doc/manual/src/language/syntax.md b/doc/manual/source/language/syntax.md
similarity index 100%
rename from doc/manual/src/language/syntax.md
rename to doc/manual/source/language/syntax.md
diff --git a/doc/manual/src/language/types.md b/doc/manual/source/language/types.md
similarity index 100%
rename from doc/manual/src/language/types.md
rename to doc/manual/source/language/types.md
diff --git a/doc/manual/src/language/values.md b/doc/manual/source/language/values.md
similarity index 100%
rename from doc/manual/src/language/values.md
rename to doc/manual/source/language/values.md
diff --git a/doc/manual/src/language/variables.md b/doc/manual/source/language/variables.md
similarity index 100%
rename from doc/manual/src/language/variables.md
rename to doc/manual/source/language/variables.md
diff --git a/doc/manual/src/meson.build b/doc/manual/source/meson.build
similarity index 100%
rename from doc/manual/src/meson.build
rename to doc/manual/source/meson.build
diff --git a/doc/manual/src/package-management/binary-cache-substituter.md b/doc/manual/source/package-management/binary-cache-substituter.md
similarity index 100%
rename from doc/manual/src/package-management/binary-cache-substituter.md
rename to doc/manual/source/package-management/binary-cache-substituter.md
diff --git a/doc/manual/src/package-management/garbage-collection.md b/doc/manual/source/package-management/garbage-collection.md
similarity index 100%
rename from doc/manual/src/package-management/garbage-collection.md
rename to doc/manual/source/package-management/garbage-collection.md
diff --git a/doc/manual/src/package-management/garbage-collector-roots.md b/doc/manual/source/package-management/garbage-collector-roots.md
similarity index 100%
rename from doc/manual/src/package-management/garbage-collector-roots.md
rename to doc/manual/source/package-management/garbage-collector-roots.md
diff --git a/doc/manual/src/package-management/index.md b/doc/manual/source/package-management/index.md
similarity index 100%
rename from doc/manual/src/package-management/index.md
rename to doc/manual/source/package-management/index.md
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/source/package-management/profiles.md
similarity index 100%
rename from doc/manual/src/package-management/profiles.md
rename to doc/manual/source/package-management/profiles.md
diff --git a/doc/manual/src/package-management/sharing-packages.md b/doc/manual/source/package-management/sharing-packages.md
similarity index 100%
rename from doc/manual/src/package-management/sharing-packages.md
rename to doc/manual/source/package-management/sharing-packages.md
diff --git a/doc/manual/src/package-management/ssh-substituter.md b/doc/manual/source/package-management/ssh-substituter.md
similarity index 100%
rename from doc/manual/src/package-management/ssh-substituter.md
rename to doc/manual/source/package-management/ssh-substituter.md
diff --git a/doc/manual/src/protocols/derivation-aterm.md b/doc/manual/source/protocols/derivation-aterm.md
similarity index 100%
rename from doc/manual/src/protocols/derivation-aterm.md
rename to doc/manual/source/protocols/derivation-aterm.md
diff --git a/doc/manual/src/protocols/index.md b/doc/manual/source/protocols/index.md
similarity index 100%
rename from doc/manual/src/protocols/index.md
rename to doc/manual/source/protocols/index.md
diff --git a/doc/manual/src/protocols/json/derivation.md b/doc/manual/source/protocols/json/derivation.md
similarity index 100%
rename from doc/manual/src/protocols/json/derivation.md
rename to doc/manual/source/protocols/json/derivation.md
diff --git a/doc/manual/src/protocols/json/index.md b/doc/manual/source/protocols/json/index.md
similarity index 100%
rename from doc/manual/src/protocols/json/index.md
rename to doc/manual/source/protocols/json/index.md
diff --git a/doc/manual/src/protocols/json/store-object-info.md b/doc/manual/source/protocols/json/store-object-info.md
similarity index 100%
rename from doc/manual/src/protocols/json/store-object-info.md
rename to doc/manual/source/protocols/json/store-object-info.md
diff --git a/doc/manual/src/protocols/nix-archive.md b/doc/manual/source/protocols/nix-archive.md
similarity index 100%
rename from doc/manual/src/protocols/nix-archive.md
rename to doc/manual/source/protocols/nix-archive.md
diff --git a/doc/manual/src/protocols/store-path.md b/doc/manual/source/protocols/store-path.md
similarity index 100%
rename from doc/manual/src/protocols/store-path.md
rename to doc/manual/source/protocols/store-path.md
diff --git a/doc/manual/src/protocols/tarball-fetcher.md b/doc/manual/source/protocols/tarball-fetcher.md
similarity index 100%
rename from doc/manual/src/protocols/tarball-fetcher.md
rename to doc/manual/source/protocols/tarball-fetcher.md
diff --git a/doc/manual/src/quick-start.md b/doc/manual/source/quick-start.md
similarity index 100%
rename from doc/manual/src/quick-start.md
rename to doc/manual/source/quick-start.md
diff --git a/doc/manual/src/release-notes/index.md b/doc/manual/source/release-notes/index.md
similarity index 100%
rename from doc/manual/src/release-notes/index.md
rename to doc/manual/source/release-notes/index.md
diff --git a/doc/manual/src/release-notes/meson.build b/doc/manual/source/release-notes/meson.build
similarity index 100%
rename from doc/manual/src/release-notes/meson.build
rename to doc/manual/source/release-notes/meson.build
diff --git a/doc/manual/src/release-notes/rl-0.10.1.md b/doc/manual/source/release-notes/rl-0.10.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.10.1.md
rename to doc/manual/source/release-notes/rl-0.10.1.md
diff --git a/doc/manual/src/release-notes/rl-0.10.md b/doc/manual/source/release-notes/rl-0.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.10.md
rename to doc/manual/source/release-notes/rl-0.10.md
diff --git a/doc/manual/src/release-notes/rl-0.11.md b/doc/manual/source/release-notes/rl-0.11.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.11.md
rename to doc/manual/source/release-notes/rl-0.11.md
diff --git a/doc/manual/src/release-notes/rl-0.12.md b/doc/manual/source/release-notes/rl-0.12.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.12.md
rename to doc/manual/source/release-notes/rl-0.12.md
diff --git a/doc/manual/src/release-notes/rl-0.13.md b/doc/manual/source/release-notes/rl-0.13.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.13.md
rename to doc/manual/source/release-notes/rl-0.13.md
diff --git a/doc/manual/src/release-notes/rl-0.14.md b/doc/manual/source/release-notes/rl-0.14.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.14.md
rename to doc/manual/source/release-notes/rl-0.14.md
diff --git a/doc/manual/src/release-notes/rl-0.15.md b/doc/manual/source/release-notes/rl-0.15.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.15.md
rename to doc/manual/source/release-notes/rl-0.15.md
diff --git a/doc/manual/src/release-notes/rl-0.16.md b/doc/manual/source/release-notes/rl-0.16.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.16.md
rename to doc/manual/source/release-notes/rl-0.16.md
diff --git a/doc/manual/src/release-notes/rl-0.5.md b/doc/manual/source/release-notes/rl-0.5.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.5.md
rename to doc/manual/source/release-notes/rl-0.5.md
diff --git a/doc/manual/src/release-notes/rl-0.6.md b/doc/manual/source/release-notes/rl-0.6.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.6.md
rename to doc/manual/source/release-notes/rl-0.6.md
diff --git a/doc/manual/src/release-notes/rl-0.7.md b/doc/manual/source/release-notes/rl-0.7.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.7.md
rename to doc/manual/source/release-notes/rl-0.7.md
diff --git a/doc/manual/src/release-notes/rl-0.8.1.md b/doc/manual/source/release-notes/rl-0.8.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.8.1.md
rename to doc/manual/source/release-notes/rl-0.8.1.md
diff --git a/doc/manual/src/release-notes/rl-0.8.md b/doc/manual/source/release-notes/rl-0.8.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.8.md
rename to doc/manual/source/release-notes/rl-0.8.md
diff --git a/doc/manual/src/release-notes/rl-0.9.1.md b/doc/manual/source/release-notes/rl-0.9.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.9.1.md
rename to doc/manual/source/release-notes/rl-0.9.1.md
diff --git a/doc/manual/src/release-notes/rl-0.9.2.md b/doc/manual/source/release-notes/rl-0.9.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.9.2.md
rename to doc/manual/source/release-notes/rl-0.9.2.md
diff --git a/doc/manual/src/release-notes/rl-0.9.md b/doc/manual/source/release-notes/rl-0.9.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.9.md
rename to doc/manual/source/release-notes/rl-0.9.md
diff --git a/doc/manual/src/release-notes/rl-1.0.md b/doc/manual/source/release-notes/rl-1.0.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.0.md
rename to doc/manual/source/release-notes/rl-1.0.md
diff --git a/doc/manual/src/release-notes/rl-1.1.md b/doc/manual/source/release-notes/rl-1.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.1.md
rename to doc/manual/source/release-notes/rl-1.1.md
diff --git a/doc/manual/src/release-notes/rl-1.10.md b/doc/manual/source/release-notes/rl-1.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.10.md
rename to doc/manual/source/release-notes/rl-1.10.md
diff --git a/doc/manual/src/release-notes/rl-1.11.10.md b/doc/manual/source/release-notes/rl-1.11.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.11.10.md
rename to doc/manual/source/release-notes/rl-1.11.10.md
diff --git a/doc/manual/src/release-notes/rl-1.11.md b/doc/manual/source/release-notes/rl-1.11.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.11.md
rename to doc/manual/source/release-notes/rl-1.11.md
diff --git a/doc/manual/src/release-notes/rl-1.2.md b/doc/manual/source/release-notes/rl-1.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.2.md
rename to doc/manual/source/release-notes/rl-1.2.md
diff --git a/doc/manual/src/release-notes/rl-1.3.md b/doc/manual/source/release-notes/rl-1.3.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.3.md
rename to doc/manual/source/release-notes/rl-1.3.md
diff --git a/doc/manual/src/release-notes/rl-1.4.md b/doc/manual/source/release-notes/rl-1.4.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.4.md
rename to doc/manual/source/release-notes/rl-1.4.md
diff --git a/doc/manual/src/release-notes/rl-1.5.1.md b/doc/manual/source/release-notes/rl-1.5.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.5.1.md
rename to doc/manual/source/release-notes/rl-1.5.1.md
diff --git a/doc/manual/src/release-notes/rl-1.5.2.md b/doc/manual/source/release-notes/rl-1.5.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.5.2.md
rename to doc/manual/source/release-notes/rl-1.5.2.md
diff --git a/doc/manual/src/release-notes/rl-1.5.md b/doc/manual/source/release-notes/rl-1.5.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.5.md
rename to doc/manual/source/release-notes/rl-1.5.md
diff --git a/doc/manual/src/release-notes/rl-1.6.1.md b/doc/manual/source/release-notes/rl-1.6.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.6.1.md
rename to doc/manual/source/release-notes/rl-1.6.1.md
diff --git a/doc/manual/src/release-notes/rl-1.6.md b/doc/manual/source/release-notes/rl-1.6.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.6.md
rename to doc/manual/source/release-notes/rl-1.6.md
diff --git a/doc/manual/src/release-notes/rl-1.7.md b/doc/manual/source/release-notes/rl-1.7.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.7.md
rename to doc/manual/source/release-notes/rl-1.7.md
diff --git a/doc/manual/src/release-notes/rl-1.8.md b/doc/manual/source/release-notes/rl-1.8.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.8.md
rename to doc/manual/source/release-notes/rl-1.8.md
diff --git a/doc/manual/src/release-notes/rl-1.9.md b/doc/manual/source/release-notes/rl-1.9.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.9.md
rename to doc/manual/source/release-notes/rl-1.9.md
diff --git a/doc/manual/src/release-notes/rl-2.0.md b/doc/manual/source/release-notes/rl-2.0.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.0.md
rename to doc/manual/source/release-notes/rl-2.0.md
diff --git a/doc/manual/src/release-notes/rl-2.1.md b/doc/manual/source/release-notes/rl-2.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.1.md
rename to doc/manual/source/release-notes/rl-2.1.md
diff --git a/doc/manual/src/release-notes/rl-2.10.md b/doc/manual/source/release-notes/rl-2.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.10.md
rename to doc/manual/source/release-notes/rl-2.10.md
diff --git a/doc/manual/src/release-notes/rl-2.11.md b/doc/manual/source/release-notes/rl-2.11.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.11.md
rename to doc/manual/source/release-notes/rl-2.11.md
diff --git a/doc/manual/src/release-notes/rl-2.12.md b/doc/manual/source/release-notes/rl-2.12.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.12.md
rename to doc/manual/source/release-notes/rl-2.12.md
diff --git a/doc/manual/src/release-notes/rl-2.13.md b/doc/manual/source/release-notes/rl-2.13.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.13.md
rename to doc/manual/source/release-notes/rl-2.13.md
diff --git a/doc/manual/src/release-notes/rl-2.14.md b/doc/manual/source/release-notes/rl-2.14.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.14.md
rename to doc/manual/source/release-notes/rl-2.14.md
diff --git a/doc/manual/src/release-notes/rl-2.15.md b/doc/manual/source/release-notes/rl-2.15.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.15.md
rename to doc/manual/source/release-notes/rl-2.15.md
diff --git a/doc/manual/src/release-notes/rl-2.16.md b/doc/manual/source/release-notes/rl-2.16.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.16.md
rename to doc/manual/source/release-notes/rl-2.16.md
diff --git a/doc/manual/src/release-notes/rl-2.17.md b/doc/manual/source/release-notes/rl-2.17.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.17.md
rename to doc/manual/source/release-notes/rl-2.17.md
diff --git a/doc/manual/src/release-notes/rl-2.18.md b/doc/manual/source/release-notes/rl-2.18.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.18.md
rename to doc/manual/source/release-notes/rl-2.18.md
diff --git a/doc/manual/src/release-notes/rl-2.19.md b/doc/manual/source/release-notes/rl-2.19.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.19.md
rename to doc/manual/source/release-notes/rl-2.19.md
diff --git a/doc/manual/src/release-notes/rl-2.2.md b/doc/manual/source/release-notes/rl-2.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.2.md
rename to doc/manual/source/release-notes/rl-2.2.md
diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/source/release-notes/rl-2.20.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.20.md
rename to doc/manual/source/release-notes/rl-2.20.md
diff --git a/doc/manual/src/release-notes/rl-2.21.md b/doc/manual/source/release-notes/rl-2.21.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.21.md
rename to doc/manual/source/release-notes/rl-2.21.md
diff --git a/doc/manual/src/release-notes/rl-2.22.md b/doc/manual/source/release-notes/rl-2.22.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.22.md
rename to doc/manual/source/release-notes/rl-2.22.md
diff --git a/doc/manual/src/release-notes/rl-2.23.md b/doc/manual/source/release-notes/rl-2.23.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.23.md
rename to doc/manual/source/release-notes/rl-2.23.md
diff --git a/doc/manual/src/release-notes/rl-2.24.md b/doc/manual/source/release-notes/rl-2.24.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.24.md
rename to doc/manual/source/release-notes/rl-2.24.md
diff --git a/doc/manual/src/release-notes/rl-2.3.md b/doc/manual/source/release-notes/rl-2.3.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.3.md
rename to doc/manual/source/release-notes/rl-2.3.md
diff --git a/doc/manual/src/release-notes/rl-2.4.md b/doc/manual/source/release-notes/rl-2.4.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.4.md
rename to doc/manual/source/release-notes/rl-2.4.md
diff --git a/doc/manual/src/release-notes/rl-2.5.md b/doc/manual/source/release-notes/rl-2.5.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.5.md
rename to doc/manual/source/release-notes/rl-2.5.md
diff --git a/doc/manual/src/release-notes/rl-2.6.md b/doc/manual/source/release-notes/rl-2.6.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.6.md
rename to doc/manual/source/release-notes/rl-2.6.md
diff --git a/doc/manual/src/release-notes/rl-2.7.md b/doc/manual/source/release-notes/rl-2.7.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.7.md
rename to doc/manual/source/release-notes/rl-2.7.md
diff --git a/doc/manual/src/release-notes/rl-2.8.md b/doc/manual/source/release-notes/rl-2.8.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.8.md
rename to doc/manual/source/release-notes/rl-2.8.md
diff --git a/doc/manual/src/release-notes/rl-2.9.md b/doc/manual/source/release-notes/rl-2.9.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.9.md
rename to doc/manual/source/release-notes/rl-2.9.md
diff --git a/doc/manual/src/store/file-system-object.md b/doc/manual/source/store/file-system-object.md
similarity index 100%
rename from doc/manual/src/store/file-system-object.md
rename to doc/manual/source/store/file-system-object.md
diff --git a/doc/manual/src/store/file-system-object/content-address.md b/doc/manual/source/store/file-system-object/content-address.md
similarity index 100%
rename from doc/manual/src/store/file-system-object/content-address.md
rename to doc/manual/source/store/file-system-object/content-address.md
diff --git a/doc/manual/src/store/index.md b/doc/manual/source/store/index.md
similarity index 100%
rename from doc/manual/src/store/index.md
rename to doc/manual/source/store/index.md
diff --git a/doc/manual/src/store/meson.build b/doc/manual/source/store/meson.build
similarity index 100%
rename from doc/manual/src/store/meson.build
rename to doc/manual/source/store/meson.build
diff --git a/doc/manual/src/store/store-object.md b/doc/manual/source/store/store-object.md
similarity index 100%
rename from doc/manual/src/store/store-object.md
rename to doc/manual/source/store/store-object.md
diff --git a/doc/manual/src/store/store-object/content-address.md b/doc/manual/source/store/store-object/content-address.md
similarity index 100%
rename from doc/manual/src/store/store-object/content-address.md
rename to doc/manual/source/store/store-object/content-address.md
diff --git a/doc/manual/src/store/store-path.md b/doc/manual/source/store/store-path.md
similarity index 100%
rename from doc/manual/src/store/store-path.md
rename to doc/manual/source/store/store-path.md
diff --git a/doc/manual/src/store/types/index.md.in b/doc/manual/source/store/types/index.md.in
similarity index 100%
rename from doc/manual/src/store/types/index.md.in
rename to doc/manual/source/store/types/index.md.in
diff --git a/doc/manual/substitute.py b/doc/manual/substitute.py
index 52cef4fa0..a8b11d932 100644
--- a/doc/manual/substitute.py
+++ b/doc/manual/substitute.py
@@ -80,7 +80,7 @@ def main() -> None:
     if len(sys.argv) > 1 and sys.argv[1] == 'summary':
         print(do_include(
                         sys.stdin.read(),
-                        Path('src/SUMMARY.md'),
+                        Path('source/SUMMARY.md'),
                         Path(sys.argv[2]).resolve(),
                         search_path))
         return
@@ -92,7 +92,7 @@ def main() -> None:
 
     context, book = json.load(sys.stdin)
 
-    # book_root is the directory where book contents leave (ie, src/)
+    # book_root is the directory where book contents leave (ie, source/)
     book_root = Path(context['root']) / context['config']['book']['src']
 
     # Find @var@ in all parts of our recursive book structure.
diff --git a/maintainers/release-notes b/maintainers/release-notes
index c0c4ee734..0cdcd517b 100755
--- a/maintainers/release-notes
+++ b/maintainers/release-notes
@@ -78,7 +78,7 @@ if ! git diff --quiet --cached; then
   die "repo has staged changes, please commit or stash them"
 fi
 
-if ! grep "$SUMMARY_MARKER_LINE" doc/manual/src/SUMMARY.md.in >/dev/null; then
+if ! grep "$SUMMARY_MARKER_LINE" doc/manual/source/SUMMARY.md.in >/dev/null; then
   # would have been nice to catch this early, but won't be worth the extra infra
   die "SUMMARY.md.in is missing the marker line '$SUMMARY_MARKER_LINE', which would be used for inserting a new release notes page. Please fix the script."
 fi
@@ -117,7 +117,7 @@ log "version_full=$version_full"
 log "IS_PATCH=$IS_PATCH"
 
 basename=rl-${version_major_minor}.md
-file=doc/manual/src/release-notes/$basename
+file=doc/manual/source/release-notes/$basename
 
 if ! $IS_PATCH; then
   if [[ -e $file ]]; then
@@ -169,7 +169,7 @@ if ! $IS_PATCH; then
   # find the marker line, insert new link after it
   escaped_marker="$(echo "$SUMMARY_MARKER_LINE" | sed -e 's/\//\\\//g' -e 's/ /\\ /g')"
   escaped_line="$(echo "$NEW_SUMMARY_LINE" | sed -e 's/\//\\\//g' -e 's/ /\\ /g')"
-  logcmd sed -i -e "/$escaped_marker/a $escaped_line" doc/manual/src/SUMMARY.md.in
+  logcmd sed -i -e "/$escaped_marker/a $escaped_line" doc/manual/source/SUMMARY.md.in
 fi
 
 for f in doc/manual/rl-next/*.md; do
@@ -178,7 +178,7 @@ for f in doc/manual/rl-next/*.md; do
   fi
 done
 
-logcmd git add $file doc/manual/src/SUMMARY.md.in
+logcmd git add $file doc/manual/source/SUMMARY.md.in
 logcmd git status
 logcmd git commit -m "release notes: $version_full"
 
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index e3e3a4c9b..ec7a771a2 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -3068,7 +3068,7 @@ bool LocalDerivationGoal::isReadDesc(int fd)
 StorePath LocalDerivationGoal::makeFallbackPath(OutputNameView outputName)
 {
     // This is a bogus path type, constructed this way to ensure that it doesn't collide with any other store path
-    // See doc/manual/src/protocols/store-path.md for details
+    // See doc/manual/source/protocols/store-path.md for details
     // TODO: We may want to separate the responsibilities of constructing the path fingerprint and of actually doing the hashing
     auto pathType = "rewrite:" + std::string(drvPath.to_string()) + ":name:" + std::string(outputName);
     return worker.store.makeStorePath(
@@ -3081,7 +3081,7 @@ StorePath LocalDerivationGoal::makeFallbackPath(OutputNameView outputName)
 StorePath LocalDerivationGoal::makeFallbackPath(const StorePath & path)
 {
     // This is a bogus path type, constructed this way to ensure that it doesn't collide with any other store path
-    // See doc/manual/src/protocols/store-path.md for details
+    // See doc/manual/source/protocols/store-path.md for details
     auto pathType = "rewrite:" + std::string(drvPath.to_string()) + ":" + std::string(path.to_string());
     return worker.store.makeStorePath(
         pathType,
diff --git a/src/nix/help-stores.md b/src/nix/help-stores.md
index 5c5624f5e..ff9d39c50 120000
--- a/src/nix/help-stores.md
+++ b/src/nix/help-stores.md
@@ -1 +1 @@
-../../doc/manual/src/store/types/index.md.in
\ No newline at end of file
+../../doc/manual/source/store/types/index.md.in
\ No newline at end of file
diff --git a/src/nix/package.nix b/src/nix/package.nix
index 3e19c6dca..ee640ab54 100644
--- a/src/nix/package.nix
+++ b/src/nix/package.nix
@@ -66,9 +66,9 @@ mkMesonDerivation (finalAttrs: {
     ../nix-env/buildenv.nix
     ./get-env.sh
     ./help-stores.md
-    ../../doc/manual/src/store/types/index.md.in
+    ../../doc/manual/source/store/types/index.md.in
     ./profiles.md
-    ../../doc/manual/src/command-ref/files/profiles.md
+    ../../doc/manual/source/command-ref/files/profiles.md
 
     # Files
   ] ++ lib.concatMap
diff --git a/src/nix/profiles.md b/src/nix/profiles.md
index c67a86194..f65e71065 120000
--- a/src/nix/profiles.md
+++ b/src/nix/profiles.md
@@ -1 +1 @@
-../../doc/manual/src/command-ref/files/profiles.md
\ No newline at end of file
+../../doc/manual/source/command-ref/files/profiles.md
\ No newline at end of file
diff --git a/tests/functional/check.sh b/tests/functional/check.sh
index 9b15dccb6..23e3d2ff0 100755
--- a/tests/functional/check.sh
+++ b/tests/functional/check.sh
@@ -23,7 +23,7 @@ nix-build dependencies.nix --no-out-link
 nix-build dependencies.nix --no-out-link --check
 
 # Build failure exit codes (100, 104, etc.) are from
-# doc/manual/src/command-ref/status-build-failure.md
+# doc/manual/source/command-ref/status-build-failure.md
 
 # check for dangling temporary build directories
 # only retain if build fails and --keep-failed is specified, or...
diff --git a/tests/functional/common/functions.sh b/tests/functional/common/functions.sh
index d05fac4e7..7195149cb 100644
--- a/tests/functional/common/functions.sh
+++ b/tests/functional/common/functions.sh
@@ -28,7 +28,7 @@ clearProfiles() {
 
 # Clear the store, but do not fail if we're in an environment where we can't.
 # This allows the test to run in a NixOS test environment, where we use the system store.
-# See doc/manual/src/contributing/testing.md / Running functional tests on NixOS.
+# See doc/manual/source/contributing/testing.md / Running functional tests on NixOS.
 clearStoreIfPossible() {
     if isTestOnNixOS; then
         echo "clearStoreIfPossible: Not clearing store, because we're on NixOS. Moving on."
diff --git a/tests/functional/linux-sandbox.sh b/tests/functional/linux-sandbox.sh
index 653a3873f..1fc89f8ae 100755
--- a/tests/functional/linux-sandbox.sh
+++ b/tests/functional/linux-sandbox.sh
@@ -40,13 +40,13 @@ nix-sandbox-build dependencies.nix --check
 # Test that sandboxed builds with --check and -K can move .check directory to store
 nix-sandbox-build check.nix -A nondeterministic
 
-# `100 + 4` means non-determinstic, see doc/manual/src/command-ref/status-build-failure.md
+# `100 + 4` means non-determinstic, see doc/manual/source/command-ref/status-build-failure.md
 expectStderr 104 nix-sandbox-build check.nix -A nondeterministic --check -K > $TEST_ROOT/log
 grepQuietInverse 'error: renaming' $TEST_ROOT/log
 grepQuiet 'may not be deterministic' $TEST_ROOT/log
 
 # Test that sandboxed builds cannot write to /etc easily
-# `100` means build failure without extra info, see doc/manual/src/command-ref/status-build-failure.md
+# `100` means build failure without extra info, see doc/manual/source/command-ref/status-build-failure.md
 expectStderr 100 nix-sandbox-build -E 'with import ./config.nix; mkDerivation { name = "etc-write"; buildCommand = "echo > /etc/test"; }' |
     grepQuiet "/etc/test: Permission denied"
 
@@ -56,7 +56,7 @@ testCert () {
     expectation=$1 # "missing" | "present"
     mode=$2        # "normal" | "fixed-output"
     certFile=$3    # a string that can be the path to a cert file
-    # `100` means build failure without extra info, see doc/manual/src/command-ref/status-build-failure.md
+    # `100` means build failure without extra info, see doc/manual/source/command-ref/status-build-failure.md
     [ "$mode" == fixed-output ] && ret=1 || ret=100
     expectStderr $ret nix-sandbox-build linux-sandbox-cert-test.nix --argstr mode "$mode" --option ssl-cert-file "$certFile" |
         grepQuiet "CERT_${expectation}_IN_SANDBOX"

From 379ada42bc00e3b6d0f18e1ca57d31d4fd4ee67c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 Oct 2024 12:05:26 -0400
Subject: [PATCH 03/43] Make the subproject dir `src` again

We got rid of this in c7ec33605e8c2dff0ebe40e4a1beba7a98530432 because
of bug https://github.com/mesonbuild/meson/issues/13774, but in the
previous commit we renamed the manual source directory, which avoids it.
Now we can change it back.
---
 meson.build | 1 +
 subprojects | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 120000 subprojects

diff --git a/meson.build b/meson.build
index 636d38b08..97704d170 100644
--- a/meson.build
+++ b/meson.build
@@ -3,6 +3,7 @@
 
 project('nix-dev-shell', 'cpp',
   version : files('.version'),
+  subproject_dir : 'src',
   default_options : [
     'localstatedir=/nix/var',
   ]
diff --git a/subprojects b/subprojects
deleted file mode 120000
index e8310385c..000000000
--- a/subprojects
+++ /dev/null
@@ -1 +0,0 @@
-src
\ No newline at end of file

From e33d6f24e3267ae72dfbaa9fa45051460541afc0 Mon Sep 17 00:00:00 2001
From: Ivan Tkachev <itkachev@hyperad.tech>
Date: Wed, 16 Oct 2024 15:24:33 +0300
Subject: [PATCH 04/43] #11704

---
 src/nix/run.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nix/run.cc b/src/nix/run.cc
index 956563591..c9857e13e 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -167,10 +167,9 @@ void chrootHelper(int argc, char * * argv)
     /* Bind-mount realStoreDir on /nix/store. If the latter mount
        point doesn't already exists, we have to create a chroot
        environment containing the mount point and bind mounts for the
-       children of /. Would be nice if we could use overlayfs here,
-       but that doesn't work in a user namespace yet (Ubuntu has a
-       patch for this:
-       https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1478578). */
+       children of /.
+       Overlayfs for user namespaces is fixed in Linux since ac519625ed
+       (v5.11, 14 February 2021) */
     if (!pathExists(storeDir)) {
         // FIXME: Use overlayfs?
 
@@ -206,8 +205,9 @@ void chrootHelper(int argc, char * * argv)
         if (chdir(cwd) == -1)
             throw SysError("chdir to '%s' in chroot", cwd);
     } else
-        if (mount(realStoreDir.c_str(), storeDir.c_str(), "", MS_BIND, 0) == -1)
-            throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
+        if (mount("overlay", storeDir.c_str(), "overlay", MS_MGC_VAL, fmt("lowerdir=%s:%s", storeDir, realStoreDir).c_str()) == -1)
+            if (mount(realStoreDir.c_str(), storeDir.c_str(), "", MS_BIND, 0) == -1)
+                throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
 
     writeFile(fs::path{"/proc/self/setgroups"}, "deny");
     writeFile(fs::path{"/proc/self/uid_map"}, fmt("%d %d %d", uid, uid, 1));

From 781ff7672e344c97d946b45db1bebaf85e2e92f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Oct 2024 17:18:07 +0200
Subject: [PATCH 05/43] Add test

---
 tests/functional/fetchPath.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/functional/fetchPath.sh b/tests/functional/fetchPath.sh
index 560a270c1..1df895b61 100755
--- a/tests/functional/fetchPath.sh
+++ b/tests/functional/fetchPath.sh
@@ -6,3 +6,6 @@ touch "$TEST_ROOT/foo" -t 202211111111
 # We only check whether 2022-11-1* **:**:** is the last modified date since
 # `lastModified` is transformed into UTC in `builtins.fetchTarball`.
 [[ "$(nix eval --impure --raw --expr "(builtins.fetchTree \"path://$TEST_ROOT/foo\").lastModifiedDate")" =~ 2022111.* ]]
+
+# Check that we can override lastModified for "path:" inputs.
+[[ "$(nix eval --impure --expr "(builtins.fetchTree { type = \"path\"; path = \"$TEST_ROOT/foo\"; lastModified = 123; }).lastModified")" = 123 ]]

From 0e5a5303ad29b62c2acb405cd18097cae0d93ce8 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 10 Oct 2024 12:31:34 +0200
Subject: [PATCH 06/43] fix: Ignore Interrupted in recursive-nix daemon worker

Otherwise, if checkInterrupt() in any of the supported store operations
would catch onto a user interrupt, the exception would bubble to the thread
start and be handled by std::terminate(): a crash.
---
 src/libstore/unix/build/local-derivation-goal.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index 0eda8455f..394eab875 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -65,6 +65,7 @@
 #include <iostream>
 
 #include "strings.hh"
+#include "signals.hh"
 
 namespace nix {
 
@@ -1579,6 +1580,8 @@ void LocalDerivationGoal::startDaemon()
                         FdSink(remote.get()),
                         NotTrusted, daemon::Recursive);
                     debug("terminated daemon connection");
+                } catch (const Interrupted &) {
+                    debug("interrupted daemon connection");
                 } catch (SystemError &) {
                     ignoreExceptionExceptInterrupt();
                 }

From de41e4617523f9355fb896edcf77cc777d45b564 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 10 Oct 2024 12:38:26 +0200
Subject: [PATCH 07/43] Document recursive-nix startDaemon/stopDaemon

---
 src/libstore/unix/build/local-derivation-goal.hh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/src/libstore/unix/build/local-derivation-goal.hh
index 231393308..1ea247661 100644
--- a/src/libstore/unix/build/local-derivation-goal.hh
+++ b/src/libstore/unix/build/local-derivation-goal.hh
@@ -225,8 +225,15 @@ struct LocalDerivationGoal : public DerivationGoal
      */
     void writeStructuredAttrs();
 
+    /**
+     * Start an in-process nix daemon thread for recursive-nix.
+     */
     void startDaemon();
 
+    /**
+     * Stop the in-process nix daemon thread.
+     * @see startDaemon
+     */
     void stopDaemon();
 
     /**

From 3f9ff10786b879a02750780936b50271e675ea57 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 10 Oct 2024 12:46:36 +0200
Subject: [PATCH 08/43] ThreadPool: catch Interrupted

---
 src/libutil/thread-pool.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc
index 0355e1f07..57172da7e 100644
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@@ -110,6 +110,11 @@ void ThreadPool::doWork(bool mainThread)
                            propagate it. */
                         try {
                             std::rethrow_exception(exc);
+                        } catch (const Interrupted &) {
+                            // The interrupted state may be picked up multiple
+                            // workers, which is expected, so we should ignore
+                            // it silently and let the first one bubble up,
+                            // rethrown via the original state->exception.
                         } catch (std::exception & e) {
                             if (!dynamic_cast<ThreadPoolShutDown*>(&e))
                                 ignoreExceptionExceptInterrupt();

From 16320f6d24222c1cf9cb718f24628e4f1f5bf889 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 10 Oct 2024 13:08:26 +0200
Subject: [PATCH 09/43] Handle ThreadPoolShutdown with normal catch

---
 src/libutil/thread-pool.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc
index 57172da7e..cc76b1d37 100644
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@@ -115,9 +115,10 @@ void ThreadPool::doWork(bool mainThread)
                             // workers, which is expected, so we should ignore
                             // it silently and let the first one bubble up,
                             // rethrown via the original state->exception.
+                        } catch (const ThreadPoolShutDown &) {
+                            // Similarly expected.
                         } catch (std::exception & e) {
-                            if (!dynamic_cast<ThreadPoolShutDown*>(&e))
-                                ignoreExceptionExceptInterrupt();
+                            ignoreExceptionExceptInterrupt();
                         } catch (...) {
                         }
                     }

From fd8a4a86d9b6672584cb4b3d7d8d9d94790c55a3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 10 Oct 2024 13:09:12 +0200
Subject: [PATCH 10/43] ThreadPool: don't silently ignore non-std exceptions

Introduced in 8f6b347abd without explanation.

Throwing anything that's not that is a programming mistake that we don't want
to ignore silently. A crash would be ok, because that means we/they can fix
the offending throw.
---
 src/libutil/thread-pool.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc
index cc76b1d37..75424cd0e 100644
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@@ -119,7 +119,6 @@ void ThreadPool::doWork(bool mainThread)
                             // Similarly expected.
                         } catch (std::exception & e) {
                             ignoreExceptionExceptInterrupt();
-                        } catch (...) {
                         }
                     }
                 }

From ed184f0b612401c7a70a9a736ad67fa13a79a45f Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:40:45 +0200
Subject: [PATCH 11/43] Typo

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
---
 src/libutil/thread-pool.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc
index 75424cd0e..0725c1926 100644
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@@ -111,7 +111,7 @@ void ThreadPool::doWork(bool mainThread)
                         try {
                             std::rethrow_exception(exc);
                         } catch (const Interrupted &) {
-                            // The interrupted state may be picked up multiple
+                            // The interrupted state may be picked up by multiple
                             // workers, which is expected, so we should ignore
                             // it silently and let the first one bubble up,
                             // rethrown via the original state->exception.

From 7bd0c70b37d624ec32dc39cc52fcbcd78bb0dab9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Oct 2024 22:03:44 +0200
Subject: [PATCH 12/43] maintainers/README.md: Remove the list of team members

Let's have one canonical location for the team membership.
---
 maintainers/README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/maintainers/README.md b/maintainers/README.md
index b92833497..1a275d998 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -29,11 +29,7 @@ We aim to achieve this by improving the contributor experience and attracting mo
 
 ## Members
 
-- Eelco Dolstra (@edolstra) – Team lead
-- Valentin Gagarin (@fricklerhandwerk)
-- Thomas Bereknyei (@tomberek)
-- Robert Hensing (@roberth)
-- John Ericson (@Ericson2314)
+See https://nixos.org/community/teams/nix/ for the current team membership.
 
 The team is on Github as [@NixOS/nix-team](https://github.com/orgs/NixOS/teams/nix-team).
 

From c196011d230fbc449afa0098196c8bed1d7478f2 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 16 Oct 2024 22:06:28 +0200
Subject: [PATCH 13/43] maintainers/onboarding: Start documenting

---
 maintainers/onboarding.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 maintainers/onboarding.md

diff --git a/maintainers/onboarding.md b/maintainers/onboarding.md
new file mode 100644
index 000000000..e750bd8a7
--- /dev/null
+++ b/maintainers/onboarding.md
@@ -0,0 +1,6 @@
+
+# Onboarding a new team member
+
+- https://github.com/NixOS/nixos-homepage/
+- https://github.com/orgs/NixOS/teams/nix-team
+- Matrix room

From e65510da56246d0ef52bd83893bb55ae7cb3348d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 Oct 2024 14:56:26 -0400
Subject: [PATCH 14/43] Move unit tests to the location Meson expects them to
 be

Everything that is a separate subproject should live in the subprojects
directory.

Progress on #2503

This reverts commit 451f8a8c19e2ab95999553f5bf3a1fb056877933.
---
 .github/labeler.yml                           |   2 +-
 .gitignore                                    |  10 +-
 Makefile                                      |  16 +--
 doc/manual/source/development/testing.md      |   4 +-
 maintainers/flake-module.nix                  | 120 +++++++++---------
 meson.build                                   |  16 +--
 package.nix                                   |   2 -
 packaging/components.nix                      |  16 +--
 src/internal-api-docs/doxygen.cfg.in          |  16 +--
 src/libexpr-test-support/.version             |   1 +
 src/libexpr-test-support/build-utils-meson    |   1 +
 .../libexpr-test-support}/local.mk            |   0
 .../libexpr-test-support}/meson.build         |   0
 .../libexpr-test-support}/package.nix         |   6 +-
 .../libexpr-test-support}/tests/libexpr.hh    |   0
 .../tests/nix_api_expr.hh                     |   0
 .../tests/value/context.cc                    |   0
 .../tests/value/context.hh                    |   0
 src/libexpr-tests/.version                    |   1 +
 src/libexpr-tests/build-utils-meson           |   1 +
 .../libexpr-tests}/data/.gitkeep              |   0
 .../libexpr-tests}/derived-path.cc            |   0
 .../libexpr-tests}/error_traces.cc            |   0
 .../libexpr => src/libexpr-tests}/eval.cc     |   0
 .../libexpr => src/libexpr-tests}/json.cc     |   0
 .../libexpr => src/libexpr-tests}/local.mk    |   6 +-
 .../libexpr => src/libexpr-tests}/main.cc     |   0
 .../libexpr => src/libexpr-tests}/meson.build |   0
 .../libexpr-tests}/nix_api_expr.cc            |   0
 .../libexpr-tests}/nix_api_external.cc        |   0
 .../libexpr-tests}/nix_api_value.cc           |   0
 .../libexpr => src/libexpr-tests}/package.nix |   6 +-
 .../libexpr => src/libexpr-tests}/primops.cc  |   0
 .../libexpr-tests}/search-path.cc             |   0
 .../libexpr => src/libexpr-tests}/trivial.cc  |   0
 .../libexpr-tests}/value/context.cc           |   0
 .../libexpr-tests}/value/print.cc             |   0
 .../libexpr-tests}/value/value.cc             |   0
 src/libfetchers-tests/.version                |   1 +
 src/libfetchers-tests/build-utils-meson       |   1 +
 .../data/public-key/defaultType.json          |   0
 .../data/public-key/noRoundTrip.json          |   0
 .../data/public-key/simple.json               |   0
 .../libfetchers-tests}/git-utils.cc           |   0
 .../libfetchers-tests}/local.mk               |   4 +-
 .../libfetchers-tests}/meson.build            |   0
 .../libfetchers-tests}/package.nix            |   6 +-
 .../libfetchers-tests}/public-key.cc          |   0
 src/libflake-tests/.version                   |   1 +
 src/libflake-tests/build-utils-meson          |   1 +
 .../libflake-tests}/data/.gitkeep             |   0
 .../libflake-tests}/flakeref.cc               |   0
 .../libflake => src/libflake-tests}/local.mk  |   6 +-
 .../libflake-tests}/meson.build               |   0
 .../libflake-tests}/package.nix               |   6 +-
 .../libflake-tests}/url-name.cc               |   0
 src/libstore-test-support/.version            |   1 +
 src/libstore-test-support/build-utils-meson   |   1 +
 .../libstore-test-support}/local.mk           |   0
 .../libstore-test-support}/meson.build        |   0
 .../libstore-test-support}/package.nix        |   6 +-
 .../tests/derived-path.cc                     |   0
 .../tests/derived-path.hh                     |   0
 .../libstore-test-support}/tests/libstore.hh  |   0
 .../tests/nix_api_store.hh                    |   0
 .../tests/outputs-spec.cc                     |   0
 .../tests/outputs-spec.hh                     |   0
 .../libstore-test-support}/tests/path.cc      |   0
 .../libstore-test-support}/tests/path.hh      |   0
 .../libstore-test-support}/tests/protocol.hh  |   0
 src/libstore-tests/.version                   |   1 +
 src/libstore-tests/build-utils-meson          |   1 +
 .../libstore-tests}/common-protocol.cc        |   0
 .../libstore-tests}/content-address.cc        |   0
 .../data/common-protocol/content-address.bin  | Bin
 .../data/common-protocol/drv-output.bin       | Bin
 .../optional-content-address.bin              | Bin
 .../common-protocol/optional-store-path.bin   | Bin
 .../data/common-protocol/realisation.bin      | Bin
 .../data/common-protocol/set.bin              | Bin
 .../data/common-protocol/store-path.bin       | Bin
 .../data/common-protocol/string.bin           | Bin
 .../data/common-protocol/vector.bin           | Bin
 .../advanced-attributes-defaults.drv          |   1 +
 .../advanced-attributes-defaults.json         |   0
 ...d-attributes-structured-attrs-defaults.drv |   1 +
 ...-attributes-structured-attrs-defaults.json |   0
 .../advanced-attributes-structured-attrs.drv  |   1 +
 .../advanced-attributes-structured-attrs.json |   0
 .../data/derivation/advanced-attributes.drv   |   1 +
 .../derivation/bad-old-version-dyn-deps.drv   |   0
 .../data/derivation/bad-version.drv           |   0
 .../data/derivation/dynDerivationDeps.drv     |   0
 .../data/derivation/dynDerivationDeps.json    |   0
 .../data/derivation/output-caFixedFlat.json   |   0
 .../data/derivation/output-caFixedNAR.json    |   0
 .../data/derivation/output-caFixedText.json   |   0
 .../data/derivation/output-caFloating.json    |   0
 .../data/derivation/output-deferred.json      |   0
 .../data/derivation/output-impure.json        |   0
 .../derivation/output-inputAddressed.json     |   0
 .../data/derivation/simple.drv                |   0
 .../data/derivation/simple.json               |   0
 .../libstore-tests}/data/machines/bad_format  |   0
 .../libstore-tests}/data/machines/valid       |   0
 .../libstore-tests}/data/nar-info/impure.json |   0
 .../libstore-tests}/data/nar-info/pure.json   |   0
 .../data/path-info/empty_impure.json          |   0
 .../data/path-info/empty_pure.json            |   0
 .../data/path-info/impure.json                |   0
 .../libstore-tests}/data/path-info/pure.json  |   0
 .../data/serve-protocol/build-options-2.1.bin | Bin
 .../data/serve-protocol/build-options-2.2.bin | Bin
 .../data/serve-protocol/build-options-2.3.bin | Bin
 .../data/serve-protocol/build-options-2.7.bin | Bin
 .../data/serve-protocol/build-result-2.2.bin  | Bin
 .../data/serve-protocol/build-result-2.3.bin  | Bin
 .../data/serve-protocol/build-result-2.6.bin  | Bin
 .../data/serve-protocol/content-address.bin   | Bin
 .../data/serve-protocol/drv-output.bin        | Bin
 .../serve-protocol/handshake-to-client.bin    | Bin
 .../optional-content-address.bin              | Bin
 .../serve-protocol/optional-store-path.bin    | Bin
 .../data/serve-protocol/realisation.bin       | Bin
 .../data/serve-protocol/set.bin               | Bin
 .../data/serve-protocol/store-path.bin        | Bin
 .../data/serve-protocol/string.bin            | Bin
 .../unkeyed-valid-path-info-2.3.bin           | Bin
 .../unkeyed-valid-path-info-2.4.bin           | Bin
 .../data/serve-protocol/vector.bin            | Bin
 .../data/store-reference/auto.txt             |   0
 .../data/store-reference/auto_param.txt       |   0
 .../data/store-reference/local_1.txt          |   0
 .../data/store-reference/local_2.txt          |   0
 .../store-reference/local_shorthand_1.txt     |   0
 .../store-reference/local_shorthand_2.txt     |   0
 .../data/store-reference/ssh.txt              |   0
 .../data/store-reference/unix.txt             |   0
 .../data/store-reference/unix_shorthand.txt   |   0
 .../data/worker-protocol/build-mode.bin       | Bin
 .../worker-protocol/build-result-1.27.bin     | Bin
 .../worker-protocol/build-result-1.28.bin     | Bin
 .../worker-protocol/build-result-1.29.bin     | Bin
 .../worker-protocol/build-result-1.37.bin     | Bin
 .../client-handshake-info_1_30.bin            |   0
 .../client-handshake-info_1_33.bin            | Bin
 .../client-handshake-info_1_35.bin            | Bin
 .../data/worker-protocol/content-address.bin  | Bin
 .../worker-protocol/derived-path-1.29.bin     | Bin
 .../worker-protocol/derived-path-1.30.bin     | Bin
 .../data/worker-protocol/drv-output.bin       | Bin
 .../worker-protocol/handshake-to-client.bin   | Bin
 .../keyed-build-result-1.29.bin               | Bin
 .../optional-content-address.bin              | Bin
 .../worker-protocol/optional-store-path.bin   | Bin
 .../worker-protocol/optional-trusted-flag.bin | Bin
 .../data/worker-protocol/realisation.bin      | Bin
 .../data/worker-protocol/set.bin              | Bin
 .../data/worker-protocol/store-path.bin       | Bin
 .../data/worker-protocol/string.bin           | Bin
 .../unkeyed-valid-path-info-1.15.bin          | Bin
 .../worker-protocol/valid-path-info-1.15.bin  | Bin
 .../worker-protocol/valid-path-info-1.16.bin  | Bin
 .../data/worker-protocol/vector.bin           | Bin
 .../derivation-advanced-attrs.cc              |   0
 .../libstore-tests}/derivation.cc             |   0
 .../libstore-tests}/derived-path.cc           |   0
 .../libstore-tests}/downstream-placeholder.cc |   0
 .../http-binary-cache-store.cc                |   0
 .../libstore-tests}/legacy-ssh-store.cc       |   0
 .../local-binary-cache-store.cc               |   0
 .../libstore-tests}/local-overlay-store.cc    |   0
 .../libstore-tests}/local-store.cc            |   0
 .../libstore => src/libstore-tests}/local.mk  |   4 +-
 .../libstore-tests}/machines.cc               |   0
 .../libstore-tests}/meson.build               |   0
 .../libstore-tests}/nar-info-disk-cache.cc    |   0
 .../libstore-tests}/nar-info.cc               |   0
 .../libstore-tests}/nix_api_store.cc          |   0
 .../libstore-tests}/outputs-spec.cc           |   0
 .../libstore-tests}/package.nix               |  10 +-
 .../libstore-tests}/path-info.cc              |   0
 .../libstore => src/libstore-tests}/path.cc   |   0
 .../libstore-tests}/references.cc             |   0
 .../libstore-tests}/s3-binary-cache-store.cc  |   0
 .../libstore-tests}/serve-protocol.cc         |   0
 .../libstore-tests}/ssh-store.cc              |   0
 .../libstore-tests}/store-reference.cc        |   0
 .../libstore-tests}/uds-remote-store.cc       |   0
 .../libstore-tests}/worker-protocol.cc        |   0
 src/libutil-test-support/.version             |   1 +
 src/libutil-test-support/build-utils-meson    |   1 +
 .../libutil-test-support}/local.mk            |   0
 .../libutil-test-support}/meson.build         |   0
 .../libutil-test-support}/package.nix         |   6 +-
 .../tests/characterization.hh                 |   0
 .../tests/gtest-with-params.hh                |   0
 .../libutil-test-support}/tests/hash.cc       |   0
 .../libutil-test-support}/tests/hash.hh       |   0
 .../tests/nix_api_util.hh                     |   0
 .../tests/string_callback.cc                  |   0
 .../tests/string_callback.hh                  |   0
 .../tests/tracing-file-system-object-sink.cc  |   0
 .../tests/tracing-file-system-object-sink.hh  |   0
 src/libutil-tests/.version                    |   1 +
 .../libutil => src/libutil-tests}/args.cc     |   0
 src/libutil-tests/build-utils-meson           |   1 +
 .../libutil-tests}/canon-path.cc              |   0
 .../libutil-tests}/checked-arithmetic.cc      |   0
 .../libutil-tests}/chunked-vector.cc          |   0
 .../libutil => src/libutil-tests}/closure.cc  |   0
 .../libutil-tests}/compression.cc             |   0
 .../libutil => src/libutil-tests}/config.cc   |   0
 .../libutil-tests}/data/git/check-data.sh     |   0
 .../data/git/hello-world-blob.bin             | Bin
 .../libutil-tests}/data/git/hello-world.bin   | Bin
 .../libutil-tests}/data/git/tree.bin          | Bin
 .../libutil-tests}/data/git/tree.txt          |   0
 .../libutil-tests}/executable-path.cc         |   0
 .../libutil-tests}/file-content-address.cc    |   0
 .../libutil-tests}/file-system.cc             |   0
 .../unit/libutil => src/libutil-tests}/git.cc |   2 +-
 .../libutil => src/libutil-tests}/hash.cc     |   0
 .../libutil => src/libutil-tests}/hilite.cc   |   0
 .../libutil-tests}/json-utils.cc              |   0
 .../libutil => src/libutil-tests}/local.mk    |   2 +-
 .../libutil => src/libutil-tests}/logging.cc  |   0
 .../libutil-tests}/lru-cache.cc               |   0
 .../libutil => src/libutil-tests}/meson.build |   0
 .../libutil-tests}/nix_api_util.cc            |   0
 .../libutil => src/libutil-tests}/package.nix |   6 +-
 .../libutil => src/libutil-tests}/pool.cc     |   0
 .../libutil => src/libutil-tests}/position.cc |   0
 .../libutil-tests}/processes.cc               |   0
 .../libutil-tests}/references.cc              |   0
 .../libutil => src/libutil-tests}/spawn.cc    |   0
 .../libutil => src/libutil-tests}/strings.cc  |   0
 .../libutil-tests}/suggestions.cc             |   0
 .../libutil => src/libutil-tests}/terminal.cc |   0
 .../unit/libutil => src/libutil-tests}/url.cc |   0
 .../libutil => src/libutil-tests}/util.cc     |   0
 .../libutil-tests}/xml-writer.cc              |   0
 src/nix-expr-test-support                     |   1 -
 src/nix-expr-tests                            |   1 -
 src/nix-fetchers-tests                        |   1 -
 src/nix-flake-tests                           |   1 -
 src/nix-store-test-support                    |   1 -
 src/nix-store-tests                           |   1 -
 src/nix-util-test-support                     |   1 -
 src/nix-util-tests                            |   1 -
 tests/unit/libexpr-support/.version           |   1 -
 tests/unit/libexpr-support/build-utils-meson  |   1 -
 tests/unit/libexpr/.version                   |   1 -
 tests/unit/libexpr/build-utils-meson          |   1 -
 tests/unit/libfetchers/.version               |   1 -
 tests/unit/libfetchers/build-utils-meson      |   1 -
 tests/unit/libflake/.version                  |   1 -
 tests/unit/libflake/build-utils-meson         |   1 -
 tests/unit/libstore-support/.version          |   1 -
 tests/unit/libstore-support/build-utils-meson |   1 -
 tests/unit/libstore/.version                  |   1 -
 tests/unit/libstore/build-utils-meson         |   1 -
 .../advanced-attributes-defaults.drv          |   1 -
 ...d-attributes-structured-attrs-defaults.drv |   1 -
 .../advanced-attributes-structured-attrs.drv  |   1 -
 .../data/derivation/advanced-attributes.drv   |   1 -
 tests/unit/libutil-support/.version           |   1 -
 tests/unit/libutil-support/build-utils-meson  |   1 -
 tests/unit/libutil/.version                   |   1 -
 tests/unit/libutil/build-utils-meson          |   1 -
 270 files changed, 158 insertions(+), 168 deletions(-)
 create mode 120000 src/libexpr-test-support/.version
 create mode 120000 src/libexpr-test-support/build-utils-meson
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/local.mk (100%)
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/meson.build (100%)
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/package.nix (91%)
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/tests/libexpr.hh (100%)
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/tests/nix_api_expr.hh (100%)
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/tests/value/context.cc (100%)
 rename {tests/unit/libexpr-support => src/libexpr-test-support}/tests/value/context.hh (100%)
 create mode 120000 src/libexpr-tests/.version
 create mode 120000 src/libexpr-tests/build-utils-meson
 rename {tests/unit/libexpr => src/libexpr-tests}/data/.gitkeep (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/derived-path.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/error_traces.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/eval.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/json.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/local.mk (91%)
 rename {tests/unit/libexpr => src/libexpr-tests}/main.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/meson.build (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/nix_api_expr.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/nix_api_external.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/nix_api_value.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/package.nix (94%)
 rename {tests/unit/libexpr => src/libexpr-tests}/primops.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/search-path.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/trivial.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/value/context.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/value/print.cc (100%)
 rename {tests/unit/libexpr => src/libexpr-tests}/value/value.cc (100%)
 create mode 120000 src/libfetchers-tests/.version
 create mode 120000 src/libfetchers-tests/build-utils-meson
 rename {tests/unit/libfetchers => src/libfetchers-tests}/data/public-key/defaultType.json (100%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/data/public-key/noRoundTrip.json (100%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/data/public-key/simple.json (100%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/git-utils.cc (100%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/local.mk (93%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/meson.build (100%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/package.nix (94%)
 rename {tests/unit/libfetchers => src/libfetchers-tests}/public-key.cc (100%)
 create mode 120000 src/libflake-tests/.version
 create mode 120000 src/libflake-tests/build-utils-meson
 rename {tests/unit/libflake => src/libflake-tests}/data/.gitkeep (100%)
 rename {tests/unit/libflake => src/libflake-tests}/flakeref.cc (100%)
 rename {tests/unit/libflake => src/libflake-tests}/local.mk (90%)
 rename {tests/unit/libflake => src/libflake-tests}/meson.build (100%)
 rename {tests/unit/libflake => src/libflake-tests}/package.nix (94%)
 rename {tests/unit/libflake => src/libflake-tests}/url-name.cc (100%)
 create mode 120000 src/libstore-test-support/.version
 create mode 120000 src/libstore-test-support/build-utils-meson
 rename {tests/unit/libstore-support => src/libstore-test-support}/local.mk (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/meson.build (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/package.nix (91%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/derived-path.cc (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/derived-path.hh (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/libstore.hh (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/nix_api_store.hh (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/outputs-spec.cc (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/outputs-spec.hh (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/path.cc (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/path.hh (100%)
 rename {tests/unit/libstore-support => src/libstore-test-support}/tests/protocol.hh (100%)
 create mode 120000 src/libstore-tests/.version
 create mode 120000 src/libstore-tests/build-utils-meson
 rename {tests/unit/libstore => src/libstore-tests}/common-protocol.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/content-address.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/content-address.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/drv-output.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/optional-content-address.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/optional-store-path.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/realisation.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/set.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/store-path.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/string.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/common-protocol/vector.bin (100%)
 create mode 120000 src/libstore-tests/data/derivation/advanced-attributes-defaults.drv
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/advanced-attributes-defaults.json (100%)
 create mode 120000 src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/advanced-attributes-structured-attrs-defaults.json (100%)
 create mode 120000 src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.drv
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/advanced-attributes-structured-attrs.json (100%)
 create mode 120000 src/libstore-tests/data/derivation/advanced-attributes.drv
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/bad-old-version-dyn-deps.drv (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/bad-version.drv (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/dynDerivationDeps.drv (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/dynDerivationDeps.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-caFixedFlat.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-caFixedNAR.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-caFixedText.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-caFloating.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-deferred.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-impure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/output-inputAddressed.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/simple.drv (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/derivation/simple.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/machines/bad_format (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/machines/valid (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/nar-info/impure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/nar-info/pure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/path-info/empty_impure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/path-info/empty_pure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/path-info/impure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/path-info/pure.json (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-options-2.1.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-options-2.2.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-options-2.3.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-options-2.7.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-result-2.2.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-result-2.3.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/build-result-2.6.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/content-address.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/drv-output.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/handshake-to-client.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/optional-content-address.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/optional-store-path.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/realisation.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/set.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/store-path.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/string.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/unkeyed-valid-path-info-2.3.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/unkeyed-valid-path-info-2.4.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/serve-protocol/vector.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/auto.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/auto_param.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/local_1.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/local_2.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/local_shorthand_1.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/local_shorthand_2.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/ssh.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/unix.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/store-reference/unix_shorthand.txt (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/build-mode.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/build-result-1.27.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/build-result-1.28.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/build-result-1.29.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/build-result-1.37.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/client-handshake-info_1_30.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/client-handshake-info_1_33.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/client-handshake-info_1_35.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/content-address.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/derived-path-1.29.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/derived-path-1.30.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/drv-output.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/handshake-to-client.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/keyed-build-result-1.29.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/optional-content-address.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/optional-store-path.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/optional-trusted-flag.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/realisation.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/set.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/store-path.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/string.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/unkeyed-valid-path-info-1.15.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/valid-path-info-1.15.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/valid-path-info-1.16.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/data/worker-protocol/vector.bin (100%)
 rename {tests/unit/libstore => src/libstore-tests}/derivation-advanced-attrs.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/derivation.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/derived-path.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/downstream-placeholder.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/http-binary-cache-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/legacy-ssh-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/local-binary-cache-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/local-overlay-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/local-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/local.mk (92%)
 rename {tests/unit/libstore => src/libstore-tests}/machines.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/meson.build (100%)
 rename {tests/unit/libstore => src/libstore-tests}/nar-info-disk-cache.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/nar-info.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/nix_api_store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/outputs-spec.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/package.nix (90%)
 rename {tests/unit/libstore => src/libstore-tests}/path-info.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/path.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/references.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/s3-binary-cache-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/serve-protocol.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/ssh-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/store-reference.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/uds-remote-store.cc (100%)
 rename {tests/unit/libstore => src/libstore-tests}/worker-protocol.cc (100%)
 create mode 120000 src/libutil-test-support/.version
 create mode 120000 src/libutil-test-support/build-utils-meson
 rename {tests/unit/libutil-support => src/libutil-test-support}/local.mk (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/meson.build (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/package.nix (90%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/characterization.hh (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/gtest-with-params.hh (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/hash.cc (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/hash.hh (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/nix_api_util.hh (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/string_callback.cc (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/string_callback.hh (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/tracing-file-system-object-sink.cc (100%)
 rename {tests/unit/libutil-support => src/libutil-test-support}/tests/tracing-file-system-object-sink.hh (100%)
 create mode 120000 src/libutil-tests/.version
 rename {tests/unit/libutil => src/libutil-tests}/args.cc (100%)
 create mode 120000 src/libutil-tests/build-utils-meson
 rename {tests/unit/libutil => src/libutil-tests}/canon-path.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/checked-arithmetic.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/chunked-vector.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/closure.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/compression.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/config.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/data/git/check-data.sh (100%)
 rename {tests/unit/libutil => src/libutil-tests}/data/git/hello-world-blob.bin (100%)
 rename {tests/unit/libutil => src/libutil-tests}/data/git/hello-world.bin (100%)
 rename {tests/unit/libutil => src/libutil-tests}/data/git/tree.bin (100%)
 rename {tests/unit/libutil => src/libutil-tests}/data/git/tree.txt (100%)
 rename {tests/unit/libutil => src/libutil-tests}/executable-path.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/file-content-address.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/file-system.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/git.cc (99%)
 rename {tests/unit/libutil => src/libutil-tests}/hash.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/hilite.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/json-utils.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/local.mk (96%)
 rename {tests/unit/libutil => src/libutil-tests}/logging.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/lru-cache.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/meson.build (100%)
 rename {tests/unit/libutil => src/libutil-tests}/nix_api_util.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/package.nix (94%)
 rename {tests/unit/libutil => src/libutil-tests}/pool.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/position.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/processes.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/references.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/spawn.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/strings.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/suggestions.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/terminal.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/url.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/util.cc (100%)
 rename {tests/unit/libutil => src/libutil-tests}/xml-writer.cc (100%)
 delete mode 120000 src/nix-expr-test-support
 delete mode 120000 src/nix-expr-tests
 delete mode 120000 src/nix-fetchers-tests
 delete mode 120000 src/nix-flake-tests
 delete mode 120000 src/nix-store-test-support
 delete mode 120000 src/nix-store-tests
 delete mode 120000 src/nix-util-test-support
 delete mode 120000 src/nix-util-tests
 delete mode 120000 tests/unit/libexpr-support/.version
 delete mode 120000 tests/unit/libexpr-support/build-utils-meson
 delete mode 120000 tests/unit/libexpr/.version
 delete mode 120000 tests/unit/libexpr/build-utils-meson
 delete mode 120000 tests/unit/libfetchers/.version
 delete mode 120000 tests/unit/libfetchers/build-utils-meson
 delete mode 120000 tests/unit/libflake/.version
 delete mode 120000 tests/unit/libflake/build-utils-meson
 delete mode 120000 tests/unit/libstore-support/.version
 delete mode 120000 tests/unit/libstore-support/build-utils-meson
 delete mode 120000 tests/unit/libstore/.version
 delete mode 120000 tests/unit/libstore/build-utils-meson
 delete mode 120000 tests/unit/libstore/data/derivation/advanced-attributes-defaults.drv
 delete mode 120000 tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.drv
 delete mode 120000 tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.drv
 delete mode 120000 tests/unit/libstore/data/derivation/advanced-attributes.drv
 delete mode 120000 tests/unit/libutil-support/.version
 delete mode 120000 tests/unit/libutil-support/build-utils-meson
 delete mode 120000 tests/unit/libutil/.version
 delete mode 120000 tests/unit/libutil/build-utils-meson

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 9f7cb76c5..97ca9284d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,7 +1,7 @@
 "c api":
   - changed-files:
     - any-glob-to-any-file: "src/lib*-c/**/*"
-    - any-glob-to-any-file: "test/unit/**/nix_api_*"
+    - any-glob-to-any-file: "src/*test*/**/nix_api_*"
     - any-glob-to-any-file: "doc/external-api/**/*"
 
 "contributor-experience":
diff --git a/.gitignore b/.gitignore
index 8d6693984..11a80ab5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,22 +49,22 @@ perl/Makefile.config
 /src/libexpr/parser-tab.output
 /src/libexpr/nix.tbl
 /src/libexpr/tests
-/tests/unit/libexpr/libnixexpr-tests
+/src/libexpr-tests/libnixexpr-tests
 
 # /src/libfetchers
-/tests/unit/libfetchers/libnixfetchers-tests
+/src/libfetchers-tests/libnixfetchers-tests
 
 # /src/libflake
-/tests/unit/libflake/libnixflake-tests
+/src/libflake-tests/libnixflake-tests
 
 # /src/libstore/
 *.gen.*
 /src/libstore/tests
-/tests/unit/libstore/libnixstore-tests
+/src/libstore-tests/libnixstore-tests
 
 # /src/libutil/
 /src/libutil/tests
-/tests/unit/libutil/libnixutil-tests
+/src/libutil-tests/libnixutil-tests
 
 /src/nix/nix
 
diff --git a/Makefile b/Makefile
index dbf510a3e..4d70be0e8 100644
--- a/Makefile
+++ b/Makefile
@@ -40,14 +40,14 @@ endif
 
 ifeq ($(ENABLE_UNIT_TESTS), yes)
 makefiles += \
-  tests/unit/libutil/local.mk \
-  tests/unit/libutil-support/local.mk \
-  tests/unit/libstore/local.mk \
-  tests/unit/libstore-support/local.mk \
-  tests/unit/libfetchers/local.mk \
-  tests/unit/libexpr/local.mk \
-  tests/unit/libexpr-support/local.mk \
-  tests/unit/libflake/local.mk
+  src/libutil-tests/local.mk \
+  src/libutil-test-support/local.mk \
+  src/libstore-tests/local.mk \
+  src/libstore-test-support/local.mk \
+  src/libfetchers-tests/local.mk \
+  src/libexpr-tests/local.mk \
+  src/libexpr-test-support/local.mk \
+  src/libflake-tests/local.mk
 endif
 
 ifeq ($(ENABLE_FUNCTIONAL_TESTS), yes)
diff --git a/doc/manual/source/development/testing.md b/doc/manual/source/development/testing.md
index 0df72cc38..9d228fd16 100644
--- a/doc/manual/source/development/testing.md
+++ b/doc/manual/source/development/testing.md
@@ -60,10 +60,10 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > ```
 
 The tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `src/${library_name_without-nix}-test`.
-Given an interface (header) and implementation pair in the original library, say, `src/libexpr/value/context.{hh,cc}`, we write tests for it in `src/nix-expr-tests/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `src/nix-expr-test-support/tests/value/context.{hh,cc}`.
+Given an interface (header) and implementation pair in the original library, say, `src/libexpr/value/context.{hh,cc}`, we write tests for it in `src/libexpr-tests/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `src/libexpr-test-support/tests/value/context.{hh,cc}`.
 
 Data for unit tests is stored in a `data` subdir of the directory for each unit test executable.
-For example, `libnixstore` code is in `src/libstore`, and its test data is in `src/nix-store-tests/data`.
+For example, `libnixstore` code is in `src/libstore`, and its test data is in `src/libstore-tests/data`.
 The path to the `src/${library_name_without-nix}-test/data` directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`.
 Note that each executable only gets the data for its tests.
 
diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index fb286208d..78c36d6b6 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -15,7 +15,7 @@
           excludes = [
             # We don't want to format test data
             # ''tests/(?!nixos/).*\.nix''
-            ''^tests/unit/[^/]*/data/.*$''
+            ''^src/[^/]*-tests/data/.*$''
 
             # Don't format vendored code
             ''^doc/manual/redirects\.js$''
@@ -427,64 +427,64 @@
             ''^tests/nixos/ca-fd-leak/sender\.c''
             ''^tests/nixos/ca-fd-leak/smuggler\.c''
             ''^tests/nixos/user-sandboxing/attacker\.c''
-            ''^tests/unit/libexpr-support/tests/libexpr\.hh''
-            ''^tests/unit/libexpr-support/tests/value/context\.cc''
-            ''^tests/unit/libexpr-support/tests/value/context\.hh''
-            ''^tests/unit/libexpr/derived-path\.cc''
-            ''^tests/unit/libexpr/error_traces\.cc''
-            ''^tests/unit/libexpr/eval\.cc''
-            ''^tests/unit/libexpr/json\.cc''
-            ''^tests/unit/libexpr/main\.cc''
-            ''^tests/unit/libexpr/primops\.cc''
-            ''^tests/unit/libexpr/search-path\.cc''
-            ''^tests/unit/libexpr/trivial\.cc''
-            ''^tests/unit/libexpr/value/context\.cc''
-            ''^tests/unit/libexpr/value/print\.cc''
-            ''^tests/unit/libfetchers/public-key\.cc''
-            ''^tests/unit/libflake/flakeref\.cc''
-            ''^tests/unit/libflake/url-name\.cc''
-            ''^tests/unit/libstore-support/tests/derived-path\.cc''
-            ''^tests/unit/libstore-support/tests/derived-path\.hh''
-            ''^tests/unit/libstore-support/tests/nix_api_store\.hh''
-            ''^tests/unit/libstore-support/tests/outputs-spec\.cc''
-            ''^tests/unit/libstore-support/tests/outputs-spec\.hh''
-            ''^tests/unit/libstore-support/tests/path\.cc''
-            ''^tests/unit/libstore-support/tests/path\.hh''
-            ''^tests/unit/libstore-support/tests/protocol\.hh''
-            ''^tests/unit/libstore/common-protocol\.cc''
-            ''^tests/unit/libstore/content-address\.cc''
-            ''^tests/unit/libstore/derivation\.cc''
-            ''^tests/unit/libstore/derived-path\.cc''
-            ''^tests/unit/libstore/downstream-placeholder\.cc''
-            ''^tests/unit/libstore/machines\.cc''
-            ''^tests/unit/libstore/nar-info-disk-cache\.cc''
-            ''^tests/unit/libstore/nar-info\.cc''
-            ''^tests/unit/libstore/outputs-spec\.cc''
-            ''^tests/unit/libstore/path-info\.cc''
-            ''^tests/unit/libstore/path\.cc''
-            ''^tests/unit/libstore/serve-protocol\.cc''
-            ''^tests/unit/libstore/worker-protocol\.cc''
-            ''^tests/unit/libutil-support/tests/characterization\.hh''
-            ''^tests/unit/libutil-support/tests/hash\.cc''
-            ''^tests/unit/libutil-support/tests/hash\.hh''
-            ''^tests/unit/libutil/args\.cc''
-            ''^tests/unit/libutil/canon-path\.cc''
-            ''^tests/unit/libutil/chunked-vector\.cc''
-            ''^tests/unit/libutil/closure\.cc''
-            ''^tests/unit/libutil/compression\.cc''
-            ''^tests/unit/libutil/config\.cc''
-            ''^tests/unit/libutil/file-content-address\.cc''
-            ''^tests/unit/libutil/git\.cc''
-            ''^tests/unit/libutil/hash\.cc''
-            ''^tests/unit/libutil/hilite\.cc''
-            ''^tests/unit/libutil/json-utils\.cc''
-            ''^tests/unit/libutil/logging\.cc''
-            ''^tests/unit/libutil/lru-cache\.cc''
-            ''^tests/unit/libutil/pool\.cc''
-            ''^tests/unit/libutil/references\.cc''
-            ''^tests/unit/libutil/suggestions\.cc''
-            ''^tests/unit/libutil/url\.cc''
-            ''^tests/unit/libutil/xml-writer\.cc''
+            ''^src/libexpr-test-support/tests/libexpr\.hh''
+            ''^src/libexpr-test-support/tests/value/context\.cc''
+            ''^src/libexpr-test-support/tests/value/context\.hh''
+            ''^src/libexpr-tests/derived-path\.cc''
+            ''^src/libexpr-tests/error_traces\.cc''
+            ''^src/libexpr-tests/eval\.cc''
+            ''^src/libexpr-tests/json\.cc''
+            ''^src/libexpr-tests/main\.cc''
+            ''^src/libexpr-tests/primops\.cc''
+            ''^src/libexpr-tests/search-path\.cc''
+            ''^src/libexpr-tests/trivial\.cc''
+            ''^src/libexpr-tests/value/context\.cc''
+            ''^src/libexpr-tests/value/print\.cc''
+            ''^src/libfetchers-tests/public-key\.cc''
+            ''^src/libflake-tests/flakeref\.cc''
+            ''^src/libflake-tests/url-name\.cc''
+            ''^src/libstore-test-support/tests/derived-path\.cc''
+            ''^src/libstore-test-support/tests/derived-path\.hh''
+            ''^src/libstore-test-support/tests/nix_api_store\.hh''
+            ''^src/libstore-test-support/tests/outputs-spec\.cc''
+            ''^src/libstore-test-support/tests/outputs-spec\.hh''
+            ''^src/libstore-test-support/tests/path\.cc''
+            ''^src/libstore-test-support/tests/path\.hh''
+            ''^src/libstore-test-support/tests/protocol\.hh''
+            ''^src/libstore-tests/common-protocol\.cc''
+            ''^src/libstore-tests/content-address\.cc''
+            ''^src/libstore-tests/derivation\.cc''
+            ''^src/libstore-tests/derived-path\.cc''
+            ''^src/libstore-tests/downstream-placeholder\.cc''
+            ''^src/libstore-tests/machines\.cc''
+            ''^src/libstore-tests/nar-info-disk-cache\.cc''
+            ''^src/libstore-tests/nar-info\.cc''
+            ''^src/libstore-tests/outputs-spec\.cc''
+            ''^src/libstore-tests/path-info\.cc''
+            ''^src/libstore-tests/path\.cc''
+            ''^src/libstore-tests/serve-protocol\.cc''
+            ''^src/libstore-tests/worker-protocol\.cc''
+            ''^src/libutil-test-support/tests/characterization\.hh''
+            ''^src/libutil-test-support/tests/hash\.cc''
+            ''^src/libutil-test-support/tests/hash\.hh''
+            ''^src/libutil-tests/args\.cc''
+            ''^src/libutil-tests/canon-path\.cc''
+            ''^src/libutil-tests/chunked-vector\.cc''
+            ''^src/libutil-tests/closure\.cc''
+            ''^src/libutil-tests/compression\.cc''
+            ''^src/libutil-tests/config\.cc''
+            ''^src/libutil-tests/file-content-address\.cc''
+            ''^src/libutil-tests/git\.cc''
+            ''^src/libutil-tests/hash\.cc''
+            ''^src/libutil-tests/hilite\.cc''
+            ''^src/libutil-tests/json-utils\.cc''
+            ''^src/libutil-tests/logging\.cc''
+            ''^src/libutil-tests/lru-cache\.cc''
+            ''^src/libutil-tests/pool\.cc''
+            ''^src/libutil-tests/references\.cc''
+            ''^src/libutil-tests/suggestions\.cc''
+            ''^src/libutil-tests/url\.cc''
+            ''^src/libutil-tests/xml-writer\.cc''
           ];
         };
         shellcheck = {
@@ -650,7 +650,7 @@
             ''^tests/functional/user-envs\.sh$''
             ''^tests/functional/why-depends\.sh$''
             ''^tests/functional/zstd\.sh$''
-            ''^tests/unit/libutil/data/git/check-data\.sh$''
+            ''^src/libutil-tests/data/git/check-data\.sh$''
           ];
         };
         # TODO: nixfmt, https://github.com/NixOS/nixfmt/issues/153
diff --git a/meson.build b/meson.build
index 97704d170..d68db0a0d 100644
--- a/meson.build
+++ b/meson.build
@@ -40,12 +40,12 @@ if not meson.is_cross_build()
 endif
 
 # Testing
-subproject('nix-util-test-support')
-subproject('nix-util-tests')
-subproject('nix-store-test-support')
-subproject('nix-store-tests')
-subproject('nix-fetchers-tests')
-subproject('nix-expr-test-support')
-subproject('nix-expr-tests')
-subproject('nix-flake-tests')
+subproject('libutil-test-support')
+subproject('libutil-tests')
+subproject('libstore-test-support')
+subproject('libstore-tests')
+subproject('libfetchers-tests')
+subproject('libexpr-test-support')
+subproject('libexpr-tests')
+subproject('libflake-tests')
 subproject('nix-functional-tests')
diff --git a/package.nix b/package.nix
index 8ab184667..00621d475 100644
--- a/package.nix
+++ b/package.nix
@@ -176,8 +176,6 @@ in {
           ./scripts/local.mk
         ] ++ lib.optionals enableManual [
           ./doc/manual
-        ] ++ lib.optionals buildUnitTests [
-          ./tests/unit
         ] ++ lib.optionals doInstallCheck [
           ./tests/functional
         ]));
diff --git a/packaging/components.nix b/packaging/components.nix
index 4c18dc6a3..5cc0be784 100644
--- a/packaging/components.nix
+++ b/packaging/components.nix
@@ -32,24 +32,24 @@ in
 
   nix-util = callPackage ../src/libutil/package.nix { };
   nix-util-c = callPackage ../src/libutil-c/package.nix { };
-  nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { };
-  nix-util-tests = callPackage ../tests/unit/libutil/package.nix { };
+  nix-util-test-support = callPackage ../src/libutil-test-support/package.nix { };
+  nix-util-tests = callPackage ../src/libutil-tests/package.nix { };
 
   nix-store = callPackage ../src/libstore/package.nix { };
   nix-store-c = callPackage ../src/libstore-c/package.nix { };
-  nix-store-test-support = callPackage ../tests/unit/libstore-support/package.nix { };
-  nix-store-tests = callPackage ../tests/unit/libstore/package.nix { };
+  nix-store-test-support = callPackage ../src/libstore-test-support/package.nix { };
+  nix-store-tests = callPackage ../src/libstore-tests/package.nix { };
 
   nix-fetchers = callPackage ../src/libfetchers/package.nix { };
-  nix-fetchers-tests = callPackage ../tests/unit/libfetchers/package.nix { };
+  nix-fetchers-tests = callPackage ../src/libfetchers-tests/package.nix { };
 
   nix-expr = callPackage ../src/libexpr/package.nix { };
   nix-expr-c = callPackage ../src/libexpr-c/package.nix { };
-  nix-expr-test-support = callPackage ../tests/unit/libexpr-support/package.nix { };
-  nix-expr-tests = callPackage ../tests/unit/libexpr/package.nix { };
+  nix-expr-test-support = callPackage ../src/libexpr-test-support/package.nix { };
+  nix-expr-tests = callPackage ../src/libexpr-tests/package.nix { };
 
   nix-flake = callPackage ../src/libflake/package.nix { };
-  nix-flake-tests = callPackage ../tests/unit/libflake/package.nix { };
+  nix-flake-tests = callPackage ../src/libflake-tests/package.nix { };
 
   nix-main = callPackage ../src/libmain/package.nix { };
   nix-main-c = callPackage ../src/libmain-c/package.nix { };
diff --git a/src/internal-api-docs/doxygen.cfg.in b/src/internal-api-docs/doxygen.cfg.in
index f1ef75b38..86c64a396 100644
--- a/src/internal-api-docs/doxygen.cfg.in
+++ b/src/internal-api-docs/doxygen.cfg.in
@@ -41,21 +41,21 @@ INPUT                  = \
   @src@/libcmd \
   @src@/libexpr \
   @src@/libexpr/flake \
-  @src@/nix-expr-tests \
-  @src@/nix-expr-tests/value \
-  @src@/nix-expr-test-support/test \
-  @src@/nix-expr-test-support/test/value \
+  @src@/libexpr-tests \
+  @src@/libexpr-tests/value \
+  @src@/libexpr-test-support/test \
+  @src@/libexpr-test-support/test/value \
   @src@/libexpr/value \
   @src@/libfetchers \
   @src@/libmain \
   @src@/libstore \
   @src@/libstore/build \
   @src@/libstore/builtins \
-  @src@/nix-store-tests \
-  @src@/nix-store-test-support/test \
+  @src@/libstore-tests \
+  @src@/libstore-test-support/test \
   @src@/libutil \
-  @src@/nix-util-tests \
-  @src@/nix-util-test-support/test \
+  @src@/libutil-tests \
+  @src@/libutil-test-support/test \
   @src@/nix \
   @src@/nix-env \
   @src@/nix-store
diff --git a/src/libexpr-test-support/.version b/src/libexpr-test-support/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libexpr-test-support/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libexpr-test-support/build-utils-meson b/src/libexpr-test-support/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libexpr-test-support/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libexpr-support/local.mk b/src/libexpr-test-support/local.mk
similarity index 100%
rename from tests/unit/libexpr-support/local.mk
rename to src/libexpr-test-support/local.mk
diff --git a/tests/unit/libexpr-support/meson.build b/src/libexpr-test-support/meson.build
similarity index 100%
rename from tests/unit/libexpr-support/meson.build
rename to src/libexpr-test-support/meson.build
diff --git a/tests/unit/libexpr-support/package.nix b/src/libexpr-test-support/package.nix
similarity index 91%
rename from tests/unit/libexpr-support/package.nix
rename to src/libexpr-test-support/package.nix
index 234d83730..bcf6118e0 100644
--- a/tests/unit/libexpr-support/package.nix
+++ b/src/libexpr-test-support/package.nix
@@ -22,9 +22,9 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -43,7 +43,7 @@ mkMesonLibrary (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libexpr-support/tests/libexpr.hh b/src/libexpr-test-support/tests/libexpr.hh
similarity index 100%
rename from tests/unit/libexpr-support/tests/libexpr.hh
rename to src/libexpr-test-support/tests/libexpr.hh
diff --git a/tests/unit/libexpr-support/tests/nix_api_expr.hh b/src/libexpr-test-support/tests/nix_api_expr.hh
similarity index 100%
rename from tests/unit/libexpr-support/tests/nix_api_expr.hh
rename to src/libexpr-test-support/tests/nix_api_expr.hh
diff --git a/tests/unit/libexpr-support/tests/value/context.cc b/src/libexpr-test-support/tests/value/context.cc
similarity index 100%
rename from tests/unit/libexpr-support/tests/value/context.cc
rename to src/libexpr-test-support/tests/value/context.cc
diff --git a/tests/unit/libexpr-support/tests/value/context.hh b/src/libexpr-test-support/tests/value/context.hh
similarity index 100%
rename from tests/unit/libexpr-support/tests/value/context.hh
rename to src/libexpr-test-support/tests/value/context.hh
diff --git a/src/libexpr-tests/.version b/src/libexpr-tests/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libexpr-tests/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libexpr-tests/build-utils-meson b/src/libexpr-tests/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libexpr-tests/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libexpr/data/.gitkeep b/src/libexpr-tests/data/.gitkeep
similarity index 100%
rename from tests/unit/libexpr/data/.gitkeep
rename to src/libexpr-tests/data/.gitkeep
diff --git a/tests/unit/libexpr/derived-path.cc b/src/libexpr-tests/derived-path.cc
similarity index 100%
rename from tests/unit/libexpr/derived-path.cc
rename to src/libexpr-tests/derived-path.cc
diff --git a/tests/unit/libexpr/error_traces.cc b/src/libexpr-tests/error_traces.cc
similarity index 100%
rename from tests/unit/libexpr/error_traces.cc
rename to src/libexpr-tests/error_traces.cc
diff --git a/tests/unit/libexpr/eval.cc b/src/libexpr-tests/eval.cc
similarity index 100%
rename from tests/unit/libexpr/eval.cc
rename to src/libexpr-tests/eval.cc
diff --git a/tests/unit/libexpr/json.cc b/src/libexpr-tests/json.cc
similarity index 100%
rename from tests/unit/libexpr/json.cc
rename to src/libexpr-tests/json.cc
diff --git a/tests/unit/libexpr/local.mk b/src/libexpr-tests/local.mk
similarity index 91%
rename from tests/unit/libexpr/local.mk
rename to src/libexpr-tests/local.mk
index 1617e2823..79583a9ee 100644
--- a/tests/unit/libexpr/local.mk
+++ b/src/libexpr-tests/local.mk
@@ -20,9 +20,9 @@ libexpr-tests_SOURCES := \
     $(wildcard $(d)/flake/*.cc)
 
 libexpr-tests_EXTRA_INCLUDES = \
-    -I tests/unit/libexpr-support \
-    -I tests/unit/libstore-support \
-    -I tests/unit/libutil-support \
+    -I src/libexpr-test-support \
+    -I src/libstore-test-support \
+    -I src/libutil-test-support \
     $(INCLUDE_libexpr) \
     $(INCLUDE_libexprc) \
     $(INCLUDE_libfetchers) \
diff --git a/tests/unit/libexpr/main.cc b/src/libexpr-tests/main.cc
similarity index 100%
rename from tests/unit/libexpr/main.cc
rename to src/libexpr-tests/main.cc
diff --git a/tests/unit/libexpr/meson.build b/src/libexpr-tests/meson.build
similarity index 100%
rename from tests/unit/libexpr/meson.build
rename to src/libexpr-tests/meson.build
diff --git a/tests/unit/libexpr/nix_api_expr.cc b/src/libexpr-tests/nix_api_expr.cc
similarity index 100%
rename from tests/unit/libexpr/nix_api_expr.cc
rename to src/libexpr-tests/nix_api_expr.cc
diff --git a/tests/unit/libexpr/nix_api_external.cc b/src/libexpr-tests/nix_api_external.cc
similarity index 100%
rename from tests/unit/libexpr/nix_api_external.cc
rename to src/libexpr-tests/nix_api_external.cc
diff --git a/tests/unit/libexpr/nix_api_value.cc b/src/libexpr-tests/nix_api_value.cc
similarity index 100%
rename from tests/unit/libexpr/nix_api_value.cc
rename to src/libexpr-tests/nix_api_value.cc
diff --git a/tests/unit/libexpr/package.nix b/src/libexpr-tests/package.nix
similarity index 94%
rename from tests/unit/libexpr/package.nix
rename to src/libexpr-tests/package.nix
index 1d99b581c..959d6b84e 100644
--- a/tests/unit/libexpr/package.nix
+++ b/src/libexpr-tests/package.nix
@@ -27,9 +27,9 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -50,7 +50,7 @@ mkMesonExecutable (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libexpr/primops.cc b/src/libexpr-tests/primops.cc
similarity index 100%
rename from tests/unit/libexpr/primops.cc
rename to src/libexpr-tests/primops.cc
diff --git a/tests/unit/libexpr/search-path.cc b/src/libexpr-tests/search-path.cc
similarity index 100%
rename from tests/unit/libexpr/search-path.cc
rename to src/libexpr-tests/search-path.cc
diff --git a/tests/unit/libexpr/trivial.cc b/src/libexpr-tests/trivial.cc
similarity index 100%
rename from tests/unit/libexpr/trivial.cc
rename to src/libexpr-tests/trivial.cc
diff --git a/tests/unit/libexpr/value/context.cc b/src/libexpr-tests/value/context.cc
similarity index 100%
rename from tests/unit/libexpr/value/context.cc
rename to src/libexpr-tests/value/context.cc
diff --git a/tests/unit/libexpr/value/print.cc b/src/libexpr-tests/value/print.cc
similarity index 100%
rename from tests/unit/libexpr/value/print.cc
rename to src/libexpr-tests/value/print.cc
diff --git a/tests/unit/libexpr/value/value.cc b/src/libexpr-tests/value/value.cc
similarity index 100%
rename from tests/unit/libexpr/value/value.cc
rename to src/libexpr-tests/value/value.cc
diff --git a/src/libfetchers-tests/.version b/src/libfetchers-tests/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libfetchers-tests/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libfetchers-tests/build-utils-meson b/src/libfetchers-tests/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libfetchers-tests/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libfetchers/data/public-key/defaultType.json b/src/libfetchers-tests/data/public-key/defaultType.json
similarity index 100%
rename from tests/unit/libfetchers/data/public-key/defaultType.json
rename to src/libfetchers-tests/data/public-key/defaultType.json
diff --git a/tests/unit/libfetchers/data/public-key/noRoundTrip.json b/src/libfetchers-tests/data/public-key/noRoundTrip.json
similarity index 100%
rename from tests/unit/libfetchers/data/public-key/noRoundTrip.json
rename to src/libfetchers-tests/data/public-key/noRoundTrip.json
diff --git a/tests/unit/libfetchers/data/public-key/simple.json b/src/libfetchers-tests/data/public-key/simple.json
similarity index 100%
rename from tests/unit/libfetchers/data/public-key/simple.json
rename to src/libfetchers-tests/data/public-key/simple.json
diff --git a/tests/unit/libfetchers/git-utils.cc b/src/libfetchers-tests/git-utils.cc
similarity index 100%
rename from tests/unit/libfetchers/git-utils.cc
rename to src/libfetchers-tests/git-utils.cc
diff --git a/tests/unit/libfetchers/local.mk b/src/libfetchers-tests/local.mk
similarity index 93%
rename from tests/unit/libfetchers/local.mk
rename to src/libfetchers-tests/local.mk
index 30aa142a5..5c90f1fc7 100644
--- a/tests/unit/libfetchers/local.mk
+++ b/src/libfetchers-tests/local.mk
@@ -17,8 +17,8 @@ endif
 libfetchers-tests_SOURCES := $(wildcard $(d)/*.cc)
 
 libfetchers-tests_EXTRA_INCLUDES = \
-    -I tests/unit/libstore-support \
-    -I tests/unit/libutil-support \
+    -I src/libstore-test-support \
+    -I src/libutil-test-support \
     $(INCLUDE_libfetchers) \
     $(INCLUDE_libstore) \
     $(INCLUDE_libutil)
diff --git a/tests/unit/libfetchers/meson.build b/src/libfetchers-tests/meson.build
similarity index 100%
rename from tests/unit/libfetchers/meson.build
rename to src/libfetchers-tests/meson.build
diff --git a/tests/unit/libfetchers/package.nix b/src/libfetchers-tests/package.nix
similarity index 94%
rename from tests/unit/libfetchers/package.nix
rename to src/libfetchers-tests/package.nix
index ed27b4021..7b2ba8f2c 100644
--- a/tests/unit/libfetchers/package.nix
+++ b/src/libfetchers-tests/package.nix
@@ -26,9 +26,9 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -48,7 +48,7 @@ mkMesonExecutable (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libfetchers/public-key.cc b/src/libfetchers-tests/public-key.cc
similarity index 100%
rename from tests/unit/libfetchers/public-key.cc
rename to src/libfetchers-tests/public-key.cc
diff --git a/src/libflake-tests/.version b/src/libflake-tests/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libflake-tests/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libflake-tests/build-utils-meson b/src/libflake-tests/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libflake-tests/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libflake/data/.gitkeep b/src/libflake-tests/data/.gitkeep
similarity index 100%
rename from tests/unit/libflake/data/.gitkeep
rename to src/libflake-tests/data/.gitkeep
diff --git a/tests/unit/libflake/flakeref.cc b/src/libflake-tests/flakeref.cc
similarity index 100%
rename from tests/unit/libflake/flakeref.cc
rename to src/libflake-tests/flakeref.cc
diff --git a/tests/unit/libflake/local.mk b/src/libflake-tests/local.mk
similarity index 90%
rename from tests/unit/libflake/local.mk
rename to src/libflake-tests/local.mk
index 590bcf7c0..8599b43f6 100644
--- a/tests/unit/libflake/local.mk
+++ b/src/libflake-tests/local.mk
@@ -20,9 +20,9 @@ libflake-tests_SOURCES := \
     $(wildcard $(d)/flake/*.cc)
 
 libflake-tests_EXTRA_INCLUDES = \
-    -I tests/unit/libflake-support \
-    -I tests/unit/libstore-support \
-    -I tests/unit/libutil-support \
+    -I src/libflake-test-support \
+    -I src/libstore-test-support \
+    -I src/libutil-test-support \
     $(INCLUDE_libflake) \
     $(INCLUDE_libexpr) \
     $(INCLUDE_libfetchers) \
diff --git a/tests/unit/libflake/meson.build b/src/libflake-tests/meson.build
similarity index 100%
rename from tests/unit/libflake/meson.build
rename to src/libflake-tests/meson.build
diff --git a/tests/unit/libflake/package.nix b/src/libflake-tests/package.nix
similarity index 94%
rename from tests/unit/libflake/package.nix
rename to src/libflake-tests/package.nix
index eaf946202..67e716979 100644
--- a/tests/unit/libflake/package.nix
+++ b/src/libflake-tests/package.nix
@@ -26,9 +26,9 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -48,7 +48,7 @@ mkMesonExecutable (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libflake/url-name.cc b/src/libflake-tests/url-name.cc
similarity index 100%
rename from tests/unit/libflake/url-name.cc
rename to src/libflake-tests/url-name.cc
diff --git a/src/libstore-test-support/.version b/src/libstore-test-support/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libstore-test-support/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libstore-test-support/build-utils-meson b/src/libstore-test-support/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libstore-test-support/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libstore-support/local.mk b/src/libstore-test-support/local.mk
similarity index 100%
rename from tests/unit/libstore-support/local.mk
rename to src/libstore-test-support/local.mk
diff --git a/tests/unit/libstore-support/meson.build b/src/libstore-test-support/meson.build
similarity index 100%
rename from tests/unit/libstore-support/meson.build
rename to src/libstore-test-support/meson.build
diff --git a/tests/unit/libstore-support/package.nix b/src/libstore-test-support/package.nix
similarity index 91%
rename from tests/unit/libstore-support/package.nix
rename to src/libstore-test-support/package.nix
index b6106b727..48f8b5e6b 100644
--- a/tests/unit/libstore-support/package.nix
+++ b/src/libstore-test-support/package.nix
@@ -22,9 +22,9 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -43,7 +43,7 @@ mkMesonLibrary (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libstore-support/tests/derived-path.cc b/src/libstore-test-support/tests/derived-path.cc
similarity index 100%
rename from tests/unit/libstore-support/tests/derived-path.cc
rename to src/libstore-test-support/tests/derived-path.cc
diff --git a/tests/unit/libstore-support/tests/derived-path.hh b/src/libstore-test-support/tests/derived-path.hh
similarity index 100%
rename from tests/unit/libstore-support/tests/derived-path.hh
rename to src/libstore-test-support/tests/derived-path.hh
diff --git a/tests/unit/libstore-support/tests/libstore.hh b/src/libstore-test-support/tests/libstore.hh
similarity index 100%
rename from tests/unit/libstore-support/tests/libstore.hh
rename to src/libstore-test-support/tests/libstore.hh
diff --git a/tests/unit/libstore-support/tests/nix_api_store.hh b/src/libstore-test-support/tests/nix_api_store.hh
similarity index 100%
rename from tests/unit/libstore-support/tests/nix_api_store.hh
rename to src/libstore-test-support/tests/nix_api_store.hh
diff --git a/tests/unit/libstore-support/tests/outputs-spec.cc b/src/libstore-test-support/tests/outputs-spec.cc
similarity index 100%
rename from tests/unit/libstore-support/tests/outputs-spec.cc
rename to src/libstore-test-support/tests/outputs-spec.cc
diff --git a/tests/unit/libstore-support/tests/outputs-spec.hh b/src/libstore-test-support/tests/outputs-spec.hh
similarity index 100%
rename from tests/unit/libstore-support/tests/outputs-spec.hh
rename to src/libstore-test-support/tests/outputs-spec.hh
diff --git a/tests/unit/libstore-support/tests/path.cc b/src/libstore-test-support/tests/path.cc
similarity index 100%
rename from tests/unit/libstore-support/tests/path.cc
rename to src/libstore-test-support/tests/path.cc
diff --git a/tests/unit/libstore-support/tests/path.hh b/src/libstore-test-support/tests/path.hh
similarity index 100%
rename from tests/unit/libstore-support/tests/path.hh
rename to src/libstore-test-support/tests/path.hh
diff --git a/tests/unit/libstore-support/tests/protocol.hh b/src/libstore-test-support/tests/protocol.hh
similarity index 100%
rename from tests/unit/libstore-support/tests/protocol.hh
rename to src/libstore-test-support/tests/protocol.hh
diff --git a/src/libstore-tests/.version b/src/libstore-tests/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libstore-tests/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libstore-tests/build-utils-meson b/src/libstore-tests/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libstore-tests/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libstore/common-protocol.cc b/src/libstore-tests/common-protocol.cc
similarity index 100%
rename from tests/unit/libstore/common-protocol.cc
rename to src/libstore-tests/common-protocol.cc
diff --git a/tests/unit/libstore/content-address.cc b/src/libstore-tests/content-address.cc
similarity index 100%
rename from tests/unit/libstore/content-address.cc
rename to src/libstore-tests/content-address.cc
diff --git a/tests/unit/libstore/data/common-protocol/content-address.bin b/src/libstore-tests/data/common-protocol/content-address.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/content-address.bin
rename to src/libstore-tests/data/common-protocol/content-address.bin
diff --git a/tests/unit/libstore/data/common-protocol/drv-output.bin b/src/libstore-tests/data/common-protocol/drv-output.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/drv-output.bin
rename to src/libstore-tests/data/common-protocol/drv-output.bin
diff --git a/tests/unit/libstore/data/common-protocol/optional-content-address.bin b/src/libstore-tests/data/common-protocol/optional-content-address.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/optional-content-address.bin
rename to src/libstore-tests/data/common-protocol/optional-content-address.bin
diff --git a/tests/unit/libstore/data/common-protocol/optional-store-path.bin b/src/libstore-tests/data/common-protocol/optional-store-path.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/optional-store-path.bin
rename to src/libstore-tests/data/common-protocol/optional-store-path.bin
diff --git a/tests/unit/libstore/data/common-protocol/realisation.bin b/src/libstore-tests/data/common-protocol/realisation.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/realisation.bin
rename to src/libstore-tests/data/common-protocol/realisation.bin
diff --git a/tests/unit/libstore/data/common-protocol/set.bin b/src/libstore-tests/data/common-protocol/set.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/set.bin
rename to src/libstore-tests/data/common-protocol/set.bin
diff --git a/tests/unit/libstore/data/common-protocol/store-path.bin b/src/libstore-tests/data/common-protocol/store-path.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/store-path.bin
rename to src/libstore-tests/data/common-protocol/store-path.bin
diff --git a/tests/unit/libstore/data/common-protocol/string.bin b/src/libstore-tests/data/common-protocol/string.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/string.bin
rename to src/libstore-tests/data/common-protocol/string.bin
diff --git a/tests/unit/libstore/data/common-protocol/vector.bin b/src/libstore-tests/data/common-protocol/vector.bin
similarity index 100%
rename from tests/unit/libstore/data/common-protocol/vector.bin
rename to src/libstore-tests/data/common-protocol/vector.bin
diff --git a/src/libstore-tests/data/derivation/advanced-attributes-defaults.drv b/src/libstore-tests/data/derivation/advanced-attributes-defaults.drv
new file mode 120000
index 000000000..f8f30ac32
--- /dev/null
+++ b/src/libstore-tests/data/derivation/advanced-attributes-defaults.drv
@@ -0,0 +1 @@
+../../../../tests/functional/derivation/advanced-attributes-defaults.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes-defaults.json b/src/libstore-tests/data/derivation/advanced-attributes-defaults.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/advanced-attributes-defaults.json
rename to src/libstore-tests/data/derivation/advanced-attributes-defaults.json
diff --git a/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv b/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv
new file mode 120000
index 000000000..837e9a0e4
--- /dev/null
+++ b/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv
@@ -0,0 +1 @@
+../../../../tests/functional/derivation/advanced-attributes-structured-attrs-defaults.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.json b/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.json
rename to src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.json
diff --git a/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.drv b/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.drv
new file mode 120000
index 000000000..e08bb5737
--- /dev/null
+++ b/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.drv
@@ -0,0 +1 @@
+../../../../tests/functional/derivation/advanced-attributes-structured-attrs.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.json b/src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.json
rename to src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.json
diff --git a/src/libstore-tests/data/derivation/advanced-attributes.drv b/src/libstore-tests/data/derivation/advanced-attributes.drv
new file mode 120000
index 000000000..1dc394a0a
--- /dev/null
+++ b/src/libstore-tests/data/derivation/advanced-attributes.drv
@@ -0,0 +1 @@
+../../../../tests/functional/derivation/advanced-attributes.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/bad-old-version-dyn-deps.drv b/src/libstore-tests/data/derivation/bad-old-version-dyn-deps.drv
similarity index 100%
rename from tests/unit/libstore/data/derivation/bad-old-version-dyn-deps.drv
rename to src/libstore-tests/data/derivation/bad-old-version-dyn-deps.drv
diff --git a/tests/unit/libstore/data/derivation/bad-version.drv b/src/libstore-tests/data/derivation/bad-version.drv
similarity index 100%
rename from tests/unit/libstore/data/derivation/bad-version.drv
rename to src/libstore-tests/data/derivation/bad-version.drv
diff --git a/tests/unit/libstore/data/derivation/dynDerivationDeps.drv b/src/libstore-tests/data/derivation/dynDerivationDeps.drv
similarity index 100%
rename from tests/unit/libstore/data/derivation/dynDerivationDeps.drv
rename to src/libstore-tests/data/derivation/dynDerivationDeps.drv
diff --git a/tests/unit/libstore/data/derivation/dynDerivationDeps.json b/src/libstore-tests/data/derivation/dynDerivationDeps.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/dynDerivationDeps.json
rename to src/libstore-tests/data/derivation/dynDerivationDeps.json
diff --git a/tests/unit/libstore/data/derivation/output-caFixedFlat.json b/src/libstore-tests/data/derivation/output-caFixedFlat.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-caFixedFlat.json
rename to src/libstore-tests/data/derivation/output-caFixedFlat.json
diff --git a/tests/unit/libstore/data/derivation/output-caFixedNAR.json b/src/libstore-tests/data/derivation/output-caFixedNAR.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-caFixedNAR.json
rename to src/libstore-tests/data/derivation/output-caFixedNAR.json
diff --git a/tests/unit/libstore/data/derivation/output-caFixedText.json b/src/libstore-tests/data/derivation/output-caFixedText.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-caFixedText.json
rename to src/libstore-tests/data/derivation/output-caFixedText.json
diff --git a/tests/unit/libstore/data/derivation/output-caFloating.json b/src/libstore-tests/data/derivation/output-caFloating.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-caFloating.json
rename to src/libstore-tests/data/derivation/output-caFloating.json
diff --git a/tests/unit/libstore/data/derivation/output-deferred.json b/src/libstore-tests/data/derivation/output-deferred.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-deferred.json
rename to src/libstore-tests/data/derivation/output-deferred.json
diff --git a/tests/unit/libstore/data/derivation/output-impure.json b/src/libstore-tests/data/derivation/output-impure.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-impure.json
rename to src/libstore-tests/data/derivation/output-impure.json
diff --git a/tests/unit/libstore/data/derivation/output-inputAddressed.json b/src/libstore-tests/data/derivation/output-inputAddressed.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/output-inputAddressed.json
rename to src/libstore-tests/data/derivation/output-inputAddressed.json
diff --git a/tests/unit/libstore/data/derivation/simple.drv b/src/libstore-tests/data/derivation/simple.drv
similarity index 100%
rename from tests/unit/libstore/data/derivation/simple.drv
rename to src/libstore-tests/data/derivation/simple.drv
diff --git a/tests/unit/libstore/data/derivation/simple.json b/src/libstore-tests/data/derivation/simple.json
similarity index 100%
rename from tests/unit/libstore/data/derivation/simple.json
rename to src/libstore-tests/data/derivation/simple.json
diff --git a/tests/unit/libstore/data/machines/bad_format b/src/libstore-tests/data/machines/bad_format
similarity index 100%
rename from tests/unit/libstore/data/machines/bad_format
rename to src/libstore-tests/data/machines/bad_format
diff --git a/tests/unit/libstore/data/machines/valid b/src/libstore-tests/data/machines/valid
similarity index 100%
rename from tests/unit/libstore/data/machines/valid
rename to src/libstore-tests/data/machines/valid
diff --git a/tests/unit/libstore/data/nar-info/impure.json b/src/libstore-tests/data/nar-info/impure.json
similarity index 100%
rename from tests/unit/libstore/data/nar-info/impure.json
rename to src/libstore-tests/data/nar-info/impure.json
diff --git a/tests/unit/libstore/data/nar-info/pure.json b/src/libstore-tests/data/nar-info/pure.json
similarity index 100%
rename from tests/unit/libstore/data/nar-info/pure.json
rename to src/libstore-tests/data/nar-info/pure.json
diff --git a/tests/unit/libstore/data/path-info/empty_impure.json b/src/libstore-tests/data/path-info/empty_impure.json
similarity index 100%
rename from tests/unit/libstore/data/path-info/empty_impure.json
rename to src/libstore-tests/data/path-info/empty_impure.json
diff --git a/tests/unit/libstore/data/path-info/empty_pure.json b/src/libstore-tests/data/path-info/empty_pure.json
similarity index 100%
rename from tests/unit/libstore/data/path-info/empty_pure.json
rename to src/libstore-tests/data/path-info/empty_pure.json
diff --git a/tests/unit/libstore/data/path-info/impure.json b/src/libstore-tests/data/path-info/impure.json
similarity index 100%
rename from tests/unit/libstore/data/path-info/impure.json
rename to src/libstore-tests/data/path-info/impure.json
diff --git a/tests/unit/libstore/data/path-info/pure.json b/src/libstore-tests/data/path-info/pure.json
similarity index 100%
rename from tests/unit/libstore/data/path-info/pure.json
rename to src/libstore-tests/data/path-info/pure.json
diff --git a/tests/unit/libstore/data/serve-protocol/build-options-2.1.bin b/src/libstore-tests/data/serve-protocol/build-options-2.1.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-options-2.1.bin
rename to src/libstore-tests/data/serve-protocol/build-options-2.1.bin
diff --git a/tests/unit/libstore/data/serve-protocol/build-options-2.2.bin b/src/libstore-tests/data/serve-protocol/build-options-2.2.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-options-2.2.bin
rename to src/libstore-tests/data/serve-protocol/build-options-2.2.bin
diff --git a/tests/unit/libstore/data/serve-protocol/build-options-2.3.bin b/src/libstore-tests/data/serve-protocol/build-options-2.3.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-options-2.3.bin
rename to src/libstore-tests/data/serve-protocol/build-options-2.3.bin
diff --git a/tests/unit/libstore/data/serve-protocol/build-options-2.7.bin b/src/libstore-tests/data/serve-protocol/build-options-2.7.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-options-2.7.bin
rename to src/libstore-tests/data/serve-protocol/build-options-2.7.bin
diff --git a/tests/unit/libstore/data/serve-protocol/build-result-2.2.bin b/src/libstore-tests/data/serve-protocol/build-result-2.2.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-result-2.2.bin
rename to src/libstore-tests/data/serve-protocol/build-result-2.2.bin
diff --git a/tests/unit/libstore/data/serve-protocol/build-result-2.3.bin b/src/libstore-tests/data/serve-protocol/build-result-2.3.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-result-2.3.bin
rename to src/libstore-tests/data/serve-protocol/build-result-2.3.bin
diff --git a/tests/unit/libstore/data/serve-protocol/build-result-2.6.bin b/src/libstore-tests/data/serve-protocol/build-result-2.6.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/build-result-2.6.bin
rename to src/libstore-tests/data/serve-protocol/build-result-2.6.bin
diff --git a/tests/unit/libstore/data/serve-protocol/content-address.bin b/src/libstore-tests/data/serve-protocol/content-address.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/content-address.bin
rename to src/libstore-tests/data/serve-protocol/content-address.bin
diff --git a/tests/unit/libstore/data/serve-protocol/drv-output.bin b/src/libstore-tests/data/serve-protocol/drv-output.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/drv-output.bin
rename to src/libstore-tests/data/serve-protocol/drv-output.bin
diff --git a/tests/unit/libstore/data/serve-protocol/handshake-to-client.bin b/src/libstore-tests/data/serve-protocol/handshake-to-client.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/handshake-to-client.bin
rename to src/libstore-tests/data/serve-protocol/handshake-to-client.bin
diff --git a/tests/unit/libstore/data/serve-protocol/optional-content-address.bin b/src/libstore-tests/data/serve-protocol/optional-content-address.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/optional-content-address.bin
rename to src/libstore-tests/data/serve-protocol/optional-content-address.bin
diff --git a/tests/unit/libstore/data/serve-protocol/optional-store-path.bin b/src/libstore-tests/data/serve-protocol/optional-store-path.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/optional-store-path.bin
rename to src/libstore-tests/data/serve-protocol/optional-store-path.bin
diff --git a/tests/unit/libstore/data/serve-protocol/realisation.bin b/src/libstore-tests/data/serve-protocol/realisation.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/realisation.bin
rename to src/libstore-tests/data/serve-protocol/realisation.bin
diff --git a/tests/unit/libstore/data/serve-protocol/set.bin b/src/libstore-tests/data/serve-protocol/set.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/set.bin
rename to src/libstore-tests/data/serve-protocol/set.bin
diff --git a/tests/unit/libstore/data/serve-protocol/store-path.bin b/src/libstore-tests/data/serve-protocol/store-path.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/store-path.bin
rename to src/libstore-tests/data/serve-protocol/store-path.bin
diff --git a/tests/unit/libstore/data/serve-protocol/string.bin b/src/libstore-tests/data/serve-protocol/string.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/string.bin
rename to src/libstore-tests/data/serve-protocol/string.bin
diff --git a/tests/unit/libstore/data/serve-protocol/unkeyed-valid-path-info-2.3.bin b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/unkeyed-valid-path-info-2.3.bin
rename to src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin
diff --git a/tests/unit/libstore/data/serve-protocol/unkeyed-valid-path-info-2.4.bin b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/unkeyed-valid-path-info-2.4.bin
rename to src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin
diff --git a/tests/unit/libstore/data/serve-protocol/vector.bin b/src/libstore-tests/data/serve-protocol/vector.bin
similarity index 100%
rename from tests/unit/libstore/data/serve-protocol/vector.bin
rename to src/libstore-tests/data/serve-protocol/vector.bin
diff --git a/tests/unit/libstore/data/store-reference/auto.txt b/src/libstore-tests/data/store-reference/auto.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/auto.txt
rename to src/libstore-tests/data/store-reference/auto.txt
diff --git a/tests/unit/libstore/data/store-reference/auto_param.txt b/src/libstore-tests/data/store-reference/auto_param.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/auto_param.txt
rename to src/libstore-tests/data/store-reference/auto_param.txt
diff --git a/tests/unit/libstore/data/store-reference/local_1.txt b/src/libstore-tests/data/store-reference/local_1.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/local_1.txt
rename to src/libstore-tests/data/store-reference/local_1.txt
diff --git a/tests/unit/libstore/data/store-reference/local_2.txt b/src/libstore-tests/data/store-reference/local_2.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/local_2.txt
rename to src/libstore-tests/data/store-reference/local_2.txt
diff --git a/tests/unit/libstore/data/store-reference/local_shorthand_1.txt b/src/libstore-tests/data/store-reference/local_shorthand_1.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/local_shorthand_1.txt
rename to src/libstore-tests/data/store-reference/local_shorthand_1.txt
diff --git a/tests/unit/libstore/data/store-reference/local_shorthand_2.txt b/src/libstore-tests/data/store-reference/local_shorthand_2.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/local_shorthand_2.txt
rename to src/libstore-tests/data/store-reference/local_shorthand_2.txt
diff --git a/tests/unit/libstore/data/store-reference/ssh.txt b/src/libstore-tests/data/store-reference/ssh.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/ssh.txt
rename to src/libstore-tests/data/store-reference/ssh.txt
diff --git a/tests/unit/libstore/data/store-reference/unix.txt b/src/libstore-tests/data/store-reference/unix.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/unix.txt
rename to src/libstore-tests/data/store-reference/unix.txt
diff --git a/tests/unit/libstore/data/store-reference/unix_shorthand.txt b/src/libstore-tests/data/store-reference/unix_shorthand.txt
similarity index 100%
rename from tests/unit/libstore/data/store-reference/unix_shorthand.txt
rename to src/libstore-tests/data/store-reference/unix_shorthand.txt
diff --git a/tests/unit/libstore/data/worker-protocol/build-mode.bin b/src/libstore-tests/data/worker-protocol/build-mode.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/build-mode.bin
rename to src/libstore-tests/data/worker-protocol/build-mode.bin
diff --git a/tests/unit/libstore/data/worker-protocol/build-result-1.27.bin b/src/libstore-tests/data/worker-protocol/build-result-1.27.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/build-result-1.27.bin
rename to src/libstore-tests/data/worker-protocol/build-result-1.27.bin
diff --git a/tests/unit/libstore/data/worker-protocol/build-result-1.28.bin b/src/libstore-tests/data/worker-protocol/build-result-1.28.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/build-result-1.28.bin
rename to src/libstore-tests/data/worker-protocol/build-result-1.28.bin
diff --git a/tests/unit/libstore/data/worker-protocol/build-result-1.29.bin b/src/libstore-tests/data/worker-protocol/build-result-1.29.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/build-result-1.29.bin
rename to src/libstore-tests/data/worker-protocol/build-result-1.29.bin
diff --git a/tests/unit/libstore/data/worker-protocol/build-result-1.37.bin b/src/libstore-tests/data/worker-protocol/build-result-1.37.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/build-result-1.37.bin
rename to src/libstore-tests/data/worker-protocol/build-result-1.37.bin
diff --git a/tests/unit/libstore/data/worker-protocol/client-handshake-info_1_30.bin b/src/libstore-tests/data/worker-protocol/client-handshake-info_1_30.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/client-handshake-info_1_30.bin
rename to src/libstore-tests/data/worker-protocol/client-handshake-info_1_30.bin
diff --git a/tests/unit/libstore/data/worker-protocol/client-handshake-info_1_33.bin b/src/libstore-tests/data/worker-protocol/client-handshake-info_1_33.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/client-handshake-info_1_33.bin
rename to src/libstore-tests/data/worker-protocol/client-handshake-info_1_33.bin
diff --git a/tests/unit/libstore/data/worker-protocol/client-handshake-info_1_35.bin b/src/libstore-tests/data/worker-protocol/client-handshake-info_1_35.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/client-handshake-info_1_35.bin
rename to src/libstore-tests/data/worker-protocol/client-handshake-info_1_35.bin
diff --git a/tests/unit/libstore/data/worker-protocol/content-address.bin b/src/libstore-tests/data/worker-protocol/content-address.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/content-address.bin
rename to src/libstore-tests/data/worker-protocol/content-address.bin
diff --git a/tests/unit/libstore/data/worker-protocol/derived-path-1.29.bin b/src/libstore-tests/data/worker-protocol/derived-path-1.29.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/derived-path-1.29.bin
rename to src/libstore-tests/data/worker-protocol/derived-path-1.29.bin
diff --git a/tests/unit/libstore/data/worker-protocol/derived-path-1.30.bin b/src/libstore-tests/data/worker-protocol/derived-path-1.30.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/derived-path-1.30.bin
rename to src/libstore-tests/data/worker-protocol/derived-path-1.30.bin
diff --git a/tests/unit/libstore/data/worker-protocol/drv-output.bin b/src/libstore-tests/data/worker-protocol/drv-output.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/drv-output.bin
rename to src/libstore-tests/data/worker-protocol/drv-output.bin
diff --git a/tests/unit/libstore/data/worker-protocol/handshake-to-client.bin b/src/libstore-tests/data/worker-protocol/handshake-to-client.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/handshake-to-client.bin
rename to src/libstore-tests/data/worker-protocol/handshake-to-client.bin
diff --git a/tests/unit/libstore/data/worker-protocol/keyed-build-result-1.29.bin b/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/keyed-build-result-1.29.bin
rename to src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.bin
diff --git a/tests/unit/libstore/data/worker-protocol/optional-content-address.bin b/src/libstore-tests/data/worker-protocol/optional-content-address.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/optional-content-address.bin
rename to src/libstore-tests/data/worker-protocol/optional-content-address.bin
diff --git a/tests/unit/libstore/data/worker-protocol/optional-store-path.bin b/src/libstore-tests/data/worker-protocol/optional-store-path.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/optional-store-path.bin
rename to src/libstore-tests/data/worker-protocol/optional-store-path.bin
diff --git a/tests/unit/libstore/data/worker-protocol/optional-trusted-flag.bin b/src/libstore-tests/data/worker-protocol/optional-trusted-flag.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/optional-trusted-flag.bin
rename to src/libstore-tests/data/worker-protocol/optional-trusted-flag.bin
diff --git a/tests/unit/libstore/data/worker-protocol/realisation.bin b/src/libstore-tests/data/worker-protocol/realisation.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/realisation.bin
rename to src/libstore-tests/data/worker-protocol/realisation.bin
diff --git a/tests/unit/libstore/data/worker-protocol/set.bin b/src/libstore-tests/data/worker-protocol/set.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/set.bin
rename to src/libstore-tests/data/worker-protocol/set.bin
diff --git a/tests/unit/libstore/data/worker-protocol/store-path.bin b/src/libstore-tests/data/worker-protocol/store-path.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/store-path.bin
rename to src/libstore-tests/data/worker-protocol/store-path.bin
diff --git a/tests/unit/libstore/data/worker-protocol/string.bin b/src/libstore-tests/data/worker-protocol/string.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/string.bin
rename to src/libstore-tests/data/worker-protocol/string.bin
diff --git a/tests/unit/libstore/data/worker-protocol/unkeyed-valid-path-info-1.15.bin b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/unkeyed-valid-path-info-1.15.bin
rename to src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin
diff --git a/tests/unit/libstore/data/worker-protocol/valid-path-info-1.15.bin b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/valid-path-info-1.15.bin
rename to src/libstore-tests/data/worker-protocol/valid-path-info-1.15.bin
diff --git a/tests/unit/libstore/data/worker-protocol/valid-path-info-1.16.bin b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/valid-path-info-1.16.bin
rename to src/libstore-tests/data/worker-protocol/valid-path-info-1.16.bin
diff --git a/tests/unit/libstore/data/worker-protocol/vector.bin b/src/libstore-tests/data/worker-protocol/vector.bin
similarity index 100%
rename from tests/unit/libstore/data/worker-protocol/vector.bin
rename to src/libstore-tests/data/worker-protocol/vector.bin
diff --git a/tests/unit/libstore/derivation-advanced-attrs.cc b/src/libstore-tests/derivation-advanced-attrs.cc
similarity index 100%
rename from tests/unit/libstore/derivation-advanced-attrs.cc
rename to src/libstore-tests/derivation-advanced-attrs.cc
diff --git a/tests/unit/libstore/derivation.cc b/src/libstore-tests/derivation.cc
similarity index 100%
rename from tests/unit/libstore/derivation.cc
rename to src/libstore-tests/derivation.cc
diff --git a/tests/unit/libstore/derived-path.cc b/src/libstore-tests/derived-path.cc
similarity index 100%
rename from tests/unit/libstore/derived-path.cc
rename to src/libstore-tests/derived-path.cc
diff --git a/tests/unit/libstore/downstream-placeholder.cc b/src/libstore-tests/downstream-placeholder.cc
similarity index 100%
rename from tests/unit/libstore/downstream-placeholder.cc
rename to src/libstore-tests/downstream-placeholder.cc
diff --git a/tests/unit/libstore/http-binary-cache-store.cc b/src/libstore-tests/http-binary-cache-store.cc
similarity index 100%
rename from tests/unit/libstore/http-binary-cache-store.cc
rename to src/libstore-tests/http-binary-cache-store.cc
diff --git a/tests/unit/libstore/legacy-ssh-store.cc b/src/libstore-tests/legacy-ssh-store.cc
similarity index 100%
rename from tests/unit/libstore/legacy-ssh-store.cc
rename to src/libstore-tests/legacy-ssh-store.cc
diff --git a/tests/unit/libstore/local-binary-cache-store.cc b/src/libstore-tests/local-binary-cache-store.cc
similarity index 100%
rename from tests/unit/libstore/local-binary-cache-store.cc
rename to src/libstore-tests/local-binary-cache-store.cc
diff --git a/tests/unit/libstore/local-overlay-store.cc b/src/libstore-tests/local-overlay-store.cc
similarity index 100%
rename from tests/unit/libstore/local-overlay-store.cc
rename to src/libstore-tests/local-overlay-store.cc
diff --git a/tests/unit/libstore/local-store.cc b/src/libstore-tests/local-store.cc
similarity index 100%
rename from tests/unit/libstore/local-store.cc
rename to src/libstore-tests/local-store.cc
diff --git a/tests/unit/libstore/local.mk b/src/libstore-tests/local.mk
similarity index 92%
rename from tests/unit/libstore/local.mk
rename to src/libstore-tests/local.mk
index 8d3d6b0af..b565ff0be 100644
--- a/tests/unit/libstore/local.mk
+++ b/src/libstore-tests/local.mk
@@ -17,8 +17,8 @@ endif
 libstore-tests_SOURCES := $(wildcard $(d)/*.cc)
 
 libstore-tests_EXTRA_INCLUDES = \
-    -I tests/unit/libstore-support \
-    -I tests/unit/libutil-support \
+    -I src/libstore-test-support \
+    -I src/libutil-test-support \
     $(INCLUDE_libstore) \
     $(INCLUDE_libstorec) \
     $(INCLUDE_libutil) \
diff --git a/tests/unit/libstore/machines.cc b/src/libstore-tests/machines.cc
similarity index 100%
rename from tests/unit/libstore/machines.cc
rename to src/libstore-tests/machines.cc
diff --git a/tests/unit/libstore/meson.build b/src/libstore-tests/meson.build
similarity index 100%
rename from tests/unit/libstore/meson.build
rename to src/libstore-tests/meson.build
diff --git a/tests/unit/libstore/nar-info-disk-cache.cc b/src/libstore-tests/nar-info-disk-cache.cc
similarity index 100%
rename from tests/unit/libstore/nar-info-disk-cache.cc
rename to src/libstore-tests/nar-info-disk-cache.cc
diff --git a/tests/unit/libstore/nar-info.cc b/src/libstore-tests/nar-info.cc
similarity index 100%
rename from tests/unit/libstore/nar-info.cc
rename to src/libstore-tests/nar-info.cc
diff --git a/tests/unit/libstore/nix_api_store.cc b/src/libstore-tests/nix_api_store.cc
similarity index 100%
rename from tests/unit/libstore/nix_api_store.cc
rename to src/libstore-tests/nix_api_store.cc
diff --git a/tests/unit/libstore/outputs-spec.cc b/src/libstore-tests/outputs-spec.cc
similarity index 100%
rename from tests/unit/libstore/outputs-spec.cc
rename to src/libstore-tests/outputs-spec.cc
diff --git a/tests/unit/libstore/package.nix b/src/libstore-tests/package.nix
similarity index 90%
rename from tests/unit/libstore/package.nix
rename to src/libstore-tests/package.nix
index 5fbb34a76..5b2fd108b 100644
--- a/tests/unit/libstore/package.nix
+++ b/src/libstore-tests/package.nix
@@ -28,9 +28,9 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -52,7 +52,7 @@ mkMesonExecutable (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
@@ -71,7 +71,7 @@ mkMesonExecutable (finalAttrs: {
           root = ../..;
           fileset = lib.fileset.unions [
             ./data
-            ../../functional/derivation
+            ../../tests/functional/derivation
           ];
         };
       in runCommand "${finalAttrs.pname}-run" {
@@ -80,7 +80,7 @@ mkMesonExecutable (finalAttrs: {
         export HOME="$PWD/home-dir"
         mkdir -p "$HOME"
       '' + ''
-        export _NIX_TEST_UNIT_DATA=${data + "/unit/libstore/data"}
+        export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"}
         ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
         touch $out
       '');
diff --git a/tests/unit/libstore/path-info.cc b/src/libstore-tests/path-info.cc
similarity index 100%
rename from tests/unit/libstore/path-info.cc
rename to src/libstore-tests/path-info.cc
diff --git a/tests/unit/libstore/path.cc b/src/libstore-tests/path.cc
similarity index 100%
rename from tests/unit/libstore/path.cc
rename to src/libstore-tests/path.cc
diff --git a/tests/unit/libstore/references.cc b/src/libstore-tests/references.cc
similarity index 100%
rename from tests/unit/libstore/references.cc
rename to src/libstore-tests/references.cc
diff --git a/tests/unit/libstore/s3-binary-cache-store.cc b/src/libstore-tests/s3-binary-cache-store.cc
similarity index 100%
rename from tests/unit/libstore/s3-binary-cache-store.cc
rename to src/libstore-tests/s3-binary-cache-store.cc
diff --git a/tests/unit/libstore/serve-protocol.cc b/src/libstore-tests/serve-protocol.cc
similarity index 100%
rename from tests/unit/libstore/serve-protocol.cc
rename to src/libstore-tests/serve-protocol.cc
diff --git a/tests/unit/libstore/ssh-store.cc b/src/libstore-tests/ssh-store.cc
similarity index 100%
rename from tests/unit/libstore/ssh-store.cc
rename to src/libstore-tests/ssh-store.cc
diff --git a/tests/unit/libstore/store-reference.cc b/src/libstore-tests/store-reference.cc
similarity index 100%
rename from tests/unit/libstore/store-reference.cc
rename to src/libstore-tests/store-reference.cc
diff --git a/tests/unit/libstore/uds-remote-store.cc b/src/libstore-tests/uds-remote-store.cc
similarity index 100%
rename from tests/unit/libstore/uds-remote-store.cc
rename to src/libstore-tests/uds-remote-store.cc
diff --git a/tests/unit/libstore/worker-protocol.cc b/src/libstore-tests/worker-protocol.cc
similarity index 100%
rename from tests/unit/libstore/worker-protocol.cc
rename to src/libstore-tests/worker-protocol.cc
diff --git a/src/libutil-test-support/.version b/src/libutil-test-support/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libutil-test-support/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/src/libutil-test-support/build-utils-meson b/src/libutil-test-support/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libutil-test-support/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libutil-support/local.mk b/src/libutil-test-support/local.mk
similarity index 100%
rename from tests/unit/libutil-support/local.mk
rename to src/libutil-test-support/local.mk
diff --git a/tests/unit/libutil-support/meson.build b/src/libutil-test-support/meson.build
similarity index 100%
rename from tests/unit/libutil-support/meson.build
rename to src/libutil-test-support/meson.build
diff --git a/tests/unit/libutil-support/package.nix b/src/libutil-test-support/package.nix
similarity index 90%
rename from tests/unit/libutil-support/package.nix
rename to src/libutil-test-support/package.nix
index 16319cf2d..2525e1602 100644
--- a/tests/unit/libutil-support/package.nix
+++ b/src/libutil-test-support/package.nix
@@ -21,9 +21,9 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -41,7 +41,7 @@ mkMesonLibrary (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libutil-support/tests/characterization.hh b/src/libutil-test-support/tests/characterization.hh
similarity index 100%
rename from tests/unit/libutil-support/tests/characterization.hh
rename to src/libutil-test-support/tests/characterization.hh
diff --git a/tests/unit/libutil-support/tests/gtest-with-params.hh b/src/libutil-test-support/tests/gtest-with-params.hh
similarity index 100%
rename from tests/unit/libutil-support/tests/gtest-with-params.hh
rename to src/libutil-test-support/tests/gtest-with-params.hh
diff --git a/tests/unit/libutil-support/tests/hash.cc b/src/libutil-test-support/tests/hash.cc
similarity index 100%
rename from tests/unit/libutil-support/tests/hash.cc
rename to src/libutil-test-support/tests/hash.cc
diff --git a/tests/unit/libutil-support/tests/hash.hh b/src/libutil-test-support/tests/hash.hh
similarity index 100%
rename from tests/unit/libutil-support/tests/hash.hh
rename to src/libutil-test-support/tests/hash.hh
diff --git a/tests/unit/libutil-support/tests/nix_api_util.hh b/src/libutil-test-support/tests/nix_api_util.hh
similarity index 100%
rename from tests/unit/libutil-support/tests/nix_api_util.hh
rename to src/libutil-test-support/tests/nix_api_util.hh
diff --git a/tests/unit/libutil-support/tests/string_callback.cc b/src/libutil-test-support/tests/string_callback.cc
similarity index 100%
rename from tests/unit/libutil-support/tests/string_callback.cc
rename to src/libutil-test-support/tests/string_callback.cc
diff --git a/tests/unit/libutil-support/tests/string_callback.hh b/src/libutil-test-support/tests/string_callback.hh
similarity index 100%
rename from tests/unit/libutil-support/tests/string_callback.hh
rename to src/libutil-test-support/tests/string_callback.hh
diff --git a/tests/unit/libutil-support/tests/tracing-file-system-object-sink.cc b/src/libutil-test-support/tests/tracing-file-system-object-sink.cc
similarity index 100%
rename from tests/unit/libutil-support/tests/tracing-file-system-object-sink.cc
rename to src/libutil-test-support/tests/tracing-file-system-object-sink.cc
diff --git a/tests/unit/libutil-support/tests/tracing-file-system-object-sink.hh b/src/libutil-test-support/tests/tracing-file-system-object-sink.hh
similarity index 100%
rename from tests/unit/libutil-support/tests/tracing-file-system-object-sink.hh
rename to src/libutil-test-support/tests/tracing-file-system-object-sink.hh
diff --git a/src/libutil-tests/.version b/src/libutil-tests/.version
new file mode 120000
index 000000000..b7badcd0c
--- /dev/null
+++ b/src/libutil-tests/.version
@@ -0,0 +1 @@
+../../.version
\ No newline at end of file
diff --git a/tests/unit/libutil/args.cc b/src/libutil-tests/args.cc
similarity index 100%
rename from tests/unit/libutil/args.cc
rename to src/libutil-tests/args.cc
diff --git a/src/libutil-tests/build-utils-meson b/src/libutil-tests/build-utils-meson
new file mode 120000
index 000000000..5fff21bab
--- /dev/null
+++ b/src/libutil-tests/build-utils-meson
@@ -0,0 +1 @@
+../../build-utils-meson
\ No newline at end of file
diff --git a/tests/unit/libutil/canon-path.cc b/src/libutil-tests/canon-path.cc
similarity index 100%
rename from tests/unit/libutil/canon-path.cc
rename to src/libutil-tests/canon-path.cc
diff --git a/tests/unit/libutil/checked-arithmetic.cc b/src/libutil-tests/checked-arithmetic.cc
similarity index 100%
rename from tests/unit/libutil/checked-arithmetic.cc
rename to src/libutil-tests/checked-arithmetic.cc
diff --git a/tests/unit/libutil/chunked-vector.cc b/src/libutil-tests/chunked-vector.cc
similarity index 100%
rename from tests/unit/libutil/chunked-vector.cc
rename to src/libutil-tests/chunked-vector.cc
diff --git a/tests/unit/libutil/closure.cc b/src/libutil-tests/closure.cc
similarity index 100%
rename from tests/unit/libutil/closure.cc
rename to src/libutil-tests/closure.cc
diff --git a/tests/unit/libutil/compression.cc b/src/libutil-tests/compression.cc
similarity index 100%
rename from tests/unit/libutil/compression.cc
rename to src/libutil-tests/compression.cc
diff --git a/tests/unit/libutil/config.cc b/src/libutil-tests/config.cc
similarity index 100%
rename from tests/unit/libutil/config.cc
rename to src/libutil-tests/config.cc
diff --git a/tests/unit/libutil/data/git/check-data.sh b/src/libutil-tests/data/git/check-data.sh
similarity index 100%
rename from tests/unit/libutil/data/git/check-data.sh
rename to src/libutil-tests/data/git/check-data.sh
diff --git a/tests/unit/libutil/data/git/hello-world-blob.bin b/src/libutil-tests/data/git/hello-world-blob.bin
similarity index 100%
rename from tests/unit/libutil/data/git/hello-world-blob.bin
rename to src/libutil-tests/data/git/hello-world-blob.bin
diff --git a/tests/unit/libutil/data/git/hello-world.bin b/src/libutil-tests/data/git/hello-world.bin
similarity index 100%
rename from tests/unit/libutil/data/git/hello-world.bin
rename to src/libutil-tests/data/git/hello-world.bin
diff --git a/tests/unit/libutil/data/git/tree.bin b/src/libutil-tests/data/git/tree.bin
similarity index 100%
rename from tests/unit/libutil/data/git/tree.bin
rename to src/libutil-tests/data/git/tree.bin
diff --git a/tests/unit/libutil/data/git/tree.txt b/src/libutil-tests/data/git/tree.txt
similarity index 100%
rename from tests/unit/libutil/data/git/tree.txt
rename to src/libutil-tests/data/git/tree.txt
diff --git a/tests/unit/libutil/executable-path.cc b/src/libutil-tests/executable-path.cc
similarity index 100%
rename from tests/unit/libutil/executable-path.cc
rename to src/libutil-tests/executable-path.cc
diff --git a/tests/unit/libutil/file-content-address.cc b/src/libutil-tests/file-content-address.cc
similarity index 100%
rename from tests/unit/libutil/file-content-address.cc
rename to src/libutil-tests/file-content-address.cc
diff --git a/tests/unit/libutil/file-system.cc b/src/libutil-tests/file-system.cc
similarity index 100%
rename from tests/unit/libutil/file-system.cc
rename to src/libutil-tests/file-system.cc
diff --git a/tests/unit/libutil/git.cc b/src/libutil-tests/git.cc
similarity index 99%
rename from tests/unit/libutil/git.cc
rename to src/libutil-tests/git.cc
index 9232de5b9..048956a58 100644
--- a/tests/unit/libutil/git.cc
+++ b/src/libutil-tests/git.cc
@@ -88,7 +88,7 @@ TEST_F(GitTest, blob_write) {
 /**
  * This data is for "shallow" tree tests. However, we use "real" hashes
  * so that we can check our test data in a small shell script test test
- * (`tests/unit/libutil/data/git/check-data.sh`).
+ * (`src/libutil-tests/data/git/check-data.sh`).
  */
 const static Tree tree = {
     {
diff --git a/tests/unit/libutil/hash.cc b/src/libutil-tests/hash.cc
similarity index 100%
rename from tests/unit/libutil/hash.cc
rename to src/libutil-tests/hash.cc
diff --git a/tests/unit/libutil/hilite.cc b/src/libutil-tests/hilite.cc
similarity index 100%
rename from tests/unit/libutil/hilite.cc
rename to src/libutil-tests/hilite.cc
diff --git a/tests/unit/libutil/json-utils.cc b/src/libutil-tests/json-utils.cc
similarity index 100%
rename from tests/unit/libutil/json-utils.cc
rename to src/libutil-tests/json-utils.cc
diff --git a/tests/unit/libutil/local.mk b/src/libutil-tests/local.mk
similarity index 96%
rename from tests/unit/libutil/local.mk
rename to src/libutil-tests/local.mk
index 404f35cf1..c747863a4 100644
--- a/tests/unit/libutil/local.mk
+++ b/src/libutil-tests/local.mk
@@ -17,7 +17,7 @@ endif
 libutil-tests_SOURCES := $(wildcard $(d)/*.cc)
 
 libutil-tests_EXTRA_INCLUDES = \
-    -I tests/unit/libutil-support \
+    -I src/libutil-test-support \
     $(INCLUDE_libutil) \
     $(INCLUDE_libutilc)
 
diff --git a/tests/unit/libutil/logging.cc b/src/libutil-tests/logging.cc
similarity index 100%
rename from tests/unit/libutil/logging.cc
rename to src/libutil-tests/logging.cc
diff --git a/tests/unit/libutil/lru-cache.cc b/src/libutil-tests/lru-cache.cc
similarity index 100%
rename from tests/unit/libutil/lru-cache.cc
rename to src/libutil-tests/lru-cache.cc
diff --git a/tests/unit/libutil/meson.build b/src/libutil-tests/meson.build
similarity index 100%
rename from tests/unit/libutil/meson.build
rename to src/libutil-tests/meson.build
diff --git a/tests/unit/libutil/nix_api_util.cc b/src/libutil-tests/nix_api_util.cc
similarity index 100%
rename from tests/unit/libutil/nix_api_util.cc
rename to src/libutil-tests/nix_api_util.cc
diff --git a/tests/unit/libutil/package.nix b/src/libutil-tests/package.nix
similarity index 94%
rename from tests/unit/libutil/package.nix
rename to src/libutil-tests/package.nix
index 37a80e639..b099037ee 100644
--- a/tests/unit/libutil/package.nix
+++ b/src/libutil-tests/package.nix
@@ -26,9 +26,9 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../../build-utils-meson
+    ../../build-utils-meson
     ./build-utils-meson
-    ../../../.version
+    ../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -49,7 +49,7 @@ mkMesonExecutable (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../../.version
+      echo ${version} > ../../.version
     '';
 
   mesonFlags = [
diff --git a/tests/unit/libutil/pool.cc b/src/libutil-tests/pool.cc
similarity index 100%
rename from tests/unit/libutil/pool.cc
rename to src/libutil-tests/pool.cc
diff --git a/tests/unit/libutil/position.cc b/src/libutil-tests/position.cc
similarity index 100%
rename from tests/unit/libutil/position.cc
rename to src/libutil-tests/position.cc
diff --git a/tests/unit/libutil/processes.cc b/src/libutil-tests/processes.cc
similarity index 100%
rename from tests/unit/libutil/processes.cc
rename to src/libutil-tests/processes.cc
diff --git a/tests/unit/libutil/references.cc b/src/libutil-tests/references.cc
similarity index 100%
rename from tests/unit/libutil/references.cc
rename to src/libutil-tests/references.cc
diff --git a/tests/unit/libutil/spawn.cc b/src/libutil-tests/spawn.cc
similarity index 100%
rename from tests/unit/libutil/spawn.cc
rename to src/libutil-tests/spawn.cc
diff --git a/tests/unit/libutil/strings.cc b/src/libutil-tests/strings.cc
similarity index 100%
rename from tests/unit/libutil/strings.cc
rename to src/libutil-tests/strings.cc
diff --git a/tests/unit/libutil/suggestions.cc b/src/libutil-tests/suggestions.cc
similarity index 100%
rename from tests/unit/libutil/suggestions.cc
rename to src/libutil-tests/suggestions.cc
diff --git a/tests/unit/libutil/terminal.cc b/src/libutil-tests/terminal.cc
similarity index 100%
rename from tests/unit/libutil/terminal.cc
rename to src/libutil-tests/terminal.cc
diff --git a/tests/unit/libutil/url.cc b/src/libutil-tests/url.cc
similarity index 100%
rename from tests/unit/libutil/url.cc
rename to src/libutil-tests/url.cc
diff --git a/tests/unit/libutil/util.cc b/src/libutil-tests/util.cc
similarity index 100%
rename from tests/unit/libutil/util.cc
rename to src/libutil-tests/util.cc
diff --git a/tests/unit/libutil/xml-writer.cc b/src/libutil-tests/xml-writer.cc
similarity index 100%
rename from tests/unit/libutil/xml-writer.cc
rename to src/libutil-tests/xml-writer.cc
diff --git a/src/nix-expr-test-support b/src/nix-expr-test-support
deleted file mode 120000
index 427b80dff..000000000
--- a/src/nix-expr-test-support
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libexpr-support
\ No newline at end of file
diff --git a/src/nix-expr-tests b/src/nix-expr-tests
deleted file mode 120000
index 3af7110d3..000000000
--- a/src/nix-expr-tests
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libexpr
\ No newline at end of file
diff --git a/src/nix-fetchers-tests b/src/nix-fetchers-tests
deleted file mode 120000
index 80e4b68ae..000000000
--- a/src/nix-fetchers-tests
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libfetchers
\ No newline at end of file
diff --git a/src/nix-flake-tests b/src/nix-flake-tests
deleted file mode 120000
index bb2d49400..000000000
--- a/src/nix-flake-tests
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libflake
\ No newline at end of file
diff --git a/src/nix-store-test-support b/src/nix-store-test-support
deleted file mode 120000
index af4befd90..000000000
--- a/src/nix-store-test-support
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libstore-support
\ No newline at end of file
diff --git a/src/nix-store-tests b/src/nix-store-tests
deleted file mode 120000
index fc9b910af..000000000
--- a/src/nix-store-tests
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libstore
\ No newline at end of file
diff --git a/src/nix-util-test-support b/src/nix-util-test-support
deleted file mode 120000
index 4b25930eb..000000000
--- a/src/nix-util-test-support
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libutil-support
\ No newline at end of file
diff --git a/src/nix-util-tests b/src/nix-util-tests
deleted file mode 120000
index e1138411a..000000000
--- a/src/nix-util-tests
+++ /dev/null
@@ -1 +0,0 @@
-../tests/unit/libutil
\ No newline at end of file
diff --git a/tests/unit/libexpr-support/.version b/tests/unit/libexpr-support/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libexpr-support/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libexpr-support/build-utils-meson b/tests/unit/libexpr-support/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libexpr-support/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libexpr/.version b/tests/unit/libexpr/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libexpr/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libexpr/build-utils-meson b/tests/unit/libexpr/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libexpr/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libfetchers/.version b/tests/unit/libfetchers/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libfetchers/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libfetchers/build-utils-meson b/tests/unit/libfetchers/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libfetchers/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libflake/.version b/tests/unit/libflake/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libflake/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libflake/build-utils-meson b/tests/unit/libflake/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libflake/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libstore-support/.version b/tests/unit/libstore-support/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libstore-support/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libstore-support/build-utils-meson b/tests/unit/libstore-support/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libstore-support/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libstore/.version b/tests/unit/libstore/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libstore/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libstore/build-utils-meson b/tests/unit/libstore/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libstore/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes-defaults.drv b/tests/unit/libstore/data/derivation/advanced-attributes-defaults.drv
deleted file mode 120000
index 353090ad8..000000000
--- a/tests/unit/libstore/data/derivation/advanced-attributes-defaults.drv
+++ /dev/null
@@ -1 +0,0 @@
-../../../../functional/derivation/advanced-attributes-defaults.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.drv b/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.drv
deleted file mode 120000
index 11713da12..000000000
--- a/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.drv
+++ /dev/null
@@ -1 +0,0 @@
-../../../../functional/derivation/advanced-attributes-structured-attrs-defaults.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.drv b/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.drv
deleted file mode 120000
index 962f8ea3f..000000000
--- a/tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.drv
+++ /dev/null
@@ -1 +0,0 @@
-../../../../functional/derivation/advanced-attributes-structured-attrs.drv
\ No newline at end of file
diff --git a/tests/unit/libstore/data/derivation/advanced-attributes.drv b/tests/unit/libstore/data/derivation/advanced-attributes.drv
deleted file mode 120000
index 2a53a05ca..000000000
--- a/tests/unit/libstore/data/derivation/advanced-attributes.drv
+++ /dev/null
@@ -1 +0,0 @@
-../../../../functional/derivation/advanced-attributes.drv
\ No newline at end of file
diff --git a/tests/unit/libutil-support/.version b/tests/unit/libutil-support/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libutil-support/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libutil-support/build-utils-meson b/tests/unit/libutil-support/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libutil-support/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file
diff --git a/tests/unit/libutil/.version b/tests/unit/libutil/.version
deleted file mode 120000
index 0df9915bf..000000000
--- a/tests/unit/libutil/.version
+++ /dev/null
@@ -1 +0,0 @@
-../../../.version
\ No newline at end of file
diff --git a/tests/unit/libutil/build-utils-meson b/tests/unit/libutil/build-utils-meson
deleted file mode 120000
index f2d8e8a50..000000000
--- a/tests/unit/libutil/build-utils-meson
+++ /dev/null
@@ -1 +0,0 @@
-../../../build-utils-meson/
\ No newline at end of file

From defff01a51b3e3339ef2571d0321b3ebc6f5ebfc Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+llakala@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:26:38 -0400
Subject: [PATCH 15/43] docs: clarify syntax for escaping dollar curlies

---
 doc/manual/source/language/string-literals.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/manual/source/language/string-literals.md b/doc/manual/source/language/string-literals.md
index 8f4b75f3e..ca064989a 100644
--- a/doc/manual/source/language/string-literals.md
+++ b/doc/manual/source/language/string-literals.md
@@ -150,6 +150,21 @@ These special characters are escaped as follows:
 
 `''\` escapes any other character.
 
+A "dollar-curly" (`${`) can be written as follows: 
+> **Example**
+>
+> ```nix
+> ''
+>   echo ''${PATH}
+> ''
+> ```
+>
+>     "echo ${PATH}\n"
+
+> **Note**
+>
+> This differs from the syntax for escaping a dollar-curly within double quotes (`"\${"`). Be aware of which one is needed at a given moment.
+
 A "double-dollar-curly" (`$${`) can be written literally.
 
 > **Example**

From 8277b50b6f6d8bbac7bbe4ba3a1009fe49a45990 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sat, 19 Oct 2024 00:40:14 +0300
Subject: [PATCH 16/43] fix(nix/eval.cc): move call to `fs::create_directory`
 out of `assert`

If the call is inside the assertion, then in non-assert builds
the call would be stripped out. This is highly unexpected.
---
 src/nix/eval.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nix/eval.cc b/src/nix/eval.cc
index 04b18ff41..babf2ca32 100644
--- a/src/nix/eval.cc
+++ b/src/nix/eval.cc
@@ -89,8 +89,9 @@ struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
                     // FIXME: disallow strings with contexts?
                     writeFile(path.string(), v.string_view());
                 else if (v.type() == nAttrs) {
+                    [[maybe_unused]] bool directoryCreated = fs::create_directory(path);
                     // Directory should not already exist
-                    assert(fs::create_directory(path.string()));
+                    assert(directoryCreated);
                     for (auto & attr : *v.attrs()) {
                         std::string_view name = state->symbols[attr.name];
                         try {

From 90d257b77168b73ebb7b41ae075ee1233bb79332 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 20 Oct 2024 19:31:16 +0200
Subject: [PATCH 17/43] doc: Explain why tryEval does not return the message

---
 src/libexpr/primops.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index a3c8a0c9c..203d10932 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -944,6 +944,9 @@ static RegisterPrimOp primop_tryEval({
       `let e = { x = throw ""; }; in
       (builtins.tryEval (builtins.deepSeq e e)).success` will be
       `false`.
+
+      `tryEval` intentionally does not return the error message, because that risks bringing non-determinism into the evaluation result, and it would become very difficult to improve error reporting without breaking existing expressions.
+      Instead, use [`builtins.addErrorContext`](@docroot@/language/builtins.md#builtins-addErrorContext) to add context to the error message, and use a Nix unit testing tool for testing.
     )",
     .fun = prim_tryEval,
 });

From 48a7ac23bc55c3465312ad4a2948106bc3271a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 22 Oct 2024 09:33:04 +0200
Subject: [PATCH 18/43] make doxygen build more silent

The buildoutput of doxygen often hides important build warnings and
errors behind a wall of text.
---
 src/external-api-docs/doxygen.cfg.in | 2 ++
 src/internal-api-docs/doxygen.cfg.in | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/external-api-docs/doxygen.cfg.in b/src/external-api-docs/doxygen.cfg.in
index 1be71d895..7ae4c83df 100644
--- a/src/external-api-docs/doxygen.cfg.in
+++ b/src/external-api-docs/doxygen.cfg.in
@@ -56,3 +56,5 @@ GENERATE_TREEVIEW = YES
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
 USE_MDFILE_AS_MAINPAGE = doc/external-api/README.md
+
+QUIET = YES
diff --git a/src/internal-api-docs/doxygen.cfg.in b/src/internal-api-docs/doxygen.cfg.in
index 86c64a396..bf4c42d11 100644
--- a/src/internal-api-docs/doxygen.cfg.in
+++ b/src/internal-api-docs/doxygen.cfg.in
@@ -97,3 +97,6 @@ EXPAND_AS_DEFINED      = \
   DECLARE_WORKER_SERIALISER \
   DECLARE_SERVE_SERIALISER \
   LENGTH_PREFIXED_PROTO_HELPER
+
+WARN_IF_UNDOCUMENTED = NO
+QUIET = YES

From 2105574702b582578c43b551cfe8905715211f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 18 Oct 2024 12:03:33 +0300
Subject: [PATCH 19/43] fix env-vars beeing written to `/tmp`

This overall seems like insecure tmp file handling to me. Because other
users could replace files in /tmp with a symlink and make the nix-shell
override other files.

fixes https://github.com/NixOS/nix/issues/11470
---
 src/nix-build/nix-build.cc    | 17 +++++------------
 tests/functional/nix-shell.sh |  9 +++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 7d32a6f97..3222ab96d 100644
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -526,8 +526,6 @@ static void main_nix_build(int argc, char * * argv)
         // Set the environment.
         auto env = getEnv();
 
-        auto tmp = getEnvNonEmpty("TMPDIR").value_or("/tmp");
-
         if (pure) {
             decltype(env) newEnv;
             for (auto & i : env)
@@ -538,18 +536,16 @@ static void main_nix_build(int argc, char * * argv)
             env["__ETC_PROFILE_SOURCED"] = "1";
         }
 
-        env["NIX_BUILD_TOP"] = env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmp;
+        env["NIX_BUILD_TOP"] = env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmpDir.path();
         env["NIX_STORE"] = store->storeDir;
         env["NIX_BUILD_CORES"] = std::to_string(settings.buildCores);
 
         auto passAsFile = tokenizeString<StringSet>(getOr(drv.env, "passAsFile", ""));
 
-        bool keepTmp = false;
         int fileNr = 0;
 
         for (auto & var : drv.env)
             if (passAsFile.count(var.first)) {
-                keepTmp = true;
                 auto fn = ".attr-" + std::to_string(fileNr++);
                 Path p = (tmpDir.path() / fn).string();
                 writeFile(p, var.second);
@@ -591,7 +587,6 @@ static void main_nix_build(int argc, char * * argv)
 
                 env["NIX_ATTRS_SH_FILE"] = attrsSH;
                 env["NIX_ATTRS_JSON_FILE"] = attrsJSON;
-                keepTmp = true;
             }
         }
 
@@ -601,12 +596,10 @@ static void main_nix_build(int argc, char * * argv)
            lose the current $PATH directories. */
         auto rcfile = (tmpDir.path() / "rc").string();
         std::string rc = fmt(
-                R"(_nix_shell_clean_tmpdir() { command rm -rf %1%; }; )"s +
-                (keepTmp ?
-                    "trap _nix_shell_clean_tmpdir EXIT; "
-                    "exitHooks+=(_nix_shell_clean_tmpdir); "
-                    "failureHooks+=(_nix_shell_clean_tmpdir); ":
-                    "_nix_shell_clean_tmpdir; ") +
+                (R"(_nix_shell_clean_tmpdir() { command rm -rf %1%; };)"s
+                  "trap _nix_shell_clean_tmpdir EXIT; "
+                  "exitHooks+=(_nix_shell_clean_tmpdir); "
+                  "failureHooks+=(_nix_shell_clean_tmpdir); ") +
                 (pure ? "" : "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;") +
                 "%2%"
                 // always clear PATH.
diff --git a/tests/functional/nix-shell.sh b/tests/functional/nix-shell.sh
index b9625eb66..b14e3dc6a 100755
--- a/tests/functional/nix-shell.sh
+++ b/tests/functional/nix-shell.sh
@@ -31,6 +31,15 @@ output=$(nix-shell --pure --keep SELECTED_IMPURE_VAR "$shellDotNix" -A shellDrv
 
 [ "$output" = " - foo - bar - baz" ]
 
+# test NIX_BUILD_TOP
+testTmpDir=$(pwd)/nix-shell
+mkdir -p "$testTmpDir"
+output=$(TMPDIR="$testTmpDir" nix-shell --pure "$shellDotNix" -A shellDrv --run 'echo $NIX_BUILD_TOP')
+[[ "$output" =~ ${testTmpDir}.* ]] || {
+    echo "expected $output =~ ${testTmpDir}.*" >&2
+    exit 1
+}
+
 # Test nix-shell on a .drv
 [[ $(nix-shell --pure $(nix-instantiate "$shellDotNix" -A shellDrv) --run \
     'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX - $TEST_inNixShell"') = " - foo - bar - false" ]]

From 85b0cd320a1d3cdb9bcbfa650f7080839ab2fc55 Mon Sep 17 00:00:00 2001
From: Marian Hammer <marian.hammer@meetwise.com>
Date: Fri, 18 Oct 2024 11:06:41 +0200
Subject: [PATCH 20/43] nix/tests: run test help.sh only if nix is built with
 documentation

tests/functional/help.sh calls nix-* commands with option --help
if nix is built without documentation the option --help throws an error
because the man page it wants to display is missing
---
 configure.ac              | 4 ++++
 package.nix               | 3 ++-
 tests/functional/local.mk | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 198198dea..fc59904f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,10 @@ AS_IF(
   [test "$ENABLE_FUNCTIONAL_TESTS" == "yes" || test "$ENABLE_DOC_GEN" == "yes"],
   [NEED_PROG(jq, jq)])
 
+AS_IF(
+  [test "$ENABLE_DOC_GEN" == "yes"],
+  [NEED_PROG(man, man)])
+
 AS_IF([test "$ENABLE_BUILD" == "yes"],[
 
 # Look for boost, a required dependency.
diff --git a/package.nix b/package.nix
index 00621d475..658f2275f 100644
--- a/package.nix
+++ b/package.nix
@@ -207,9 +207,10 @@ in {
     git
     mercurial
     openssh
-    man # for testing `nix-* --help`
   ] ++ lib.optionals (doInstallCheck || enableManual) [
     jq # Also for custom mdBook preprocessor.
+  ] ++ lib.optionals enableManual [
+    man
   ] ++ lib.optional stdenv.hostPlatform.isStatic unixtools.hexdump
   ;
 
diff --git a/tests/functional/local.mk b/tests/functional/local.mk
index 3f796291a..e50b5eaf1 100644
--- a/tests/functional/local.mk
+++ b/tests/functional/local.mk
@@ -114,7 +114,6 @@ nix_tests = \
   impure-env.sh \
   debugger.sh \
   extra-sandbox-profile.sh \
-  help.sh
 
 ifeq ($(HAVE_LIBCPUID), 1)
   nix_tests += compute-levels.sh
@@ -128,6 +127,10 @@ ifeq ($(ENABLE_BUILD), yes)
   endif
 endif
 
+ifeq ($(ENABLE_DOC_GEN), yes)
+    nix_tests += help.sh
+endif
+
 $(d)/test-libstoreconsumer.sh.test $(d)/test-libstoreconsumer.sh.test-debug: \
   $(buildprefix)$(d)/test-libstoreconsumer/test-libstoreconsumer
 $(d)/plugins.sh.test $(d)/plugins.sh.test-debug: \

From d2c880b03f58eb4fdd6d19eb3ffa4345a0477419 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Fri, 1 Mar 2024 11:42:24 -0500
Subject: [PATCH 21/43] fix: Run all derivation builders inside the sandbox on
 macOS

---
 configure.ac                                  |   6 +-
 package.nix                                   |   2 +
 .../unix/build/local-derivation-goal.cc       | 237 +++++++++---------
 3 files changed, 123 insertions(+), 122 deletions(-)

diff --git a/configure.ac b/configure.ac
index 198198dea..c7c9b3f4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar])
 AC_SYS_LARGEFILE
 
 
-# Solaris-specific stuff.
+# OS-specific stuff.
 case "$host_os" in
   solaris*)
     # Solaris requires -lsocket -lnsl for network functions
     LDFLAGS="-lsocket -lnsl $LDFLAGS"
     ;;
+  darwin*)
+    # Need to link to libsandbox.
+    LDFLAGS="-lsandbox $LDFLAGS"
+    ;;
 esac
 
 
diff --git a/package.nix b/package.nix
index 00621d475..77f1de58c 100644
--- a/package.nix
+++ b/package.nix
@@ -23,6 +23,7 @@
 , libseccomp
 , libsodium
 , man
+, darwin
 , lowdown
 , mdbook
 , mdbook-linkcheck
@@ -232,6 +233,7 @@ in {
     gtest
     rapidcheck
   ] ++ lib.optional stdenv.isLinux libseccomp
+    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
     ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
     # There have been issues building these dependencies
     ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index b4685b3a7..067755c0d 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -58,6 +58,10 @@
 #if __APPLE__
 #include <spawn.h>
 #include <sys/sysctl.h>
+#include <sandbox.h>
+
+/* This definition is undocumented but depended upon by all major browsers. */
+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
 #endif
 
 #include <pwd.h>
@@ -2088,141 +2092,132 @@ void LocalDerivationGoal::runChild()
 
         std::string builder = "invalid";
 
-        if (drv->isBuiltin()) {
-            ;
-        }
 #if __APPLE__
-        else {
-            /* This has to appear before import statements. */
-            std::string sandboxProfile = "(version 1)\n";
+        /* This has to appear before import statements. */
+        std::string sandboxProfile = "(version 1)\n";
 
-            if (useChroot) {
+        if (useChroot) {
 
-                /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
-                PathSet ancestry;
+            /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+            PathSet ancestry;
 
-                /* We build the ancestry before adding all inputPaths to the store because we know they'll
-                   all have the same parents (the store), and there might be lots of inputs. This isn't
-                   particularly efficient... I doubt it'll be a bottleneck in practice */
-                for (auto & i : pathsInChroot) {
-                    Path cur = i.first;
-                    while (cur.compare("/") != 0) {
-                        cur = dirOf(cur);
-                        ancestry.insert(cur);
-                    }
-                }
-
-                /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
-                   path component this time, since it's typically /nix/store and we care about that. */
-                Path cur = worker.store.storeDir;
+            /* We build the ancestry before adding all inputPaths to the store because we know they'll
+               all have the same parents (the store), and there might be lots of inputs. This isn't
+               particularly efficient... I doubt it'll be a bottleneck in practice */
+            for (auto & i : pathsInChroot) {
+                Path cur = i.first;
                 while (cur.compare("/") != 0) {
-                    ancestry.insert(cur);
                     cur = dirOf(cur);
+                    ancestry.insert(cur);
                 }
+            }
 
-                /* Add all our input paths to the chroot */
-                for (auto & i : inputPaths) {
-                    auto p = worker.store.printStorePath(i);
-                    pathsInChroot[p] = p;
-                }
+            /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+               path component this time, since it's typically /nix/store and we care about that. */
+            Path cur = worker.store.storeDir;
+            while (cur.compare("/") != 0) {
+                ancestry.insert(cur);
+                cur = dirOf(cur);
+            }
 
-                /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
-                if (settings.darwinLogSandboxViolations) {
-                    sandboxProfile += "(deny default)\n";
-                } else {
-                    sandboxProfile += "(deny default (with no-log))\n";
-                }
+            /* Add all our input paths to the chroot */
+            for (auto & i : inputPaths) {
+                auto p = worker.store.printStorePath(i);
+                pathsInChroot[p] = p;
+            }
 
-                sandboxProfile +=
-                    #include "sandbox-defaults.sb"
-                    ;
-
-                if (!derivationType->isSandboxed())
-                    sandboxProfile +=
-                        #include "sandbox-network.sb"
-                        ;
-
-                /* Add the output paths we'll use at build-time to the chroot */
-                sandboxProfile += "(allow file-read* file-write* process-exec\n";
-                for (auto & [_, path] : scratchOutputs)
-                    sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
-
-                sandboxProfile += ")\n";
-
-                /* Our inputs (transitive dependencies and any impurities computed above)
-
-                   without file-write* allowed, access() incorrectly returns EPERM
-                 */
-                sandboxProfile += "(allow file-read* file-write* process-exec\n";
-                for (auto & i : pathsInChroot) {
-                    if (i.first != i.second.source)
-                        throw Error(
-                            "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
-                            i.first, i.second.source);
-
-                    std::string path = i.first;
-                    auto optSt = maybeLstat(path.c_str());
-                    if (!optSt) {
-                        if (i.second.optional)
-                            continue;
-                        throw SysError("getting attributes of required path '%s", path);
-                    }
-                    if (S_ISDIR(optSt->st_mode))
-                        sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
-                    else
-                        sandboxProfile += fmt("\t(literal \"%s\")\n", path);
-                }
-                sandboxProfile += ")\n";
-
-                /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
-                sandboxProfile += "(allow file-read*\n";
-                for (auto & i : ancestry) {
-                    sandboxProfile += fmt("\t(literal \"%s\")\n", i);
-                }
-                sandboxProfile += ")\n";
-
-                sandboxProfile += additionalSandboxProfile;
-            } else
-                sandboxProfile +=
-                    #include "sandbox-minimal.sb"
-                    ;
-
-            debug("Generated sandbox profile:");
-            debug(sandboxProfile);
-
-            Path sandboxFile = tmpDir + "/.sandbox.sb";
-
-            writeFile(sandboxFile, sandboxProfile);
-
-            bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
-
-            /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
-               to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
-            Path globalTmpDir = canonPath(defaultTempDir(), true);
-
-            /* They don't like trailing slashes on subpath directives */
-            while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
-                globalTmpDir.pop_back();
-
-            if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
-                builder = "/usr/bin/sandbox-exec";
-                args.push_back("sandbox-exec");
-                args.push_back("-f");
-                args.push_back(sandboxFile);
-                args.push_back("-D");
-                args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
-                if (allowLocalNetworking) {
-                    args.push_back("-D");
-                    args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
-                }
-                args.push_back(drv->builder);
+            /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+            if (settings.darwinLogSandboxViolations) {
+                sandboxProfile += "(deny default)\n";
             } else {
-                builder = drv->builder;
-                args.push_back(std::string(baseNameOf(drv->builder)));
+                sandboxProfile += "(deny default (with no-log))\n";
+            }
+
+            sandboxProfile +=
+                #include "sandbox-defaults.sb"
+                ;
+
+            if (!derivationType->isSandboxed())
+                sandboxProfile +=
+                    #include "sandbox-network.sb"
+                    ;
+
+            /* Add the output paths we'll use at build-time to the chroot */
+            sandboxProfile += "(allow file-read* file-write* process-exec\n";
+            for (auto & [_, path] : scratchOutputs)
+                sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+            sandboxProfile += ")\n";
+
+            /* Our inputs (transitive dependencies and any impurities computed above)
+
+               without file-write* allowed, access() incorrectly returns EPERM
+             */
+            sandboxProfile += "(allow file-read* file-write* process-exec\n";
+            for (auto & i : pathsInChroot) {
+                if (i.first != i.second.source)
+                    throw Error(
+                        "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+                        i.first, i.second.source);
+
+                std::string path = i.first;
+                auto optSt = maybeLstat(path.c_str());
+                if (!optSt) {
+                    if (i.second.optional)
+                        continue;
+                    throw SysError("getting attributes of required path '%s", path);
+                }
+                if (S_ISDIR(optSt->st_mode))
+                    sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+                else
+                    sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+            }
+            sandboxProfile += ")\n";
+
+            /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+            sandboxProfile += "(allow file-read*\n";
+            for (auto & i : ancestry) {
+                sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+            }
+            sandboxProfile += ")\n";
+
+            sandboxProfile += additionalSandboxProfile;
+        } else
+            sandboxProfile +=
+                #include "sandbox-minimal.sb"
+                ;
+
+        debug("Generated sandbox profile:");
+        debug(sandboxProfile);
+
+        bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
+
+        /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+            to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
+        Path globalTmpDir = canonPath(defaultTempDir(), true);
+
+        /* They don't like trailing slashes on subpath directives */
+        while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
+            globalTmpDir.pop_back();
+
+        if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+            Strings sandboxArgs;
+            sandboxArgs.push_back("_GLOBAL_TMP_DIR");
+            sandboxArgs.push_back(globalTmpDir);
+            if (allowLocalNetworking) {
+                sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+                sandboxArgs.push_back("1");
+            }
+            if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+                writeFull(STDERR_FILENO, "failed to configure sandbox\n");
+                _exit(1);
             }
         }
+
+        builder = drv->builder;
+        args.push_back(std::string(baseNameOf(drv->builder)));
 #else
-        else {
+        if (!drv->isBuiltin()) {
             builder = drv->builder;
             args.push_back(std::string(baseNameOf(drv->builder)));
         }

From f7335530619f9b18d6cc249a297e4dca369101a5 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 3 Oct 2024 12:23:17 +0200
Subject: [PATCH 22/43] packaging: Add darwin -lsandbox in meson

---
 src/libstore/meson.build | 5 +++++
 src/libstore/package.nix | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index 6a6aabf97..c2aa5bff3 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -69,6 +69,11 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
   and cxx.has_function('lremovexattr')
 configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
 
+if host_machine.system() == 'darwin'
+  sandbox = cxx.find_library('sandbox')
+  deps_other += [sandbox]
+endif
+
 subdir('build-utils-meson/threads')
 
 boost = dependency(
diff --git a/src/libstore/package.nix b/src/libstore/package.nix
index 9568462b5..f04e3b95f 100644
--- a/src/libstore/package.nix
+++ b/src/libstore/package.nix
@@ -3,6 +3,7 @@
 , mkMesonLibrary
 
 , unixtools
+, darwin
 
 , nix-util
 , boost
@@ -56,6 +57,7 @@ mkMesonLibrary (finalAttrs: {
     sqlite
   ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
     # There have been issues building these dependencies
+    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
     ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
       aws-sdk-cpp
   ;

From 14d09e0b55898ac22d4cdeade3bf6c4174052ffd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 3 Oct 2024 12:44:12 +0200
Subject: [PATCH 23/43] local-derivation-goal: Print sandbox error detail on
 darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Théophane Hufschmitt <theophane.hufschmitt@tweag.io>
---
 src/libstore/unix/build/local-derivation-goal.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index 067755c0d..f34d68403 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -2208,8 +2208,9 @@ void LocalDerivationGoal::runChild()
                 sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
                 sandboxArgs.push_back("1");
             }
-            if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
-                writeFull(STDERR_FILENO, "failed to configure sandbox\n");
+            char * sandbox_errbuf = nullptr;
+            if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
+                writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
                 _exit(1);
             }
         }

From 06e27042e176b79561f50decb0fdf836b7bec3f5 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 3 Oct 2024 12:50:27 +0200
Subject: [PATCH 24/43] local-derivation-goal: Refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This works because the `builder` and `args` variables are only used
in the non-builtin code path.

Co-Authored-By: Théophane Hufschmitt <theophane.hufschmitt@tweag.io>
---
 src/libstore/unix/build/local-derivation-goal.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index f34d68403..f781a84c6 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -2214,15 +2214,12 @@ void LocalDerivationGoal::runChild()
                 _exit(1);
             }
         }
+#endif
 
-        builder = drv->builder;
-        args.push_back(std::string(baseNameOf(drv->builder)));
-#else
         if (!drv->isBuiltin()) {
             builder = drv->builder;
             args.push_back(std::string(baseNameOf(drv->builder)));
         }
-#endif
 
         for (auto & i : drv->args)
             args.push_back(rewriteStrings(i, inputRewrites));

From 766263d53ae69d70c5915426e6e8f58abd988226 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 22 Oct 2024 15:28:04 +0200
Subject: [PATCH 25/43] Fix meson build on darwin

std::stringbuf is defined in <sstream>
---
 src/libutil/strings.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc
index d1c9f700c..c221a43c6 100644
--- a/src/libutil/strings.cc
+++ b/src/libutil/strings.cc
@@ -1,5 +1,6 @@
 #include <filesystem>
 #include <string>
+#include <sstream>
 
 #include "strings-inline.hh"
 #include "os-string.hh"

From d1e0bae55afb3c3ef0bcad5d644b0e04da6279b3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 3 Oct 2024 12:57:00 +0200
Subject: [PATCH 26/43] local-derivation-goal: Move builder preparation to
 non-builtin code path

---
 .../unix/build/local-derivation-goal.cc       | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index f781a84c6..dcfaadeef 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -2087,11 +2087,6 @@ void LocalDerivationGoal::runChild()
                 throw SysError("setuid failed");
         }
 
-        /* Fill in the arguments. */
-        Strings args;
-
-        std::string builder = "invalid";
-
 #if __APPLE__
         /* This has to appear before import statements. */
         std::string sandboxProfile = "(version 1)\n";
@@ -2216,14 +2211,6 @@ void LocalDerivationGoal::runChild()
         }
 #endif
 
-        if (!drv->isBuiltin()) {
-            builder = drv->builder;
-            args.push_back(std::string(baseNameOf(drv->builder)));
-        }
-
-        for (auto & i : drv->args)
-            args.push_back(rewriteStrings(i, inputRewrites));
-
         /* Indicate that we managed to set up the build environment. */
         writeFull(STDERR_FILENO, std::string("\2\n"));
 
@@ -2254,6 +2241,14 @@ void LocalDerivationGoal::runChild()
             }
         }
 
+        // Now builder is not builtin
+
+        Strings args;
+        args.push_back(std::string(baseNameOf(drv->builder)));
+
+        for (auto & i : drv->args)
+            args.push_back(rewriteStrings(i, inputRewrites));
+
 #if __APPLE__
         posix_spawnattr_t attrp;
 
@@ -2275,9 +2270,9 @@ void LocalDerivationGoal::runChild()
             posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
         }
 
-        posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+        posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
 #else
-        execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+        execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
 #endif
 
         throw SysError("executing '%1%'", drv->builder);

From e1834f4caaa77d3b0dafc4b79e5d10ced0526419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 21 Oct 2024 16:32:53 +0200
Subject: [PATCH 27/43] warn-large-path-threshold: define 0 as number to
 disable warnings

the default int64_t max was still overflowing for me, when this was dumped as json (noticed during building the manual).
So making 0, the default and define it as "no warnings" fixes the situtation.
Also it's much more human-readable in documentation.
---
 src/libstore/globals.hh   | 7 +++----
 src/libstore/store-api.cc | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index be922c9f7..ff3df46ba 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -1227,14 +1227,13 @@ public:
 
     Setting<uint64_t> warnLargePathThreshold{
         this,
-        // n.b. this is deliberately int64 max rather than uint64 max because
-        // this goes through the Nix language JSON parser and thus needs to be
-        // representable in Nix language integers.
-        std::numeric_limits<int64_t>::max(),
+        0,
         "warn-large-path-threshold",
         R"(
           Warn when copying a path larger than this number of bytes to the Nix store
           (as determined by its NAR serialisation).
+          Default is 0, which disables the warning.
+          Set it to 1 to warn on all paths.
         )"
     };
 };
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 8109ea322..10577fa2a 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -171,7 +171,7 @@ std::pair<StorePath, Hash> StoreDirConfig::computeStorePath(
     PathFilter & filter) const
 {
     auto [h, size] = hashPath(path, method.getFileIngestionMethod(), hashAlgo, filter);
-    if (size && *size >= settings.warnLargePathThreshold)
+    if (settings.warnLargePathThreshold && size && *size >= settings.warnLargePathThreshold)
         warn("hashed large path '%s' (%s)", path, renderSize(*size));
     return {
         makeFixedOutputPathFromCA(
@@ -214,7 +214,7 @@ StorePath Store::addToStore(
     auto sink = sourceToSink([&](Source & source) {
         LengthSource lengthSource(source);
         storePath = addToStoreFromDump(lengthSource, name, fsm, method, hashAlgo, references, repair);
-        if (lengthSource.total >= settings.warnLargePathThreshold)
+        if (settings.warnLargePathThreshold && lengthSource.total >= settings.warnLargePathThreshold)
             warn("copied large path '%s' to the store (%s)", path, renderSize(lengthSource.total));
     });
     dumpPath(path, *sink, fsm, filter);

From e09666d3147b1b1cfca8e4c037c5b53fbb1a3089 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 22 Oct 2024 22:05:48 +0200
Subject: [PATCH 28/43] Fix test name

---
 tests/nixos/s3-binary-cache-store.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nixos/s3-binary-cache-store.nix b/tests/nixos/s3-binary-cache-store.nix
index 6ae2e3572..6c51fcba5 100644
--- a/tests/nixos/s3-binary-cache-store.nix
+++ b/tests/nixos/s3-binary-cache-store.nix
@@ -12,7 +12,7 @@ let
   storeUrl = "s3://my-cache?endpoint=http://server:9000&region=eu-west-1";
 
 in {
-  name = "nix-copy-closure";
+  name = "s3-binary-cache-store";
 
   nodes =
     { server =

From 75016c26f99cb5df553db39374c719909f29d7ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 22 Oct 2024 22:23:16 +0200
Subject: [PATCH 29/43] Add a test for chroot stores

---
 tests/nixos/chroot-store.nix | 31 +++++++++++++++++++++++++++++++
 tests/nixos/default.nix      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 tests/nixos/chroot-store.nix

diff --git a/tests/nixos/chroot-store.nix b/tests/nixos/chroot-store.nix
new file mode 100644
index 000000000..4b167fc38
--- /dev/null
+++ b/tests/nixos/chroot-store.nix
@@ -0,0 +1,31 @@
+{ lib, config, nixpkgs, ... }:
+
+let
+  pkgs = config.nodes.machine.nixpkgs.pkgs;
+  pkgA = pkgs.hello;
+  pkgB = pkgs.cowsay;
+in {
+  name = "chroot-store";
+
+  nodes =
+    { machine =
+        { config, lib, pkgs, ... }:
+        { virtualisation.writableStore = true;
+          virtualisation.additionalPaths = [ pkgA ];
+          environment.systemPackages = [ pkgB ];
+          nix.extraOptions = "experimental-features = nix-command";
+        };
+    };
+
+  testScript = { nodes }: ''
+    # fmt: off
+    start_all()
+
+    machine.succeed("nix copy --no-check-sigs --to /tmp/nix ${pkgA}")
+
+    machine.succeed("nix shell --store /tmp/nix ${pkgA} --command hello >&2")
+
+    # Test that /nix/store is available via an overlayfs mount.
+    machine.succeed("nix shell --store /tmp/nix ${pkgA} --command cowsay foo >&2")
+  '';
+}
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index c61a2888f..49e2603e1 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -161,4 +161,6 @@ in
   cgroups = runNixOSTestFor "x86_64-linux" ./cgroups;
 
   fetchurl = runNixOSTestFor "x86_64-linux" ./fetchurl.nix;
+
+  chrootStore = runNixOSTestFor "x86_64-linux" ./chroot-store.nix;
 }

From c49bff2434971d693b03525622082a81b5ed75eb Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 24 Oct 2024 21:24:47 +0000
Subject: [PATCH 30/43] Fix OpenBSD build with Makefiles

OpenBSD dynamic libraries never link to libc directly.
Instead, they have undefined symbols for all libc functions they use
that ld.so resolves to the libc referred to in the main executable.

Thus, disallowing undefined symbols will always fail
---
 mk/libraries.mk | 4 +++-
 mk/platform.mk  | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mk/libraries.mk b/mk/libraries.mk
index b99ba2782..a7848ba35 100644
--- a/mk/libraries.mk
+++ b/mk/libraries.mk
@@ -86,7 +86,9 @@ define build-library
     else
       ifndef HOST_DARWIN
         ifndef HOST_WINDOWS
-          $(1)_LDFLAGS += -Wl,-z,defs
+	  ifndef HOST_OPENBSD
+            $(1)_LDFLAGS += -Wl,-z,defs
+          endif
         endif
       endif
     endif
diff --git a/mk/platform.mk b/mk/platform.mk
index 22c114a20..3c4fff780 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -21,6 +21,10 @@ ifdef HOST_OS
     HOST_NETBSD = 1
     HOST_UNIX = 1
   endif
+  ifeq ($(patsubst openbsd%,,$(HOST_KERNEL)),)
+    HOST_OPENBSD = 1
+    HOST_UNIX = 1
+  endif
   ifeq ($(HOST_KERNEL), linux)
     HOST_LINUX = 1
     HOST_UNIX = 1

From fecc1ca2055ee590d8b957830f70512fcecbfe4b Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 26 Oct 2024 16:46:32 +0000
Subject: [PATCH 31/43] package.nix: Disable GC on OpenBSD

Nix fails to build on OpenBSD with a linking error due to a non-found
symbol in boehm-gc. Just disable the GC until we can find a proper
workaround.
---
 package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.nix b/package.nix
index 658f2275f..42fd9b683 100644
--- a/package.nix
+++ b/package.nix
@@ -76,7 +76,9 @@
 #
 # Temporarily disabled on Windows because the `GC_throw_bad_alloc`
 # symbol is missing during linking.
-, enableGC ? !stdenv.hostPlatform.isWindows
+#
+# Disabled on OpenBSD because of missing `_data_start` symbol while linking
+, enableGC ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isOpenBSD
 
 # Whether to enable Markdown rendering in the Nix binary.
 , enableMarkdown ? !stdenv.hostPlatform.isWindows

From d0232028111ce4f5a066d9a302fec142ebe91037 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 26 Oct 2024 17:12:06 +0000
Subject: [PATCH 32/43] Add support for `utimensat` as an alternative to
 `lutimes`

OpenBSD doesn't support `lutimes`, but does support `utimensat` which
subsumes it. In fact, all the BSDs, Linux, and newer macOS all support
it. So lets make this our first choice for the implementation.

In addition, let's get rid of the `lutimes` `ENOSYS` special case. The
Linux manpage says

> ENOSYS
>
> The kernel does not support this call; Linux 2.6.22 or later is
> required.

which I think is the origin of this check, but that's a very old version
of Linux at this point. The code can be simplified a lot of we drop
support for it here (as we've done elsewhere, anyways).

Co-Authored-By: John Ericson <John.Ericson@Obsidian.Systems>
---
 configure.ac               |  7 ++--
 src/libutil/file-system.cc | 70 +++++++++++++++++++-------------------
 src/libutil/meson.build    |  4 +++
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/configure.ac b/configure.ac
index fc59904f3..746e953dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,10 @@ AC_LANG_POP(C++)
 AC_CHECK_FUNCS([statvfs pipe2 close_range])
 
 
-# Check for lutimes, optionally used for changing the mtime of
-# symlinks.
-AC_CHECK_FUNCS([lutimes])
+# Check for lutimes and utimensat, optionally used for changing the
+# mtime of symlinks.
+AC_CHECK_DECLS([AT_SYMLINK_NOFOLLOW], [], [], [[#include <fcntl.h>]])
+AC_CHECK_FUNCS([lutimes utimensat])
 
 
 # Check whether the store optimiser can optimise symlinks.
diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index 224b78b23..fd51d7d3c 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -630,7 +630,28 @@ void setWriteTime(
     time_t modificationTime,
     std::optional<bool> optIsSymlink)
 {
-#ifndef _WIN32
+#ifdef _WIN32
+    // FIXME use `fs::last_write_time`.
+    //
+    // Would be nice to use std::filesystem unconditionally, but
+    // doesn't support access time just modification time.
+    //
+    // System clock vs File clock issues also make that annoying.
+    warn("Changing file times is not yet implemented on Windows, path is '%s'", path);
+#elif HAVE_UTIMENSAT && HAVE_DECL_AT_SYMLINK_NOFOLLOW
+    struct timespec times[2] = {
+        {
+            .tv_sec = accessedTime,
+            .tv_nsec = 0,
+        },
+        {
+            .tv_sec = modificationTime,
+            .tv_nsec = 0,
+        },
+    };
+    if (utimensat(AT_FDCWD, path.c_str(), times, AT_SYMLINK_NOFOLLOW) == -1)
+        throw SysError("changing modification time of '%s' (using `utimensat`)", path);
+#else
     struct timeval times[2] = {
         {
             .tv_sec = accessedTime,
@@ -641,42 +662,21 @@ void setWriteTime(
             .tv_usec = 0,
         },
     };
-#endif
-
-    auto nonSymlink = [&]{
-        bool isSymlink = optIsSymlink
-            ? *optIsSymlink
-            : fs::is_symlink(path);
-
-        if (!isSymlink) {
-#ifdef _WIN32
-            // FIXME use `fs::last_write_time`.
-            //
-            // Would be nice to use std::filesystem unconditionally, but
-            // doesn't support access time just modification time.
-            //
-            // System clock vs File clock issues also make that annoying.
-            warn("Changing file times is not yet implemented on Windows, path is '%s'", path);
-#else
-            if (utimes(path.c_str(), times) == -1) {
-
-                throw SysError("changing modification time of '%s' (not a symlink)", path);
-            }
-#endif
-        } else {
-            throw Error("Cannot modification time of symlink '%s'", path);
-        }
-    };
-
 #if HAVE_LUTIMES
-    if (lutimes(path.c_str(), times) == -1) {
-        if (errno == ENOSYS)
-            nonSymlink();
-        else
-            throw SysError("changing modification time of '%s'", path);
-    }
+    if (lutimes(path.c_str(), times) == -1)
+        throw SysError("changing modification time of '%s'", path);
 #else
-    nonSymlink();
+    bool isSymlink = optIsSymlink
+        ? *optIsSymlink
+        : fs::is_symlink(path);
+
+    if (!isSymlink) {
+        if (utimes(path.c_str(), times) == -1)
+            throw SysError("changing modification time of '%s' (not a symlink)", path);
+    } else {
+        throw Error("Cannot modification time of symlink '%s'", path);
+    }
+#endif
 #endif
 }
 
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 57b741a50..08413783d 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -42,6 +42,8 @@ check_funcs = [
   # Optionally used to try to close more file descriptors (e.g. before
   # forking) on Unix.
   'sysconf',
+  # Optionally used for changing the mtime of files and symlinks.
+  'utimensat',
 ]
 foreach funcspec : check_funcs
   define_name = 'HAVE_' + funcspec.underscorify().to_upper()
@@ -49,6 +51,8 @@ foreach funcspec : check_funcs
   configdata.set(define_name, define_value)
 endforeach
 
+configdata.set('HAVE_DECL_AT_SYMLINK_NOFOLLOW', cxx.has_header_symbol('fcntl.h', 'AT_SYMLINK_NOFOLLOW').to_int())
+
 subdir('build-utils-meson/threads')
 
 # Check if -latomic is needed

From 5f691206ba248943f4771f77677c967cf24bb867 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 30 Oct 2024 00:57:35 +0100
Subject: [PATCH 33/43] refact: Extract scopedImport

---
 src/libexpr/primops.cc | 58 +++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 203d10932..bcf66971f 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -178,6 +178,38 @@ static void mkOutputString(
         o.second.path(*state.store, Derivation::nameFromPath(drvPath), o.first));
 }
 
+/**
+ * Import a Nix file with an alternate base scope, as `builtins.scopedImport` does.
+ *
+ * @param state The evaluation state.
+ * @param pos The position of the import call.
+ * @param path The path to the file to import.
+ * @param vScope The base scope to use for the import.
+ * @param v Return value
+ */
+static void scopedImport(EvalState & state, const PosIdx pos, SourcePath & path, Value * vScope, Value & v) {
+    state.forceAttrs(*vScope, pos, "while evaluating the first argument passed to builtins.scopedImport");
+
+    Env * env = &state.allocEnv(vScope->attrs()->size());
+    env->up = &state.baseEnv;
+
+    auto staticEnv = std::make_shared<StaticEnv>(nullptr, state.staticBaseEnv.get(), vScope->attrs()->size());
+
+    unsigned int displ = 0;
+    for (auto & attr : *vScope->attrs()) {
+        staticEnv->vars.emplace_back(attr.name, displ);
+        env->values[displ++] = attr.value;
+    }
+
+    // No need to call staticEnv.sort(), because
+    // args[0]->attrs is already sorted.
+
+    printTalkative("evaluating file '%1%'", path);
+    Expr * e = state.parseExprFromFile(resolveExprPath(path), staticEnv);
+
+    e->eval(state, *env, v);
+}
+
 /* Load and evaluate an expression from path specified by the
    argument. */
 static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * vScope, Value & v)
@@ -226,30 +258,10 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
     }
 
     else {
-        if (!vScope)
+        if (vScope)
+            scopedImport(state, pos, path, vScope, v);
+        else
             state.evalFile(path, v);
-        else {
-            state.forceAttrs(*vScope, pos, "while evaluating the first argument passed to builtins.scopedImport");
-
-            Env * env = &state.allocEnv(vScope->attrs()->size());
-            env->up = &state.baseEnv;
-
-            auto staticEnv = std::make_shared<StaticEnv>(nullptr, state.staticBaseEnv.get(), vScope->attrs()->size());
-
-            unsigned int displ = 0;
-            for (auto & attr : *vScope->attrs()) {
-                staticEnv->vars.emplace_back(attr.name, displ);
-                env->values[displ++] = attr.value;
-            }
-
-            // No need to call staticEnv.sort(), because
-            // args[0]->attrs is already sorted.
-
-            printTalkative("evaluating file '%1%'", path);
-            Expr * e = state.parseExprFromFile(resolveExprPath(path), staticEnv);
-
-            e->eval(state, *env, v);
-        }
     }
 }
 

From 760be5fe1e7754f7bea63cdc88bbfcccc0e83324 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 30 Oct 2024 01:04:23 +0100
Subject: [PATCH 34/43] refact: Extract derivationToValue

---
 src/libexpr/primops.cc | 68 +++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index bcf66971f..71afd6f1c 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -178,6 +178,46 @@ static void mkOutputString(
         o.second.path(*state.store, Derivation::nameFromPath(drvPath), o.first));
 }
 
+/**
+ * `import` will parse a derivation when it imports a `.drv` file from the store.
+ *
+ * @param state The evaluation state.
+ * @param pos The position of the `import` call.
+ * @param path The path to the `.drv` to import.
+ * @param storePath The path to the `.drv` to import.
+ * @param v Return value
+ */
+void derivationToValue(EvalState & state, const PosIdx pos, const SourcePath & path, const StorePath & storePath, Value & v) {
+    auto path2 = path.path.abs();
+    Derivation drv = state.store->readDerivation(storePath);
+    auto attrs = state.buildBindings(3 + drv.outputs.size());
+    attrs.alloc(state.sDrvPath).mkString(path2, {
+        NixStringContextElem::DrvDeep { .drvPath = storePath },
+    });
+    attrs.alloc(state.sName).mkString(drv.env["name"]);
+
+    auto list = state.buildList(drv.outputs.size());
+    for (const auto & [i, o] : enumerate(drv.outputs)) {
+        mkOutputString(state, attrs, storePath, o);
+        (list[i] = state.allocValue())->mkString(o.first);
+    }
+    attrs.alloc(state.sOutputs).mkList(list);
+
+    auto w = state.allocValue();
+    w->mkAttrs(attrs);
+
+    if (!state.vImportedDrvToDerivation) {
+        state.vImportedDrvToDerivation = allocRootValue(state.allocValue());
+        state.eval(state.parseExprFromString(
+            #include "imported-drv-to-derivation.nix.gen.hh"
+            , state.rootPath(CanonPath::root)), **state.vImportedDrvToDerivation);
+    }
+
+    state.forceFunction(**state.vImportedDrvToDerivation, pos, "while evaluating imported-drv-to-derivation.nix.gen.hh");
+    v.mkApp(*state.vImportedDrvToDerivation, w);
+    state.forceAttrs(v, pos, "while calling imported-drv-to-derivation.nix.gen.hh");
+}
+
 /**
  * Import a Nix file with an alternate base scope, as `builtins.scopedImport` does.
  *
@@ -228,33 +268,7 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
     };
 
     if (auto storePath = isValidDerivationInStore()) {
-        Derivation drv = state.store->readDerivation(*storePath);
-        auto attrs = state.buildBindings(3 + drv.outputs.size());
-        attrs.alloc(state.sDrvPath).mkString(path2, {
-            NixStringContextElem::DrvDeep { .drvPath = *storePath },
-        });
-        attrs.alloc(state.sName).mkString(drv.env["name"]);
-
-        auto list = state.buildList(drv.outputs.size());
-        for (const auto & [i, o] : enumerate(drv.outputs)) {
-            mkOutputString(state, attrs, *storePath, o);
-            (list[i] = state.allocValue())->mkString(o.first);
-        }
-        attrs.alloc(state.sOutputs).mkList(list);
-
-        auto w = state.allocValue();
-        w->mkAttrs(attrs);
-
-        if (!state.vImportedDrvToDerivation) {
-            state.vImportedDrvToDerivation = allocRootValue(state.allocValue());
-            state.eval(state.parseExprFromString(
-                #include "imported-drv-to-derivation.nix.gen.hh"
-                , state.rootPath(CanonPath::root)), **state.vImportedDrvToDerivation);
-        }
-
-        state.forceFunction(**state.vImportedDrvToDerivation, pos, "while evaluating imported-drv-to-derivation.nix.gen.hh");
-        v.mkApp(*state.vImportedDrvToDerivation, w);
-        state.forceAttrs(v, pos, "while calling imported-drv-to-derivation.nix.gen.hh");
+        derivationToValue(state, pos, path, *storePath, v);
     }
 
     else {

From 64744503cc45a449155ef95ca1802ceb12c88a8e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 30 Oct 2024 01:08:01 +0100
Subject: [PATCH 35/43] Tidy

---
 src/libexpr/primops.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 71afd6f1c..84aa6bac9 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -270,12 +270,11 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
     if (auto storePath = isValidDerivationInStore()) {
         derivationToValue(state, pos, path, *storePath, v);
     }
-
+    else if (vScope) {
+        scopedImport(state, pos, path, vScope, v);
+    }
     else {
-        if (vScope)
-            scopedImport(state, pos, path, vScope, v);
-        else
-            state.evalFile(path, v);
+        state.evalFile(path, v);
     }
 }
 

From 9491abdfec502f888244d6886ee56817a99ae8bc Mon Sep 17 00:00:00 2001
From: Adrian Hesketh <a-h@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:15:02 +0100
Subject: [PATCH 36/43] docs: update distributed-builds.md

---
 .../advanced-topics/distributed-builds.md     | 75 ++++++++++++++-----
 1 file changed, 56 insertions(+), 19 deletions(-)

diff --git a/doc/manual/source/advanced-topics/distributed-builds.md b/doc/manual/source/advanced-topics/distributed-builds.md
index 52acd039c..66e371888 100644
--- a/doc/manual/source/advanced-topics/distributed-builds.md
+++ b/doc/manual/source/advanced-topics/distributed-builds.md
@@ -1,35 +1,57 @@
 # Remote Builds
 
-Nix supports remote builds, where a local Nix installation can forward
-Nix builds to other machines. This allows multiple builds to be
-performed in parallel and allows Nix to perform multi-platform builds in
-a semi-transparent way. For instance, if you perform a build for a
-`x86_64-darwin` on an `i686-linux` machine, Nix can automatically
-forward the build to a `x86_64-darwin` machine, if available.
+A local Nix installation can forward Nix builds to other machines,
+this allows multiple builds to be performed in parallel.
 
-To forward a build to a remote machine, it’s required that the remote
-machine is accessible via SSH and that it has Nix installed. You can
-test whether connecting to the remote Nix instance works, e.g.
+Remote builds also allow Nix to perform multi-platform builds in a
+semi-transparent way. For example, if you perform a build for a
+`x86_64-darwin` on an `i686-linux` machine, Nix can automatically
+forward the build to a `x86_64-darwin` machine, if one is available.
+
+## Requirements
+
+For a local machine to forward a build to a remote machine, the remote machine must:
+
+- Have Nix installed
+- Be running an SSH server, e.g. `sshd`
+- Be accessible via SSH from the local machine over the network
+- Have the local machine's public SSH key in `/etc/ssh/authorized_keys.d/<username>`
+- Have the username of the SSH user in the `trusted-users` setting in `nix.conf`
+
+## Testing
+
+To test connecting to a remote Nix instance (in this case `mac`), run:
 
 ```console
-$ nix store info --store ssh://mac
+nix store info --store ssh://username@mac
 ```
 
-will try to connect to the machine named `mac`. It is possible to
-specify an SSH identity file as part of the remote store URI, e.g.
+To specify an SSH identity file as part of the remote store URI add a
+query paramater, e.g.
 
 ```console
-$ nix store info --store ssh://mac?ssh-key=/home/alice/my-key
+nix store info --store ssh://username@mac?ssh-key=/home/alice/my-key
 ```
 
 Since builds should be non-interactive, the key should not have a
 passphrase. Alternatively, you can load identities ahead of time into
 `ssh-agent` or `gpg-agent`.
 
+In a multi-user installation (default), builds are executed by the Nix
+Daemon. The Nix Daemon cannot prompt for a passphrase via the terminal
+or `ssh-agent`, so the SSH key must not have a passphrase.
+
+In addition, the Nix Daemon's user (typically root) needs to have SSH
+access to the remote builder.
+
+Access can be verified by running `sudo su`, and then validating SSH
+access, e.g. by running `ssh mac`. SSH identity files for root users
+are usually stored in `/root/.ssh/` (Linux) or `/var/root/.ssh` (MacOS).
+
 If you get the error
 
 ```console
-bash: nix-store: command not found
+bash: nix: command not found
 error: cannot connect to 'mac'
 ```
 
@@ -40,15 +62,28 @@ The [list of remote build machines](@docroot@/command-ref/conf-file.md#conf-buil
 For example, the following command allows you to build a derivation for `x86_64-darwin` on a Linux machine:
 
 ```console
-$ uname
+uname
+```
+
+```console
 Linux
+```
 
-$ nix build --impure \
-  --expr '(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
-  --builders 'ssh://mac x86_64-darwin'
+```console
+nix build --impure \
+ --expr '(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
+ --builders 'ssh://mac x86_64-darwin'
+```
+
+```console
 [1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
+```
 
-$ cat ./result
+```console
+cat ./result
+```
+
+```console
 Darwin
 ```
 
@@ -62,6 +97,8 @@ Remote build machines can also be configured in [`nix.conf`](@docroot@/command-r
 
     builders = ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd
 
+After making changes to `nix.conf`, restart the Nix daemon for changes to take effect.
+
 Finally, remote build machines can be configured in a separate configuration
 file included in `builders` via the syntax `@/path/to/file`. For example,
 

From a75b082a284c09b63b52952f2d4a360a3cadfb71 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Tue, 29 Oct 2024 21:33:28 -0700
Subject: [PATCH 37/43] Expand shellcheck coverage in functional tests

Ref NixOS/nix#10795
---
 maintainers/flake-module.nix      | 15 +-----
 tests/functional/build.sh         |  9 ++--
 tests/functional/check.sh         | 80 +++++++++++++++----------------
 tests/functional/eval.sh          | 12 ++---
 tests/functional/fetchurl.sh      | 64 ++++++++++++-------------
 tests/functional/flakes/common.sh | 18 ++++---
 tests/functional/gc.sh            | 40 ++++++++--------
 tests/functional/help.sh          |  1 +
 tests/functional/lang.sh          |  3 ++
 tests/functional/nar-access.sh    | 44 ++++++++---------
 tests/functional/shell.sh         | 24 +++++-----
 tests/functional/zstd.sh          | 12 ++---
 12 files changed, 159 insertions(+), 163 deletions(-)

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 78c36d6b6..225b0b300 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -7,7 +7,7 @@
 
   perSystem = { config, pkgs, ... }: {
 
-    # https://flake.parts/options/pre-commit-hooks-nix.html#options
+    # https://flake.parts/options/git-hooks-nix#options
     pre-commit.settings = {
       hooks = {
         clang-format = {
@@ -501,7 +501,6 @@
             ''^scripts/install-nix-from-closure\.sh$''
             ''^scripts/install-systemd-multi-user\.sh$''
             ''^src/nix/get-env\.sh$''
-            ''^tests/functional/build\.sh$''
             ''^tests/functional/ca/build-dry\.sh$''
             ''^tests/functional/ca/build-with-garbage-path\.sh$''
             ''^tests/functional/ca/common\.sh$''
@@ -517,7 +516,6 @@
             ''^tests/functional/ca/selfref-gc\.sh$''
             ''^tests/functional/ca/why-depends\.sh$''
             ''^tests/functional/characterisation-test-infra\.sh$''
-            ''^tests/functional/check\.sh$''
             ''^tests/functional/common/vars-and-functions\.sh$''
             ''^tests/functional/completions\.sh$''
             ''^tests/functional/compute-levels\.sh$''
@@ -534,7 +532,6 @@
             ''^tests/functional/dyn-drv/old-daemon-error-hack\.sh$''
             ''^tests/functional/dyn-drv/recursive-mod-json\.sh$''
             ''^tests/functional/eval-store\.sh$''
-            ''^tests/functional/eval\.sh$''
             ''^tests/functional/export-graph\.sh$''
             ''^tests/functional/export\.sh$''
             ''^tests/functional/extra-sandbox-profile\.sh$''
@@ -544,13 +541,11 @@
             ''^tests/functional/fetchGitSubmodules\.sh$''
             ''^tests/functional/fetchGitVerification\.sh$''
             ''^tests/functional/fetchMercurial\.sh$''
-            ''^tests/functional/fetchurl\.sh$''
             ''^tests/functional/fixed\.builder1\.sh$''
             ''^tests/functional/fixed\.builder2\.sh$''
             ''^tests/functional/fixed\.sh$''
             ''^tests/functional/flakes/absolute-paths\.sh$''
             ''^tests/functional/flakes/check\.sh$''
-            ''^tests/functional/flakes/common\.sh$''
             ''^tests/functional/flakes/config\.sh$''
             ''^tests/functional/flakes/develop\.sh$''
             ''^tests/functional/flakes/flakes\.sh$''
@@ -565,16 +560,12 @@
             ''^tests/functional/gc-concurrent\.sh$''
             ''^tests/functional/gc-concurrent2\.builder\.sh$''
             ''^tests/functional/gc-non-blocking\.sh$''
-            ''^tests/functional/gc\.sh$''
             ''^tests/functional/git-hashing/common\.sh$''
             ''^tests/functional/git-hashing/simple\.sh$''
             ''^tests/functional/hash-convert\.sh$''
-            ''^tests/functional/help\.sh$''
             ''^tests/functional/impure-derivations\.sh$''
-            ''^tests/functional/impure-env\.sh$''
             ''^tests/functional/impure-eval\.sh$''
             ''^tests/functional/install-darwin\.sh$''
-            ''^tests/functional/lang\.sh$''
             ''^tests/functional/legacy-ssh-store\.sh$''
             ''^tests/functional/linux-sandbox\.sh$''
             ''^tests/functional/local-overlay-store/add-lower-inner\.sh$''
@@ -603,7 +594,6 @@
             ''^tests/functional/logging\.sh$''
             ''^tests/functional/misc\.sh$''
             ''^tests/functional/multiple-outputs\.sh$''
-            ''^tests/functional/nar-access\.sh$''
             ''^tests/functional/nested-sandboxing\.sh$''
             ''^tests/functional/nested-sandboxing/command\.sh$''
             ''^tests/functional/nix-build\.sh$''
@@ -624,7 +614,6 @@
             ''^tests/functional/path-from-hash-part\.sh$''
             ''^tests/functional/path-info\.sh$''
             ''^tests/functional/placeholders\.sh$''
-            ''^tests/functional/plugins\.sh$''
             ''^tests/functional/post-hook\.sh$''
             ''^tests/functional/pure-eval\.sh$''
             ''^tests/functional/push-to-store-old\.sh$''
@@ -639,7 +628,6 @@
             ''^tests/functional/search\.sh$''
             ''^tests/functional/secure-drv-outputs\.sh$''
             ''^tests/functional/selfref-gc\.sh$''
-            ''^tests/functional/shell\.sh$''
             ''^tests/functional/shell\.shebang\.sh$''
             ''^tests/functional/simple\.builder\.sh$''
             ''^tests/functional/supplementary-groups\.sh$''
@@ -649,7 +637,6 @@
             ''^tests/functional/user-envs\.builder\.sh$''
             ''^tests/functional/user-envs\.sh$''
             ''^tests/functional/why-depends\.sh$''
-            ''^tests/functional/zstd\.sh$''
             ''^src/libutil-tests/data/git/check-data\.sh$''
           ];
         };
diff --git a/tests/functional/build.sh b/tests/functional/build.sh
index 5396a465f..3f65a7c2c 100755
--- a/tests/functional/build.sh
+++ b/tests/functional/build.sh
@@ -84,6 +84,7 @@ expectStderr 1 nix build --expr '""' --no-link \
   | grepQuiet "has 0 entries in its context. It should only have exactly one entry"
 
 # Too much string context
+# shellcheck disable=SC2016 # The ${} in this is Nix, not shell
 expectStderr 1 nix build --impure --expr 'with (import ./multiple-outputs.nix).e.a_a; "${drvPath}${outPath}"' --no-link \
   | grepQuiet "has 2 entries in its context. It should only have exactly one entry"
 
@@ -160,7 +161,7 @@ printf "%s\n" "$drv^*" | nix build --no-link --stdin --json | jq --exit-status '
 out="$(nix build -f fod-failing.nix -L 2>&1)" && status=0 || status=$?
 test "$status" = 1
 # one "hash mismatch" error, one "build of ... failed"
-test "$(<<<"$out" grep -E '^error:' | wc -l)" = 2
+test "$(<<<"$out" grep -cE '^error:')" = 2
 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x1\\.drv'"
 <<<"$out" grepQuiet -vE "hash mismatch in fixed-output derivation '.*-x3\\.drv'"
 <<<"$out" grepQuiet -vE "hash mismatch in fixed-output derivation '.*-x2\\.drv'"
@@ -169,7 +170,7 @@ test "$(<<<"$out" grep -E '^error:' | wc -l)" = 2
 out="$(nix build -f fod-failing.nix -L x1 x2 x3 --keep-going 2>&1)" && status=0 || status=$?
 test "$status" = 1
 # three "hash mismatch" errors - for each failing fod, one "build of ... failed"
-test "$(<<<"$out" grep -E '^error:' | wc -l)" = 4
+test "$(<<<"$out" grep -cE '^error:')" = 4
 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x1\\.drv'"
 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x3\\.drv'"
 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x2\\.drv'"
@@ -177,13 +178,13 @@ test "$(<<<"$out" grep -E '^error:' | wc -l)" = 4
 
 out="$(nix build -f fod-failing.nix -L x4 2>&1)" && status=0 || status=$?
 test "$status" = 1
-test "$(<<<"$out" grep -E '^error:' | wc -l)" = 2
+test "$(<<<"$out" grep -cE '^error:')" = 2
 <<<"$out" grepQuiet -E "error: 1 dependencies of derivation '.*-x4\\.drv' failed to build"
 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x2\\.drv'"
 
 out="$(nix build -f fod-failing.nix -L x4 --keep-going 2>&1)" && status=0 || status=$?
 test "$status" = 1
-test "$(<<<"$out" grep -E '^error:' | wc -l)" = 3
+test "$(<<<"$out" grep -cE '^error:')" = 3
 <<<"$out" grepQuiet -E "error: 2 dependencies of derivation '.*-x4\\.drv' failed to build"
 <<<"$out" grepQuiet -vE "hash mismatch in fixed-output derivation '.*-x3\\.drv'"
 <<<"$out" grepQuiet -vE "hash mismatch in fixed-output derivation '.*-x2\\.drv'"
diff --git a/tests/functional/check.sh b/tests/functional/check.sh
index 23e3d2ff0..bff6b2ec8 100755
--- a/tests/functional/check.sh
+++ b/tests/functional/check.sh
@@ -7,9 +7,9 @@ buggyNeedLocalStore "see #4813"
 
 checkBuildTempDirRemoved ()
 {
-    buildDir=$(sed -n 's/CHECK_TMPDIR=//p' $1 | head -1)
+    buildDir=$(sed -n 's/CHECK_TMPDIR=//p' "$1" | head -1)
     checkBuildIdFile=${buildDir}/checkBuildId
-    [[ ! -f $checkBuildIdFile ]] || ! grep $checkBuildId $checkBuildIdFile
+    [[ ! -f $checkBuildIdFile ]] || ! grep "$checkBuildId" "$checkBuildIdFile"
 }
 
 # written to build temp directories to verify created by this instance
@@ -28,15 +28,15 @@ nix-build dependencies.nix --no-out-link --check
 # check for dangling temporary build directories
 # only retain if build fails and --keep-failed is specified, or...
 # ...build is non-deterministic and --check and --keep-failed are both specified
-nix-build check.nix -A failed --argstr checkBuildId $checkBuildId \
-    --no-out-link 2> $TEST_ROOT/log || status=$?
+nix-build check.nix -A failed --argstr checkBuildId "$checkBuildId" \
+    --no-out-link 2> "$TEST_ROOT/log" || status=$?
 [ "$status" = "100" ]
-checkBuildTempDirRemoved $TEST_ROOT/log
+checkBuildTempDirRemoved "$TEST_ROOT/log"
 
-nix-build check.nix -A failed --argstr checkBuildId $checkBuildId \
-    --no-out-link --keep-failed 2> $TEST_ROOT/log || status=$?
+nix-build check.nix -A failed --argstr checkBuildId "$checkBuildId" \
+    --no-out-link --keep-failed 2> "$TEST_ROOT/log" || status=$?
 [ "$status" = "100" ]
-if checkBuildTempDirRemoved $TEST_ROOT/log; then false; fi
+if checkBuildTempDirRemoved "$TEST_ROOT/log"; then false; fi
 
 test_custom_build_dir() {
   local customBuildDir="$TEST_ROOT/custom-build-dir"
@@ -44,42 +44,42 @@ test_custom_build_dir() {
   # Nix does not create the parent directories, and perhaps it shouldn't try to
   # decide the permissions of build-dir.
   mkdir "$customBuildDir"
-  nix-build check.nix -A failed --argstr checkBuildId $checkBuildId \
-      --no-out-link --keep-failed --option build-dir "$TEST_ROOT/custom-build-dir" 2> $TEST_ROOT/log || status=$?
+  nix-build check.nix -A failed --argstr checkBuildId "$checkBuildId" \
+      --no-out-link --keep-failed --option build-dir "$TEST_ROOT/custom-build-dir" 2> "$TEST_ROOT/log" || status=$?
   [ "$status" = "100" ]
   [[ 1 == "$(count "$customBuildDir/nix-build-"*)" ]]
-  local buildDir="$customBuildDir/nix-build-"*""
-  if [[ -e $buildDir/build ]]; then
-      buildDir=$buildDir/build
+  local buildDir=("$customBuildDir/nix-build-"*)
+  if [[ -e ${buildDir[*]}/build ]]; then
+      buildDir[0]="${buildDir[*]}/build"
   fi
-  grep $checkBuildId $buildDir/checkBuildId
+  grep "$checkBuildId" "${buildDir[*]}/checkBuildId"
 }
 test_custom_build_dir
 
-nix-build check.nix -A deterministic --argstr checkBuildId $checkBuildId \
-    --no-out-link 2> $TEST_ROOT/log
-checkBuildTempDirRemoved $TEST_ROOT/log
+nix-build check.nix -A deterministic --argstr checkBuildId "$checkBuildId" \
+    --no-out-link 2> "$TEST_ROOT/log"
+checkBuildTempDirRemoved "$TEST_ROOT/log"
 
-nix-build check.nix -A deterministic --argstr checkBuildId $checkBuildId \
-    --no-out-link --check --keep-failed 2> $TEST_ROOT/log
-if grepQuiet 'may not be deterministic' $TEST_ROOT/log; then false; fi
-checkBuildTempDirRemoved $TEST_ROOT/log
+nix-build check.nix -A deterministic --argstr checkBuildId "$checkBuildId" \
+    --no-out-link --check --keep-failed 2> "$TEST_ROOT/log"
+if grepQuiet 'may not be deterministic' "$TEST_ROOT/log"; then false; fi
+checkBuildTempDirRemoved "$TEST_ROOT/log"
 
-nix-build check.nix -A nondeterministic --argstr checkBuildId $checkBuildId \
-    --no-out-link 2> $TEST_ROOT/log
-checkBuildTempDirRemoved $TEST_ROOT/log
+nix-build check.nix -A nondeterministic --argstr checkBuildId "$checkBuildId" \
+    --no-out-link 2> "$TEST_ROOT/log"
+checkBuildTempDirRemoved "$TEST_ROOT/log"
 
-nix-build check.nix -A nondeterministic --argstr checkBuildId $checkBuildId \
-    --no-out-link --check 2> $TEST_ROOT/log || status=$?
-grep 'may not be deterministic' $TEST_ROOT/log
+nix-build check.nix -A nondeterministic --argstr checkBuildId "$checkBuildId" \
+    --no-out-link --check 2> "$TEST_ROOT/log" || status=$?
+grep 'may not be deterministic' "$TEST_ROOT/log"
 [ "$status" = "104" ]
-checkBuildTempDirRemoved $TEST_ROOT/log
+checkBuildTempDirRemoved "$TEST_ROOT/log"
 
-nix-build check.nix -A nondeterministic --argstr checkBuildId $checkBuildId \
-    --no-out-link --check --keep-failed 2> $TEST_ROOT/log || status=$?
-grep 'may not be deterministic' $TEST_ROOT/log
+nix-build check.nix -A nondeterministic --argstr checkBuildId "$checkBuildId" \
+    --no-out-link --check --keep-failed 2> "$TEST_ROOT/log" || status=$?
+grep 'may not be deterministic' "$TEST_ROOT/log"
 [ "$status" = "104" ]
-if checkBuildTempDirRemoved $TEST_ROOT/log; then false; fi
+if checkBuildTempDirRemoved "$TEST_ROOT/log"; then false; fi
 
 TODO_NixOS
 
@@ -87,24 +87,24 @@ clearStore
 
 path=$(nix-build check.nix -A fetchurl --no-out-link)
 
-chmod +w $path
-echo foo > $path
-chmod -w $path
+chmod +w "$path"
+echo foo > "$path"
+chmod -w "$path"
 
 nix-build check.nix -A fetchurl --no-out-link --check
 # Note: "check" doesn't repair anything, it just compares to the hash stored in the database.
-[[ $(cat $path) = foo ]]
+[[ $(cat "$path") = foo ]]
 
 nix-build check.nix -A fetchurl --no-out-link --repair
-[[ $(cat $path) != foo ]]
+[[ $(cat "$path") != foo ]]
 
-echo 'Hello World' > $TEST_ROOT/dummy
+echo 'Hello World' > "$TEST_ROOT/dummy"
 nix-build check.nix -A hashmismatch --no-out-link || status=$?
 [ "$status" = "102" ]
 
-echo -n > $TEST_ROOT/dummy
+echo -n > "$TEST_ROOT/dummy"
 nix-build check.nix -A hashmismatch --no-out-link
-echo 'Hello World' > $TEST_ROOT/dummy
+echo 'Hello World' > "$TEST_ROOT/dummy"
 
 nix-build check.nix -A hashmismatch --no-out-link --check || status=$?
 [ "$status" = "102" ]
diff --git a/tests/functional/eval.sh b/tests/functional/eval.sh
index 22d2d02a2..e2ced41c2 100755
--- a/tests/functional/eval.sh
+++ b/tests/functional/eval.sh
@@ -35,13 +35,13 @@ nix-instantiate --eval -E 'assert 1 + 2 == 3; true'
 [[ "$(nix-instantiate --eval -E '{"assert"=1;bar=2;}')" == '{ "assert" = 1; bar = 2; }' ]]
 
 # Check that symlink cycles don't cause a hang.
-ln -sfn cycle.nix $TEST_ROOT/cycle.nix
-(! nix eval --file $TEST_ROOT/cycle.nix)
+ln -sfn cycle.nix "$TEST_ROOT/cycle.nix"
+(! nix eval --file "$TEST_ROOT/cycle.nix")
 
 # Check that relative symlinks are resolved correctly.
-mkdir -p $TEST_ROOT/xyzzy $TEST_ROOT/foo
-ln -sfn ../xyzzy $TEST_ROOT/foo/bar
-printf 123 > $TEST_ROOT/xyzzy/default.nix
+mkdir -p "$TEST_ROOT/xyzzy" "$TEST_ROOT/foo"
+ln -sfn ../xyzzy "$TEST_ROOT/foo/bar"
+printf 123 > "$TEST_ROOT/xyzzy/default.nix"
 [[ $(nix eval --impure --expr "import $TEST_ROOT/foo/bar") = 123 ]]
 
 # Test --arg-from-file.
@@ -57,7 +57,7 @@ fi
 
 # Test that unknown settings are warned about
 out="$(expectStderr 0 nix eval --option foobar baz --expr '""' --raw)"
-[[ "$(echo "$out" | grep foobar | wc -l)" = 1 ]]
+[[ "$(echo "$out" | grep -c foobar)" = 1 ]]
 
 # Test flag alias
 out="$(nix eval --expr '{}' --build-cores 1)"
diff --git a/tests/functional/fetchurl.sh b/tests/functional/fetchurl.sh
index 5af44fcf2..c25ac3216 100755
--- a/tests/functional/fetchurl.sh
+++ b/tests/functional/fetchurl.sh
@@ -9,12 +9,12 @@ clearStore
 # Test fetching a flat file.
 hash=$(nix-hash --flat --type sha256 ./fetchurl.sh)
 
-outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file://$(pwd)/fetchurl.sh --argstr sha256 $hash --no-out-link)
+outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url "file://$(pwd)/fetchurl.sh" --argstr sha256 "$hash" --no-out-link)
 
-cmp $outPath fetchurl.sh
+cmp "$outPath" fetchurl.sh
 
 # Do not re-fetch paths already present.
-outPath2=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:///does-not-exist/must-remain-unused/fetchurl.sh --argstr sha256 $hash --no-out-link)
+outPath2=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:///does-not-exist/must-remain-unused/fetchurl.sh --argstr sha256 "$hash" --no-out-link)
 test "$outPath" == "$outPath2"
 
 # Now using a base-64 hash.
@@ -22,9 +22,9 @@ clearStore
 
 hash=$(nix hash file --type sha512 --base64 ./fetchurl.sh)
 
-outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file://$(pwd)/fetchurl.sh --argstr sha512 $hash --no-out-link)
+outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url "file://$(pwd)/fetchurl.sh" --argstr sha512 "$hash" --no-out-link)
 
-cmp $outPath fetchurl.sh
+cmp "$outPath" fetchurl.sh
 
 # Now using an SRI hash.
 clearStore
@@ -33,58 +33,58 @@ hash=$(nix hash file ./fetchurl.sh)
 
 [[ $hash =~ ^sha256- ]]
 
-outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file://$(pwd)/fetchurl.sh --argstr hash $hash --no-out-link)
+outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url "file://$(pwd)/fetchurl.sh" --argstr hash "$hash" --no-out-link)
 
-cmp $outPath fetchurl.sh
+cmp "$outPath" fetchurl.sh
 
 # Test that we can substitute from a different store dir.
 clearStore
 
-other_store=file://$TEST_ROOT/other_store?store=/fnord/store
+other_store="file://$TEST_ROOT/other_store?store=/fnord/store"
 
 hash=$(nix hash file --type sha256 --base16 ./fetchurl.sh)
 
-storePath=$(nix --store $other_store store add-file ./fetchurl.sh)
+nix --store "$other_store" store add-file ./fetchurl.sh
 
-outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:///no-such-dir/fetchurl.sh --argstr sha256 $hash --no-out-link --substituters $other_store)
+outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:///no-such-dir/fetchurl.sh --argstr sha256 "$hash" --no-out-link --substituters "$other_store")
 
 # Test hashed mirrors with an SRI hash.
-nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:///no-such-dir/fetchurl.sh --argstr hash $(nix hash to-sri --type sha256 $hash) \
-          --no-out-link --substituters $other_store
+nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:///no-such-dir/fetchurl.sh --argstr hash "$(nix hash to-sri --type sha256 "$hash")" \
+          --no-out-link --substituters "$other_store"
 
 # Test unpacking a NAR.
-rm -rf $TEST_ROOT/archive
-mkdir -p $TEST_ROOT/archive
-cp ./fetchurl.sh $TEST_ROOT/archive
-chmod +x $TEST_ROOT/archive/fetchurl.sh
-ln -s foo $TEST_ROOT/archive/symlink
-nar=$TEST_ROOT/archive.nar
-nix-store --dump $TEST_ROOT/archive > $nar
+rm -rf "$TEST_ROOT/archive"
+mkdir -p "$TEST_ROOT/archive"
+cp ./fetchurl.sh "$TEST_ROOT/archive"
+chmod +x "$TEST_ROOT/archive/fetchurl.sh"
+ln -s foo "$TEST_ROOT/archive/symlink"
+nar="$TEST_ROOT/archive.nar"
+nix-store --dump "$TEST_ROOT/archive" > "$nar"
 
-hash=$(nix-hash --flat --type sha256 $nar)
+hash=$(nix-hash --flat --type sha256 "$nar")
 
-outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file://$nar --argstr sha256 $hash \
+outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url "file://$nar" --argstr sha256 "$hash" \
           --arg unpack true --argstr name xyzzy --no-out-link)
 
-echo $outPath | grepQuiet 'xyzzy'
+echo "$outPath" | grepQuiet 'xyzzy'
 
-test -x $outPath/fetchurl.sh
-test -L $outPath/symlink
+test -x "$outPath/fetchurl.sh"
+test -L "$outPath/symlink"
 
-nix-store --delete $outPath
+nix-store --delete "$outPath"
 
 # Test unpacking a compressed NAR.
-narxz=$TEST_ROOT/archive.nar.xz
-rm -f $narxz
-xz --keep $nar
-outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file://$narxz --argstr sha256 $hash \
+narxz="$TEST_ROOT/archive.nar.xz"
+rm -f "$narxz"
+xz --keep "$nar"
+outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url "file://$narxz" --argstr sha256 "$hash" \
           --arg unpack true --argstr name xyzzy --no-out-link)
 
-test -x $outPath/fetchurl.sh
-test -L $outPath/symlink
+test -x "$outPath/fetchurl.sh"
+test -L "$outPath/symlink"
 
 # Make sure that *not* passing a outputHash fails.
 requireDaemonNewerThan "2.20"
 expected=100
 if [[ -v NIX_DAEMON_PACKAGE ]]; then expected=1; fi # work around the daemon not returning a 100 status correctly
-expectStderr $expected nix-build --expr '{ url }: builtins.derivation { name = "nix-cache-info"; system = "x86_64-linux"; builder = "builtin:fetchurl"; inherit url; outputHashMode = "flat"; }' --argstr url file://$narxz 2>&1 | grep 'must be a fixed-output or impure derivation'
+expectStderr $expected nix-build --expr '{ url }: builtins.derivation { name = "nix-cache-info"; system = "x86_64-linux"; builder = "builtin:fetchurl"; inherit url; outputHashMode = "flat"; }' --argstr url "file://$narxz" 2>&1 | grep 'must be a fixed-output or impure derivation'
diff --git a/tests/functional/flakes/common.sh b/tests/functional/flakes/common.sh
index f83a02aba..8ec70d703 100644
--- a/tests/functional/flakes/common.sh
+++ b/tests/functional/flakes/common.sh
@@ -1,10 +1,13 @@
+#!/usr/bin/env bash
+
 source ../common.sh
 
+# shellcheck disable=SC2034 # this variable is used by tests that source this file
 registry=$TEST_ROOT/registry.json
 
 writeSimpleFlake() {
     local flakeDir="$1"
-    cat > $flakeDir/flake.nix <<EOF
+    cat > "$flakeDir/flake.nix" <<EOF
 {
   description = "Bla bla";
 
@@ -31,19 +34,19 @@ writeSimpleFlake() {
 }
 EOF
 
-    cp ../simple.nix ../shell.nix ../simple.builder.sh ../config.nix $flakeDir/
+    cp ../simple.nix ../shell.nix ../simple.builder.sh ../config.nix "$flakeDir/"
 }
 
 createSimpleGitFlake() {
     local flakeDir="$1"
-    writeSimpleFlake $flakeDir
-    git -C $flakeDir add flake.nix simple.nix shell.nix simple.builder.sh config.nix
-    git -C $flakeDir commit -m 'Initial'
+    writeSimpleFlake "$flakeDir"
+    git -C "$flakeDir" add flake.nix simple.nix shell.nix simple.builder.sh config.nix
+    git -C "$flakeDir" commit -m 'Initial'
 }
 
 writeDependentFlake() {
     local flakeDir="$1"
-    cat > $flakeDir/flake.nix <<EOF
+    cat > "$flakeDir/flake.nix" <<EOF
 {
   outputs = { self, flake1 }: {
     packages.$system.default = flake1.packages.$system.default;
@@ -55,7 +58,7 @@ EOF
 
 writeTrivialFlake() {
     local flakeDir="$1"
-    cat > $flakeDir/flake.nix <<EOF
+    cat > "$flakeDir/flake.nix" <<EOF
 {
   outputs = { self }: {
     expr = 123;
@@ -71,6 +74,7 @@ createGitRepo() {
     rm -rf "$repo" "$repo".tmp
     mkdir -p "$repo"
 
+    # shellcheck disable=SC2086 # word splitting of extraArgs is intended
     git -C "$repo" init $extraArgs
     git -C "$repo" config user.email "foobar@example.com"
     git -C "$repo" config user.name "Foobar"
diff --git a/tests/functional/gc.sh b/tests/functional/gc.sh
index 7707a7e27..c58f47021 100755
--- a/tests/functional/gc.sh
+++ b/tests/functional/gc.sh
@@ -11,46 +11,46 @@ outPath=$(nix-store -rvv "$drvPath")
 
 # Set a GC root.
 rm -f "$NIX_STATE_DIR/gcroots/foo"
-ln -sf $outPath "$NIX_STATE_DIR/gcroots/foo"
+ln -sf "$outPath" "$NIX_STATE_DIR/gcroots/foo"
 
-[ "$(nix-store -q --roots $outPath)" = "$NIX_STATE_DIR/gcroots/foo -> $outPath" ]
+[ "$(nix-store -q --roots "$outPath")" = "$NIX_STATE_DIR/gcroots/foo -> $outPath" ]
 
-nix-store --gc --print-roots | grep $outPath
-nix-store --gc --print-live | grep $outPath
-nix-store --gc --print-dead | grep $drvPath
-if nix-store --gc --print-dead | grep -E $outPath$; then false; fi
+nix-store --gc --print-roots | grep "$outPath"
+nix-store --gc --print-live | grep "$outPath"
+nix-store --gc --print-dead | grep "$drvPath"
+if nix-store --gc --print-dead | grep -E "$outPath"$; then false; fi
 
 nix-store --gc --print-dead
 
-inUse=$(readLink $outPath/reference-to-input-2)
-if nix-store --delete $inUse; then false; fi
-test -e $inUse
+inUse=$(readLink "$outPath/reference-to-input-2")
+if nix-store --delete "$inUse"; then false; fi
+test -e "$inUse"
 
-if nix-store --delete $outPath; then false; fi
-test -e $outPath
+if nix-store --delete "$outPath"; then false; fi
+test -e "$outPath"
 
-for i in $NIX_STORE_DIR/*; do
+for i in "$NIX_STORE_DIR"/*; do
     if [[ $i =~ /trash ]]; then continue; fi # compat with old daemon
-    touch $i.lock
-    touch $i.chroot
+    touch "$i.lock"
+    touch "$i.chroot"
 done
 
 nix-collect-garbage
 
 # Check that the root and its dependencies haven't been deleted.
-cat $outPath/foobar
-cat $outPath/reference-to-input-2/bar
+cat "$outPath/foobar"
+cat "$outPath/reference-to-input-2/bar"
 
 # Check that the derivation has been GC'd.
-if test -e $drvPath; then false; fi
+if test -e "$drvPath"; then false; fi
 
 rm "$NIX_STATE_DIR/gcroots/foo"
 
 nix-collect-garbage
 
 # Check that the output has been GC'd.
-if test -e $outPath/foobar; then false; fi
+if test -e "$outPath/foobar"; then false; fi
 
 # Check that the store is empty.
-rmdir $NIX_STORE_DIR/.links
-rmdir $NIX_STORE_DIR
+rmdir "$NIX_STORE_DIR/.links"
+rmdir "$NIX_STORE_DIR"
diff --git a/tests/functional/help.sh b/tests/functional/help.sh
index 61efc1cb2..127cc455b 100755
--- a/tests/functional/help.sh
+++ b/tests/functional/help.sh
@@ -65,5 +65,6 @@ def recurse($prefix):
 }
 
 nix __dump-cli | subcommands | while IFS= read -r cmd; do
+    # shellcheck disable=SC2086 # word splitting of cmd is intended
     nix $cmd --help
 done
diff --git a/tests/functional/lang.sh b/tests/functional/lang.sh
index 46cf3f1fe..e64663d30 100755
--- a/tests/functional/lang.sh
+++ b/tests/functional/lang.sh
@@ -37,12 +37,14 @@ nix-instantiate --eval -E 'let x = { repeating = x; tracing = builtins.trace x t
   2>&1 | grepQuiet -F 'trace: { repeating = «repeated»; tracing = «potential infinite recursion»; }'
 
 nix-instantiate --eval -E 'builtins.warn "Hello" 123' 2>&1 | grepQuiet 'warning: Hello'
+# shellcheck disable=SC2016 # The ${} in this is Nix, not shell
 nix-instantiate --eval -E 'builtins.addErrorContext "while doing ${"something"} interesting" (builtins.warn "Hello" 123)' 2>/dev/null | grepQuiet 123
 
 # warn does not accept non-strings for now
 expectStderr 1 nix-instantiate --eval -E 'let x = builtins.warn { x = x; } true; in x' \
   | grepQuiet "expected a string but found a set"
 expectStderr 1 nix-instantiate --eval --abort-on-warn -E 'builtins.warn "Hello" 123' | grepQuiet Hello
+# shellcheck disable=SC2016 # The ${} in this is Nix, not shell
 NIX_ABORT_ON_WARN=1 expectStderr 1 nix-instantiate --eval -E 'builtins.addErrorContext "while doing ${"something"} interesting" (builtins.warn "Hello" 123)' | grepQuiet "while doing something interesting"
 
 set +x
@@ -106,6 +108,7 @@ for i in lang/eval-fail-*.nix; do
         fi
     )"
     if
+        # shellcheck disable=SC2086 # word splitting of flags is intended
         expectStderr 1 nix-instantiate $flags "lang/$i.nix" \
             | sed "s!$(pwd)!/pwd!g" > "lang/$i.err"
     then
diff --git a/tests/functional/nar-access.sh b/tests/functional/nar-access.sh
index b254081cf..2b0a6a329 100755
--- a/tests/functional/nar-access.sh
+++ b/tests/functional/nar-access.sh
@@ -9,57 +9,57 @@ cd "$TEST_ROOT"
 
 # Dump path to nar.
 narFile="$TEST_ROOT/path.nar"
-nix-store --dump $storePath > $narFile
+nix-store --dump "$storePath" > "$narFile"
 
 # Check that find and nar ls match.
-( cd $storePath; find . | sort ) > files.find
-nix nar ls -R -d $narFile "" | sort > files.ls-nar
+( cd "$storePath"; find . | sort ) > files.find
+nix nar ls -R -d "$narFile" "" | sort > files.ls-nar
 diff -u files.find files.ls-nar
 
 # Check that file contents of data match.
-nix nar cat $narFile /foo/data > data.cat-nar
-diff -u data.cat-nar $storePath/foo/data
+nix nar cat "$narFile" /foo/data > data.cat-nar
+diff -u data.cat-nar "$storePath/foo/data"
 
 # Check that file contents of baz match.
-nix nar cat $narFile /foo/baz > baz.cat-nar
-diff -u baz.cat-nar $storePath/foo/baz
+nix nar cat "$narFile" /foo/baz > baz.cat-nar
+diff -u baz.cat-nar "$storePath/foo/baz"
 
-nix store cat $storePath/foo/baz > baz.cat-nar
-diff -u baz.cat-nar $storePath/foo/baz
+nix store cat "$storePath/foo/baz" > baz.cat-nar
+diff -u baz.cat-nar "$storePath/foo/baz"
 
 TODO_NixOS
 
 # Check that 'nix store cat' fails on invalid store paths.
-invalidPath="$(dirname $storePath)/99999999999999999999999999999999-foo"
-cp -r $storePath $invalidPath
-expect 1 nix store cat $invalidPath/foo/baz
+invalidPath="$(dirname "$storePath")/99999999999999999999999999999999-foo"
+cp -r "$storePath" "$invalidPath"
+expect 1 nix store cat "$invalidPath/foo/baz"
 
 # Test --json.
 diff -u \
-    <(nix nar ls --json $narFile / | jq -S) \
+    <(nix nar ls --json "$narFile" / | jq -S) \
     <(echo '{"type":"directory","entries":{"foo":{},"foo-x":{},"qux":{},"zyx":{}}}' | jq -S)
 diff -u \
-    <(nix nar ls --json -R $narFile /foo | jq -S) \
+    <(nix nar ls --json -R "$narFile" /foo | jq -S) \
     <(echo '{"type":"directory","entries":{"bar":{"type":"regular","size":0,"narOffset":368},"baz":{"type":"regular","size":0,"narOffset":552},"data":{"type":"regular","size":58,"narOffset":736}}}' | jq -S)
 diff -u \
-    <(nix nar ls --json -R $narFile /foo/bar | jq -S) \
+    <(nix nar ls --json -R "$narFile" /foo/bar | jq -S) \
     <(echo '{"type":"regular","size":0,"narOffset":368}' | jq -S)
 diff -u \
-    <(nix store ls --json $storePath | jq -S) \
+    <(nix store ls --json "$storePath" | jq -S) \
     <(echo '{"type":"directory","entries":{"foo":{},"foo-x":{},"qux":{},"zyx":{}}}' | jq -S)
 diff -u \
-    <(nix store ls --json -R $storePath/foo | jq -S) \
+    <(nix store ls --json -R "$storePath/foo" | jq -S) \
     <(echo '{"type":"directory","entries":{"bar":{"type":"regular","size":0},"baz":{"type":"regular","size":0},"data":{"type":"regular","size":58}}}' | jq -S)
 diff -u \
-    <(nix store ls --json -R $storePath/foo/bar| jq -S) \
+    <(nix store ls --json -R "$storePath/foo/bar"| jq -S) \
     <(echo '{"type":"regular","size":0}' | jq -S)
 
 # Test missing files.
-expect 1 nix store ls --json -R $storePath/xyzzy 2>&1 | grep 'does not exist'
-expect 1 nix store ls $storePath/xyzzy 2>&1 | grep 'does not exist'
+expect 1 nix store ls --json -R "$storePath/xyzzy" 2>&1 | grep 'does not exist'
+expect 1 nix store ls "$storePath/xyzzy" 2>&1 | grep 'does not exist'
 
 # Test failure to dump.
-if nix-store --dump $storePath >/dev/full ; then
+if nix-store --dump "$storePath" >/dev/full ; then
     echo "dumping to /dev/full should fail"
-    exit -1
+    exit 1
 fi
diff --git a/tests/functional/shell.sh b/tests/functional/shell.sh
index 04a03eef5..cfc8e4102 100755
--- a/tests/functional/shell.sh
+++ b/tests/functional/shell.sh
@@ -27,8 +27,8 @@ expect 1 nix shell -f shell-hello.nix forbidden-symlink -c hello 2>&1 | grepQuie
 # For instance, we might set an environment variable temporarily to affect some
 # initialization or whatnot, but this must not leak into the environment of the
 # command being run.
-env > $TEST_ROOT/expected-env
-nix shell -f shell-hello.nix hello -c env > $TEST_ROOT/actual-env
+env > "$TEST_ROOT/expected-env"
+nix shell -f shell-hello.nix hello -c env > "$TEST_ROOT/actual-env"
 # Remove/reset variables we expect to be different.
 # - PATH is modified by nix shell
 # - we unset TMPDIR on macOS if it contains /var/folders
@@ -39,10 +39,10 @@ sed -i \
   -e 's/_=.*/_=.../' \
   -e '/^TMPDIR=\/var\/folders\/.*/d' \
   -e '/^__CF_USER_TEXT_ENCODING=.*$/d' \
-  $TEST_ROOT/expected-env $TEST_ROOT/actual-env
-sort $TEST_ROOT/expected-env > $TEST_ROOT/expected-env.sorted
-sort $TEST_ROOT/actual-env > $TEST_ROOT/actual-env.sorted
-diff $TEST_ROOT/expected-env.sorted $TEST_ROOT/actual-env.sorted
+  "$TEST_ROOT/expected-env" "$TEST_ROOT/actual-env"
+sort "$TEST_ROOT/expected-env" > "$TEST_ROOT/expected-env.sorted"
+sort "$TEST_ROOT/actual-env" > "$TEST_ROOT/actual-env.sorted"
+diff "$TEST_ROOT/expected-env.sorted" "$TEST_ROOT/actual-env.sorted"
 
 if isDaemonNewer "2.20.0pre20231220"; then
     # Test that command line attribute ordering is reflected in the PATH
@@ -53,8 +53,8 @@ fi
 
 requireSandboxSupport
 
-chmod -R u+w $TEST_ROOT/store0 || true
-rm -rf $TEST_ROOT/store0
+chmod -R u+w "$TEST_ROOT/store0" || true
+rm -rf "$TEST_ROOT/store0"
 
 clearStore
 
@@ -64,10 +64,10 @@ path=$(nix eval --raw -f shell-hello.nix hello)
 # visible in the sandbox.
 nix shell --sandbox-build-dir /build-tmp \
     --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' \
-    --store $TEST_ROOT/store0 -f shell-hello.nix hello -c hello | grep 'Hello World'
+    --store "$TEST_ROOT/store0" -f shell-hello.nix hello -c hello | grep 'Hello World'
 
-path2=$(nix shell --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' --store $TEST_ROOT/store0 -f shell-hello.nix hello -c $SHELL -c 'type -p hello')
+path2=$(nix shell --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' --store "$TEST_ROOT/store0" -f shell-hello.nix hello -c "$SHELL" -c 'type -p hello')
 
-[[ $path/bin/hello = $path2 ]]
+[[ "$path/bin/hello" = "$path2" ]]
 
-[[ -e $TEST_ROOT/store0/nix/store/$(basename $path)/bin/hello ]]
+[[ -e $TEST_ROOT/store0/nix/store/$(basename "$path")/bin/hello ]]
diff --git a/tests/functional/zstd.sh b/tests/functional/zstd.sh
index 90fe58539..450fb7d35 100755
--- a/tests/functional/zstd.sh
+++ b/tests/functional/zstd.sh
@@ -11,22 +11,22 @@ cacheURI="file://$cacheDir?compression=zstd"
 
 outPath=$(nix-build dependencies.nix --no-out-link)
 
-nix copy --to $cacheURI $outPath
+nix copy --to "$cacheURI" "$outPath"
 
-HASH=$(nix hash path $outPath)
+HASH=$(nix hash path "$outPath")
 
 clearStore
 clearCacheCache
 
-nix copy --from $cacheURI $outPath --no-check-sigs
+nix copy --from "$cacheURI" "$outPath" --no-check-sigs
 
-if ls $cacheDir/nar/*.zst &> /dev/null; then
+if ls "$cacheDir/nar/"*.zst &> /dev/null; then
     echo "files do exist"
 else
     echo "nars do not exist"
     exit 1
 fi
 
-HASH2=$(nix hash path $outPath)
+HASH2=$(nix hash path "$outPath")
 
-[[ $HASH = $HASH2 ]]
+[[ "$HASH" = "$HASH2" ]]

From 78aedda6bd42d81b4e608bcb8ace641b5a2ef3ec Mon Sep 17 00:00:00 2001
From: Emil Petersen <leetemil@users.noreply.github.com>
Date: Thu, 31 Oct 2024 00:31:03 +0100
Subject: [PATCH 38/43] Update content-address.md (#11771)

Correct a few typos. Make explicit that FSO acronym refers to File System Object.
---
 .../source/store/file-system-object/content-address.md      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual/source/store/file-system-object/content-address.md b/doc/manual/source/store/file-system-object/content-address.md
index 410d7fb7c..72b087fe9 100644
--- a/doc/manual/source/store/file-system-object/content-address.md
+++ b/doc/manual/source/store/file-system-object/content-address.md
@@ -1,13 +1,13 @@
 # Content-Addressing File System Objects
 
-For many operations, Nix needs to calculate [a content addresses](@docroot@/glossary.md#gloss-content-address) of [a file system object][file system object].
+For many operations, Nix needs to calculate [a content addresses](@docroot@/glossary.md#gloss-content-address) of [a file system object][file system object] (FSO).
 Usually this is needed as part of
 [content addressing store objects](../store-object/content-address.md),
 since store objects always have a root file system object.
 But some command-line utilities also just work on "raw" file system objects, not part of any store object.
 
 Every content addressing scheme Nix uses ultimately involves feeding data into a [hash function](https://en.wikipedia.org/wiki/Hash_function), and getting back an opaque fixed-size digest which is deemed a content address.
-The various *methods* of content addressing thus differ in how abstract data (in this case, a file system object and its descendents) are fed into the hash function.
+The various *methods* of content addressing thus differ in how abstract data (in this case, a file system object and its descendants) are fed into the hash function.
 
 ## Serialising File System Objects { #serial }
 
@@ -25,7 +25,7 @@ For example, Unix commands like `sha256sum` or `sha1sum` will produce hashes for
 
 ### Nix Archive (NAR) { #serial-nix-archive }
 
-For the other cases of [file system objects][file system object], especially directories with arbitrary descendents, we need a more complex serialisation format.
+For the other cases of [file system objects][file system object], especially directories with arbitrary descendants, we need a more complex serialisation format.
 Examples of such serialisations are the ZIP and TAR file formats.
 However, for our purposes these formats have two problems:
 

From a530939fe40f788d070e5593c884381758cf4192 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Thu, 31 Oct 2024 06:46:33 -0700
Subject: [PATCH 39/43] Add check for one nix-build-* directory

---
 tests/functional/check.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/functional/check.sh b/tests/functional/check.sh
index bff6b2ec8..b21349288 100755
--- a/tests/functional/check.sh
+++ b/tests/functional/check.sh
@@ -49,6 +49,10 @@ test_custom_build_dir() {
   [ "$status" = "100" ]
   [[ 1 == "$(count "$customBuildDir/nix-build-"*)" ]]
   local buildDir=("$customBuildDir/nix-build-"*)
+  if [[ "${#buildDir[@]}" -ne 1 ]]; then
+    echo "expected one nix-build-* directory, got: ${buildDir[*]}" >&2
+    exit 1
+  fi
   if [[ -e ${buildDir[*]}/build ]]; then
       buildDir[0]="${buildDir[*]}/build"
   fi

From 39fe52a126a7cba609016f0035e1a85001001acf Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Thu, 31 Oct 2024 06:46:58 -0700
Subject: [PATCH 40/43] Replace shebang with shellcheck directive

---
 tests/functional/flakes/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/flakes/common.sh b/tests/functional/flakes/common.sh
index 8ec70d703..e43e180e3 100644
--- a/tests/functional/flakes/common.sh
+++ b/tests/functional/flakes/common.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 source ../common.sh
 

From 5f71ebb956227fb5aa88b532522c7d63e5752f5a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 27 Oct 2024 23:39:26 +0100
Subject: [PATCH 41/43] fix: make sure directory exists before using `ln`

---
 scripts/install-systemd-multi-user.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install-systemd-multi-user.sh b/scripts/install-systemd-multi-user.sh
index a79a69990..dc373f4db 100755
--- a/scripts/install-systemd-multi-user.sh
+++ b/scripts/install-systemd-multi-user.sh
@@ -96,6 +96,9 @@ poly_configure_nix_daemon_service() {
     if [ -e /run/systemd/system ]; then
         task "Setting up the nix-daemon systemd service"
 
+        _sudo "to create parent of the nix-daemon tmpfiles config" \
+              mkdir -p "$(dirname "$TMPFILES_DEST")"
+
         _sudo "to create the nix-daemon tmpfiles config" \
               ln -sfn "/nix/var/nix/profiles/default$TMPFILES_SRC" "$TMPFILES_DEST"
 

From 9bb153acb2b79e0d7236ebd6b25346e32f172049 Mon Sep 17 00:00:00 2001
From: Valentin Gagarin <valentin.gagarin@tweag.io>
Date: Mon, 2 Sep 2024 15:02:55 +0200
Subject: [PATCH 42/43] maintainers: add checklist for security releases

Co-Authored-By: Robert Hensing <robert@roberthensing.nl
Co-authored-by: Dan Baker <daniel.n.baker@gmail.com>
---
 maintainers/README.md           |  3 ++
 maintainers/release-process.md  | 54 +++++++++++++++++++++++++++++++--
 maintainers/security-reports.md | 31 +++++++++++++++++++
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 maintainers/security-reports.md

diff --git a/maintainers/README.md b/maintainers/README.md
index 1a275d998..fd9bbed8e 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -59,6 +59,9 @@ Team meetings are generally open to anyone interested.
 We can make exceptions to discuss sensitive issues, such as security incidents or people matters.
 Contact any team member to get a calendar invite for reminders and updates.
 
+> [!IMPORTANT]
+> [Handling security reports](./security-reports.md) always takes priority.
+
 ## Project board protocol
 
 The team uses a [GitHub project board](https://github.com/orgs/NixOS/projects/19/views/1) for tracking its work.
diff --git a/maintainers/release-process.md b/maintainers/release-process.md
index 7a2b3c0a7..bf3c308cf 100644
--- a/maintainers/release-process.md
+++ b/maintainers/release-process.md
@@ -15,7 +15,7 @@ release:
 
 * (Optionally) Updated `fallback-paths.nix` in Nixpkgs
 
-* An updated manual on https://nixos.org/manual/nix/stable/
+* An updated manual on https://nix.dev/manual/nix/latest/
 
 ## Creating a new release from the `master` branch
 
@@ -194,8 +194,58 @@ release:
 
 * Bump the version number of the release branch as above (e.g. to
   `2.12.2`).
-  
+
 ## Recovering from mistakes
 
 `upload-release.pl` should be idempotent. For instance a wrong `IS_LATEST` value can be fixed that way, by running the script on the actual latest release.
 
+## Security releases
+
+> See also the instructions for [handling security reports](./security-reports.md).
+
+Once a security fix is ready for merging:
+
+1. Summarize *all* past communication in the report.
+
+1. Request a CVE in the [GitHub security advisory](https://github.com/NixOS/nix/security/advisories) for the security fix.
+
+1. Notify all collaborators on the advisory with a timeline for the release.
+
+1. Merge the fix. Publish the advisory.
+
+1. [Make point releases](#creating-point-releases) for all affected versions.
+
+1. Update the affected Nix releases in Nixpkgs to the patched version.
+
+   For each Nix release, change the `version = ` strings and run
+
+   ```shell-session
+   nix-build -A nixVersions.nix_<major>_<minor>
+   ```
+
+   to get the correct hash for the `hash =` field.
+
+1. Once the release is built by Hydra, update fallback paths.
+
+   For the Nix release `${version}` shipped with Nixpkgs, run:
+
+   ```shell-session
+   curl https://releases.nixos.org/nix/nix-${version}/fallback-paths.nix > nixos/modules/installer/tools/nix-fallback-paths.nix
+   ```
+
+   Starting with Nixpkgs 24.11, there is an automatic check that fallback paths with Nix binaries match the Nix release shipped with Nixpkgs.
+
+1. Backport the updates to the two most recent stable releases of Nixpkgs.
+
+   Add `backport release-<version>` labels, which will trigger GitHub Actions to attempt automatic backports.
+
+1. Once the pull request against `master` lands on `nixpkgs-unstable`, post a Discourse announcement with
+
+   - Links to the CVE and GitHub security advisory
+   - A description of the vulnerability and its fix
+   - Credits to the reporters of the vulnerability and contributors of the fix
+   - A list of affected and patched Nix releases
+   - Instructions for updating
+   - A link to the [pull request tracker](https://nixpk.gs/pr-tracker.html) to follow when the patched Nix versions will appear on the various release channels
+
+   Check [past announcements](https://discourse.nixos.org/search?expanded=true&q=Security%20fix%20in%3Atitle%20order%3Alatest_topic) for reference.
diff --git a/maintainers/security-reports.md b/maintainers/security-reports.md
new file mode 100644
index 000000000..700590cf7
--- /dev/null
+++ b/maintainers/security-reports.md
@@ -0,0 +1,31 @@
+# Handling security reports
+
+Reports can be expected to be submitted following the [security policy](https://github.com/NixOS/nix/security/policy), but may reach maintainers on various other channels.
+
+In case a vulnerability is reported:
+
+1. [Create a GitHub security advisory](https://github.com/NixOS/nix/security/advisories/new)
+
+   > [!IMPORTANT]
+   > Add the reporter as a collaborator so they get notified of all activities.
+
+   In addition to the details in the advisory template, the initial report should:
+   
+   - Include sufficient details of the vulnerability to allow it to be understood and reproduced.
+   - Redact any personal data.
+   - Set a deadline (if applicable).
+   - Provide proof of concept code (if available).
+   - Reference any further reading material that may be appropriate.
+
+1. Establish a private communication channel (e.g. a Matrix room) with the reporter and all Nix maintainers.
+
+1. Communicate with the reporter which team members are assigned and when they are available.
+
+1. Consider which immediate preliminary measures should be taken before working on a fix.
+
+1. Prioritize fixing the security issue over ongoing work.
+
+1. Keep everyone involved up to date on progress and the estimated timeline for releasing the fix.
+
+> See also the instructions for [security releases](./release-process.md#security-releases).
+

From 020dbac0e01fdf6c5ed6e33b9c4bd4796db507bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 1 Nov 2024 11:55:33 +0100
Subject: [PATCH 43/43] doc/rl-2.19: add entry for always-allow-substitutes
 option (#11775)

* doc/rl-2.19: add entry for always-allow-substitutes option

Fixes https://github.com/NixOS/nix/issues/9427.
---
 doc/manual/source/release-notes/rl-2.19.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/manual/source/release-notes/rl-2.19.md b/doc/manual/source/release-notes/rl-2.19.md
index e2e2f85cc..e6a93c7ea 100644
--- a/doc/manual/source/release-notes/rl-2.19.md
+++ b/doc/manual/source/release-notes/rl-2.19.md
@@ -75,3 +75,7 @@
   (experimental) can be found by any program that follows the [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html).
 
 - A new command `nix store add` has been added. It replaces `nix store add-file` and `nix store add-path` which are now deprecated.
+
+- A new option [`always-allow-substitutes`](@docroot@/command-ref/conf-file.md#conf-always-allow-substitutes) has been added.
+
+  When set to `true`, Nix will always try to substitute a derivation, even if it has the [`allowSubstitutes`]{#adv-attr-allowSubstitutes} attribute set to `false`.