Move /src to /subprojects

This will facilitate breaking up Nix into multiple packages for each
component with Meson.

.github/CODEOWNERS

@@ -11,16 +11,16 @@
 .github/CODEOWNERS @edolstra
 
 # Documentation of built-in functions
-src/libexpr/primops.cc @roberth @fricklerhandwerk
+subprojects/libexpr/primops.cc @roberth @fricklerhandwerk
 
 # Documentation of settings
-src/libexpr/eval-settings.hh @fricklerhandwerk
-src/libstore/globals.hh @fricklerhandwerk
+subprojects/libexpr/eval-settings.hh @fricklerhandwerk
+subprojects/libstore/globals.hh @fricklerhandwerk
 
 # Documentation
 doc/manual @fricklerhandwerk
 maintainers/*.md @fricklerhandwerk
-src/**/*.md @fricklerhandwerk
+subprojects/**/*.md @fricklerhandwerk
 
 # Libstore layer
-/src/libstore @ericson2314
+/subprojects/libstore @ericson2314

.github/labeler.yml

@@ -1,6 +1,6 @@
 "c api":
   - changed-files:
-    - any-glob-to-any-file: "src/lib*-c/**/*"
+    - any-glob-to-any-file: "subprojects/lib*-c/**/*"
     - any-glob-to-any-file: "test/unit/**/nix_api_*"
     - any-glob-to-any-file: "doc/external-api/**/*"
 
@@ -14,30 +14,30 @@
 "documentation":
   - changed-files:
     - any-glob-to-any-file: "doc/manual/**/*"
-    - any-glob-to-any-file: "src/nix/**/*.md"
+    - any-glob-to-any-file: "subprojects/nix/**/*.md"
 
 "store":
   - changed-files:
-    - any-glob-to-any-file: "src/libstore/store-api.*"
-    - any-glob-to-any-file: "src/libstore/*-store.*"
+    - any-glob-to-any-file: "subprojects/libstore/store-api.*"
+    - any-glob-to-any-file: "subprojects/libstore/*-store.*"
 
 "fetching":
   - changed-files:
-    - any-glob-to-any-file: "src/libfetchers/**/*"
+    - any-glob-to-any-file: "subprojects/libfetchers/**/*"
 
 "repl":
   - changed-files:
-    - any-glob-to-any-file: "src/libcmd/repl.*"
-    - any-glob-to-any-file: "src/nix/repl.*"
+    - any-glob-to-any-file: "subprojects/libcmd/repl.*"
+    - any-glob-to-any-file: "subprojects/nix/repl.*"
 
 "new-cli":
   - changed-files:
-    - any-glob-to-any-file: "src/nix/**/*"
+    - any-glob-to-any-file: "subprojects/nix/**/*"
 
 "with-tests":
   - changed-files:
     # Unit tests
-    - any-glob-to-any-file: "src/*/tests/**/*"
+    - any-glob-to-any-file: "subprojects/*/tests/**/*"
     # Functional and integration tests
     - any-glob-to-any-file: "tests/functional/**/*"
 

.gitignore

@@ -41,59 +41,59 @@ perl/Makefile.config
 /scripts/nix-profile.fish
 /scripts/nix-profile-daemon.fish
 
-# /src/libexpr/
-/src/libexpr/lexer-tab.cc
-/src/libexpr/lexer-tab.hh
-/src/libexpr/parser-tab.cc
-/src/libexpr/parser-tab.hh
-/src/libexpr/parser-tab.output
-/src/libexpr/nix.tbl
-/src/libexpr/tests
+# /subprojects/libexpr/
+/subprojects/libexpr/lexer-tab.cc
+/subprojects/libexpr/lexer-tab.hh
+/subprojects/libexpr/parser-tab.cc
+/subprojects/libexpr/parser-tab.hh
+/subprojects/libexpr/parser-tab.output
+/subprojects/libexpr/nix.tbl
+/subprojects/libexpr/tests
 /tests/unit/libexpr/libnixexpr-tests
 
-# /src/libfetchers
+# /subprojects/libfetchers
 /tests/unit/libfetchers/libnixfetchers-tests
 
-# /src/libflake
+# /subprojects/libflake
 /tests/unit/libflake/libnixflake-tests
 
-# /src/libstore/
+# /subprojects/libstore/
 *.gen.*
-/src/libstore/tests
+/subprojects/libstore/tests
 /tests/unit/libstore/libnixstore-tests
 
-# /src/libutil/
-/src/libutil/tests
+# /subprojects/libutil/
+/subprojects/libutil/tests
 /tests/unit/libutil/libnixutil-tests
 
-/src/nix/nix
+/subprojects/nix/nix
 
-/src/nix/generated-doc
+/subprojects/nix/generated-doc
 
-# /src/nix-env/
-/src/nix-env/nix-env
+# /subprojects/nix-env/
+/subprojects/nix-env/nix-env
 
-# /src/nix-instantiate/
-/src/nix-instantiate/nix-instantiate
+# /subprojects/nix-instantiate/
+/subprojects/nix-instantiate/nix-instantiate
 
-# /src/nix-store/
-/src/nix-store/nix-store
+# /subprojects/nix-store/
+/subprojects/nix-store/nix-store
 
-/src/nix-prefetch-url/nix-prefetch-url
+/subprojects/nix-prefetch-url/nix-prefetch-url
 
-/src/nix-collect-garbage/nix-collect-garbage
+/subprojects/nix-collect-garbage/nix-collect-garbage
 
-# /src/nix-channel/
-/src/nix-channel/nix-channel
+# /subprojects/nix-channel/
+/subprojects/nix-channel/nix-channel
 
-# /src/nix-build/
-/src/nix-build/nix-build
+# /subprojects/nix-build/
+/subprojects/nix-build/nix-build
 
-/src/nix-copy-closure/nix-copy-closure
+/subprojects/nix-copy-closure/nix-copy-closure
 
-/src/error-demo/error-demo
+/subprojects/error-demo/error-demo
 
-/src/build-remote/build-remote
+/subprojects/build-remote/build-remote
 
 # /tests/functional/
 /tests/functional/test-tmp

CONTRIBUTING.md

@@ -77,7 +77,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
    - [ ] Fixes an [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) issue
    - [ ] Tests, as appropriate:
      - Functional tests – [`tests/functional/**.sh`](./tests/functional)
-     - Unit tests – [`src/*/tests`](./src/)
+     - Unit tests – [`tests/unit/*`](./tests/unit)
      - Integration tests – [`tests/nixos/*`](./tests/nixos)
    - [ ] User documentation in the [manual](./doc/manual/src)
    - [ ] API documentation in header files

Makefile

@@ -13,17 +13,17 @@ ifeq ($(ENABLE_BUILD), yes)
 makefiles = \
   mk/precompiled-headers.mk \
   local.mk \
-  src/libutil/local.mk \
-  src/libstore/local.mk \
-  src/libfetchers/local.mk \
-  src/libmain/local.mk \
-  src/libexpr/local.mk \
-  src/libflake/local.mk \
-  src/libcmd/local.mk \
-  src/nix/local.mk \
-  src/libutil-c/local.mk \
-  src/libstore-c/local.mk \
-  src/libexpr-c/local.mk
+  subprojects/libutil/local.mk \
+  subprojects/libstore/local.mk \
+  subprojects/libfetchers/local.mk \
+  subprojects/libmain/local.mk \
+  subprojects/libexpr/local.mk \
+  subprojects/libflake/local.mk \
+  subprojects/libcmd/local.mk \
+  subprojects/nix/local.mk \
+  subprojects/libutil-c/local.mk \
+  subprojects/libstore-c/local.mk \
+  subprojects/libexpr-c/local.mk
 
 ifdef HOST_UNIX
 makefiles += \
@@ -93,7 +93,7 @@ ifdef HOST_WINDOWS
   GLOBAL_LDFLAGS += -Wl,--export-all-symbols
 endif
 
-GLOBAL_CXXFLAGS += -g -Wall -Wdeprecated-copy -Wignored-qualifiers -Wimplicit-fallthrough -Werror=unused-result -Werror=suggest-override -include $(buildprefix)config.h -std=c++2a -I src
+GLOBAL_CXXFLAGS += -g -Wall -Wdeprecated-copy -Wignored-qualifiers -Wimplicit-fallthrough -Werror=unused-result -Werror=suggest-override -include $(buildprefix)config.h -std=c++2a -I subprojects
 
 # Include the main lib, causing rules to be defined
 
@@ -101,7 +101,7 @@ include mk/lib.mk
 
 # Fallback stub rules for better UX when things are disabled
 #
-# These must be defined after `mk/lib.mk`. Otherwise the first rule
+# These must be defined after  Otherwise the first rule
 # incorrectly becomes the default target.
 
 ifneq ($(ENABLE_UNIT_TESTS), yes)

doc/manual/src/development/testing.md

@@ -27,7 +27,7 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > An example of some files, demonstrating much of what is described below
 >
 > ```
-> src
+> subprojects
 > ├── libexpr
 > │   ├── local.mk
 > │   ├── value/context.hh
@@ -59,12 +59,12 @@ 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}`.
+The tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `subprojects/${library_name_without-nix}-test`.
+Given an interface (header) and implementation pair in the original library, say, `subprojects/libexpr/value/context.{hh,cc}`, we write tests for it in `subprojects/nix-expr-tests/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `subprojects/nix-expr-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`.
-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`.
+For example, `libnixstore` code is in `subprojects/libstore`, and its test data is in `subprojects/nix-store-tests/data`.
+The path to the `subprojects/${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.
 
 The unit test libraries are in `src/${library_name_without-nix}-test-support`.

local.mk

@@ -2,14 +2,14 @@ GLOBAL_CXXFLAGS += -Wno-deprecated-declarations -Werror=switch
 # Allow switch-enum to be overridden for files that do not support it, usually because of dependency headers.
 ERROR_SWITCH_ENUM = -Werror=switch-enum
 
-$(foreach i, config.h $(wildcard src/lib*/*.hh) $(filter-out %_internal.h, $(wildcard src/lib*c/*.h)), \
+$(foreach i, config.h $(wildcard subprojects/lib*/*.hh) $(filter-out %_internal.h, $(wildcard subprojects/lib*c/*.h)), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
 
 ifdef HOST_UNIX
-  $(foreach i, $(wildcard src/lib*/unix/*.hh), \
+  $(foreach i, $(wildcard subprojects/lib*/unix/*.hh), \
     $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
 endif
 
-$(GCH): src/libutil/util.hh config.h
+$(GCH): subprojects/libutil/util.hh config.h
 
 GCH_CXXFLAGS = $(INCLUDE_libutil)

maintainers/flake-module.nix

@@ -25,402 +25,402 @@
             ''^doc/manual/redirects\.js$''
             ''^doc/manual/theme/highlight\.js$''
             ''^precompiled-headers\.h$''
-            ''^src/build-remote/build-remote\.cc$''
-            ''^src/libcmd/built-path\.cc$''
-            ''^src/libcmd/built-path\.hh$''
-            ''^src/libcmd/command\.cc$''
-            ''^src/libcmd/command\.hh$''
-            ''^src/libcmd/common-eval-args\.cc$''
-            ''^src/libcmd/common-eval-args\.hh$''
-            ''^src/libcmd/editor-for\.cc$''
-            ''^src/libcmd/installable-attr-path\.cc$''
-            ''^src/libcmd/installable-attr-path\.hh$''
-            ''^src/libcmd/installable-derived-path\.cc$''
-            ''^src/libcmd/installable-derived-path\.hh$''
-            ''^src/libcmd/installable-flake\.cc$''
-            ''^src/libcmd/installable-flake\.hh$''
-            ''^src/libcmd/installable-value\.cc$''
-            ''^src/libcmd/installable-value\.hh$''
-            ''^src/libcmd/installables\.cc$''
-            ''^src/libcmd/installables\.hh$''
-            ''^src/libcmd/legacy\.hh$''
-            ''^src/libcmd/markdown\.cc$''
-            ''^src/libcmd/misc-store-flags\.cc$''
-            ''^src/libcmd/repl-interacter\.cc$''
-            ''^src/libcmd/repl-interacter\.hh$''
-            ''^src/libcmd/repl\.cc$''
-            ''^src/libcmd/repl\.hh$''
-            ''^src/libexpr-c/nix_api_expr\.cc$''
-            ''^src/libexpr-c/nix_api_external\.cc$''
-            ''^src/libexpr/attr-path\.cc$''
-            ''^src/libexpr/attr-path\.hh$''
-            ''^src/libexpr/attr-set\.cc$''
-            ''^src/libexpr/attr-set\.hh$''
-            ''^src/libexpr/eval-cache\.cc$''
-            ''^src/libexpr/eval-cache\.hh$''
-            ''^src/libexpr/eval-error\.cc$''
-            ''^src/libexpr/eval-inline\.hh$''
-            ''^src/libexpr/eval-settings\.cc$''
-            ''^src/libexpr/eval-settings\.hh$''
-            ''^src/libexpr/eval\.cc$''
-            ''^src/libexpr/eval\.hh$''
-            ''^src/libexpr/function-trace\.cc$''
-            ''^src/libexpr/gc-small-vector\.hh$''
-            ''^src/libexpr/get-drvs\.cc$''
-            ''^src/libexpr/get-drvs\.hh$''
-            ''^src/libexpr/json-to-value\.cc$''
-            ''^src/libexpr/nixexpr\.cc$''
-            ''^src/libexpr/nixexpr\.hh$''
-            ''^src/libexpr/parser-state\.hh$''
-            ''^src/libexpr/pos-table\.hh$''
-            ''^src/libexpr/primops\.cc$''
-            ''^src/libexpr/primops\.hh$''
-            ''^src/libexpr/primops/context\.cc$''
-            ''^src/libexpr/primops/fetchClosure\.cc$''
-            ''^src/libexpr/primops/fetchMercurial\.cc$''
-            ''^src/libexpr/primops/fetchTree\.cc$''
-            ''^src/libexpr/primops/fromTOML\.cc$''
-            ''^src/libexpr/print-ambiguous\.cc$''
-            ''^src/libexpr/print-ambiguous\.hh$''
-            ''^src/libexpr/print-options\.hh$''
-            ''^src/libexpr/print\.cc$''
-            ''^src/libexpr/print\.hh$''
-            ''^src/libexpr/search-path\.cc$''
-            ''^src/libexpr/symbol-table\.hh$''
-            ''^src/libexpr/value-to-json\.cc$''
-            ''^src/libexpr/value-to-json\.hh$''
-            ''^src/libexpr/value-to-xml\.cc$''
-            ''^src/libexpr/value-to-xml\.hh$''
-            ''^src/libexpr/value\.hh$''
-            ''^src/libexpr/value/context\.cc$''
-            ''^src/libexpr/value/context\.hh$''
-            ''^src/libfetchers/attrs\.cc$''
-            ''^src/libfetchers/cache\.cc$''
-            ''^src/libfetchers/cache\.hh$''
-            ''^src/libfetchers/fetch-settings\.cc$''
-            ''^src/libfetchers/fetch-settings\.hh$''
-            ''^src/libfetchers/fetch-to-store\.cc$''
-            ''^src/libfetchers/fetchers\.cc$''
-            ''^src/libfetchers/fetchers\.hh$''
-            ''^src/libfetchers/filtering-source-accessor\.cc$''
-            ''^src/libfetchers/filtering-source-accessor\.hh$''
-            ''^src/libfetchers/fs-source-accessor\.cc$''
-            ''^src/libfetchers/fs-source-accessor\.hh$''
-            ''^src/libfetchers/git-utils\.cc$''
-            ''^src/libfetchers/git-utils\.hh$''
-            ''^src/libfetchers/github\.cc$''
-            ''^src/libfetchers/indirect\.cc$''
-            ''^src/libfetchers/memory-source-accessor\.cc$''
-            ''^src/libfetchers/path\.cc$''
-            ''^src/libfetchers/registry\.cc$''
-            ''^src/libfetchers/registry\.hh$''
-            ''^src/libfetchers/tarball\.cc$''
-            ''^src/libfetchers/tarball\.hh$''
-            ''^src/libfetchers/git\.cc$''
-            ''^src/libfetchers/mercurial\.cc$''
-            ''^src/libflake/flake/config\.cc$''
-            ''^src/libflake/flake/flake\.cc$''
-            ''^src/libflake/flake/flake\.hh$''
-            ''^src/libflake/flake/flakeref\.cc$''
-            ''^src/libflake/flake/flakeref\.hh$''
-            ''^src/libflake/flake/lockfile\.cc$''
-            ''^src/libflake/flake/lockfile\.hh$''
-            ''^src/libflake/flake/url-name\.cc$''
-            ''^src/libmain/common-args\.cc$''
-            ''^src/libmain/common-args\.hh$''
-            ''^src/libmain/loggers\.cc$''
-            ''^src/libmain/loggers\.hh$''
-            ''^src/libmain/progress-bar\.cc$''
-            ''^src/libmain/shared\.cc$''
-            ''^src/libmain/shared\.hh$''
-            ''^src/libmain/unix/stack\.cc$''
-            ''^src/libstore/binary-cache-store\.cc$''
-            ''^src/libstore/binary-cache-store\.hh$''
-            ''^src/libstore/build-result\.hh$''
-            ''^src/libstore/builtins\.hh$''
-            ''^src/libstore/builtins/buildenv\.cc$''
-            ''^src/libstore/builtins/buildenv\.hh$''
-            ''^src/libstore/common-protocol-impl\.hh$''
-            ''^src/libstore/common-protocol\.cc$''
-            ''^src/libstore/common-protocol\.hh$''
-            ''^src/libstore/common-ssh-store-config\.hh$''
-            ''^src/libstore/content-address\.cc$''
-            ''^src/libstore/content-address\.hh$''
-            ''^src/libstore/daemon\.cc$''
-            ''^src/libstore/daemon\.hh$''
-            ''^src/libstore/derivations\.cc$''
-            ''^src/libstore/derivations\.hh$''
-            ''^src/libstore/derived-path-map\.cc$''
-            ''^src/libstore/derived-path-map\.hh$''
-            ''^src/libstore/derived-path\.cc$''
-            ''^src/libstore/derived-path\.hh$''
-            ''^src/libstore/downstream-placeholder\.cc$''
-            ''^src/libstore/downstream-placeholder\.hh$''
-            ''^src/libstore/dummy-store\.cc$''
-            ''^src/libstore/export-import\.cc$''
-            ''^src/libstore/filetransfer\.cc$''
-            ''^src/libstore/filetransfer\.hh$''
-            ''^src/libstore/gc-store\.hh$''
-            ''^src/libstore/globals\.cc$''
-            ''^src/libstore/globals\.hh$''
-            ''^src/libstore/http-binary-cache-store\.cc$''
-            ''^src/libstore/legacy-ssh-store\.cc$''
-            ''^src/libstore/legacy-ssh-store\.hh$''
-            ''^src/libstore/length-prefixed-protocol-helper\.hh$''
-            ''^src/libstore/linux/personality\.cc$''
-            ''^src/libstore/linux/personality\.hh$''
-            ''^src/libstore/local-binary-cache-store\.cc$''
-            ''^src/libstore/local-fs-store\.cc$''
-            ''^src/libstore/local-fs-store\.hh$''
-            ''^src/libstore/log-store\.cc$''
-            ''^src/libstore/log-store\.hh$''
-            ''^src/libstore/machines\.cc$''
-            ''^src/libstore/machines\.hh$''
-            ''^src/libstore/make-content-addressed\.cc$''
-            ''^src/libstore/make-content-addressed\.hh$''
-            ''^src/libstore/misc\.cc$''
-            ''^src/libstore/names\.cc$''
-            ''^src/libstore/names\.hh$''
-            ''^src/libstore/nar-accessor\.cc$''
-            ''^src/libstore/nar-accessor\.hh$''
-            ''^src/libstore/nar-info-disk-cache\.cc$''
-            ''^src/libstore/nar-info-disk-cache\.hh$''
-            ''^src/libstore/nar-info\.cc$''
-            ''^src/libstore/nar-info\.hh$''
-            ''^src/libstore/outputs-spec\.cc$''
-            ''^src/libstore/outputs-spec\.hh$''
-            ''^src/libstore/parsed-derivations\.cc$''
-            ''^src/libstore/path-info\.cc$''
-            ''^src/libstore/path-info\.hh$''
-            ''^src/libstore/path-references\.cc$''
-            ''^src/libstore/path-regex\.hh$''
-            ''^src/libstore/path-with-outputs\.cc$''
-            ''^src/libstore/path\.cc$''
-            ''^src/libstore/path\.hh$''
-            ''^src/libstore/pathlocks\.cc$''
-            ''^src/libstore/pathlocks\.hh$''
-            ''^src/libstore/profiles\.cc$''
-            ''^src/libstore/profiles\.hh$''
-            ''^src/libstore/realisation\.cc$''
-            ''^src/libstore/realisation\.hh$''
-            ''^src/libstore/remote-fs-accessor\.cc$''
-            ''^src/libstore/remote-fs-accessor\.hh$''
-            ''^src/libstore/remote-store-connection\.hh$''
-            ''^src/libstore/remote-store\.cc$''
-            ''^src/libstore/remote-store\.hh$''
-            ''^src/libstore/s3-binary-cache-store\.cc$''
-            ''^src/libstore/s3\.hh$''
-            ''^src/libstore/serve-protocol-impl\.cc$''
-            ''^src/libstore/serve-protocol-impl\.hh$''
-            ''^src/libstore/serve-protocol\.cc$''
-            ''^src/libstore/serve-protocol\.hh$''
-            ''^src/libstore/sqlite\.cc$''
-            ''^src/libstore/sqlite\.hh$''
-            ''^src/libstore/ssh-store\.cc$''
-            ''^src/libstore/ssh\.cc$''
-            ''^src/libstore/ssh\.hh$''
-            ''^src/libstore/store-api\.cc$''
-            ''^src/libstore/store-api\.hh$''
-            ''^src/libstore/store-dir-config\.hh$''
-            ''^src/libstore/build/derivation-goal\.cc$''
-            ''^src/libstore/build/derivation-goal\.hh$''
-            ''^src/libstore/build/drv-output-substitution-goal\.cc$''
-            ''^src/libstore/build/drv-output-substitution-goal\.hh$''
-            ''^src/libstore/build/entry-points\.cc$''
-            ''^src/libstore/build/goal\.cc$''
-            ''^src/libstore/build/goal\.hh$''
-            ''^src/libstore/unix/build/hook-instance\.cc$''
-            ''^src/libstore/unix/build/local-derivation-goal\.cc$''
-            ''^src/libstore/unix/build/local-derivation-goal\.hh$''
-            ''^src/libstore/build/substitution-goal\.cc$''
-            ''^src/libstore/build/substitution-goal\.hh$''
-            ''^src/libstore/build/worker\.cc$''
-            ''^src/libstore/build/worker\.hh$''
-            ''^src/libstore/builtins/fetchurl\.cc$''
-            ''^src/libstore/builtins/unpack-channel\.cc$''
-            ''^src/libstore/gc\.cc$''
-            ''^src/libstore/local-overlay-store\.cc$''
-            ''^src/libstore/local-overlay-store\.hh$''
-            ''^src/libstore/local-store\.cc$''
-            ''^src/libstore/local-store\.hh$''
-            ''^src/libstore/unix/user-lock\.cc$''
-            ''^src/libstore/unix/user-lock\.hh$''
-            ''^src/libstore/optimise-store\.cc$''
-            ''^src/libstore/unix/pathlocks\.cc$''
-            ''^src/libstore/posix-fs-canonicalise\.cc$''
-            ''^src/libstore/posix-fs-canonicalise\.hh$''
-            ''^src/libstore/uds-remote-store\.cc$''
-            ''^src/libstore/uds-remote-store\.hh$''
-            ''^src/libstore/windows/build\.cc$''
-            ''^src/libstore/worker-protocol-impl\.hh$''
-            ''^src/libstore/worker-protocol\.cc$''
-            ''^src/libstore/worker-protocol\.hh$''
-            ''^src/libutil-c/nix_api_util_internal\.h$''
-            ''^src/libutil/archive\.cc$''
-            ''^src/libutil/archive\.hh$''
-            ''^src/libutil/args\.cc$''
-            ''^src/libutil/args\.hh$''
-            ''^src/libutil/args/root\.hh$''
-            ''^src/libutil/callback\.hh$''
-            ''^src/libutil/canon-path\.cc$''
-            ''^src/libutil/canon-path\.hh$''
-            ''^src/libutil/chunked-vector\.hh$''
-            ''^src/libutil/closure\.hh$''
-            ''^src/libutil/comparator\.hh$''
-            ''^src/libutil/compute-levels\.cc$''
-            ''^src/libutil/config-impl\.hh$''
-            ''^src/libutil/config\.cc$''
-            ''^src/libutil/config\.hh$''
-            ''^src/libutil/current-process\.cc$''
-            ''^src/libutil/current-process\.hh$''
-            ''^src/libutil/english\.cc$''
-            ''^src/libutil/english\.hh$''
-            ''^src/libutil/error\.cc$''
-            ''^src/libutil/error\.hh$''
-            ''^src/libutil/exit\.hh$''
-            ''^src/libutil/experimental-features\.cc$''
-            ''^src/libutil/experimental-features\.hh$''
-            ''^src/libutil/file-content-address\.cc$''
-            ''^src/libutil/file-content-address\.hh$''
-            ''^src/libutil/file-descriptor\.cc$''
-            ''^src/libutil/file-descriptor\.hh$''
-            ''^src/libutil/file-path-impl\.hh$''
-            ''^src/libutil/file-path\.hh$''
-            ''^src/libutil/file-system\.cc$''
-            ''^src/libutil/file-system\.hh$''
-            ''^src/libutil/finally\.hh$''
-            ''^src/libutil/fmt\.hh$''
-            ''^src/libutil/fs-sink\.cc$''
-            ''^src/libutil/fs-sink\.hh$''
-            ''^src/libutil/git\.cc$''
-            ''^src/libutil/git\.hh$''
-            ''^src/libutil/hash\.cc$''
-            ''^src/libutil/hash\.hh$''
-            ''^src/libutil/hilite\.cc$''
-            ''^src/libutil/hilite\.hh$''
-            ''^src/libutil/source-accessor\.hh$''
-            ''^src/libutil/json-impls\.hh$''
-            ''^src/libutil/json-utils\.cc$''
-            ''^src/libutil/json-utils\.hh$''
-            ''^src/libutil/linux/cgroup\.cc$''
-            ''^src/libutil/linux/namespaces\.cc$''
-            ''^src/libutil/logging\.cc$''
-            ''^src/libutil/logging\.hh$''
-            ''^src/libutil/lru-cache\.hh$''
-            ''^src/libutil/memory-source-accessor\.cc$''
-            ''^src/libutil/memory-source-accessor\.hh$''
-            ''^src/libutil/pool\.hh$''
-            ''^src/libutil/position\.cc$''
-            ''^src/libutil/position\.hh$''
-            ''^src/libutil/posix-source-accessor\.cc$''
-            ''^src/libutil/posix-source-accessor\.hh$''
-            ''^src/libutil/processes\.hh$''
-            ''^src/libutil/ref\.hh$''
-            ''^src/libutil/references\.cc$''
-            ''^src/libutil/references\.hh$''
-            ''^src/libutil/regex-combinators\.hh$''
-            ''^src/libutil/serialise\.cc$''
-            ''^src/libutil/serialise\.hh$''
-            ''^src/libutil/signals\.hh$''
-            ''^src/libutil/signature/local-keys\.cc$''
-            ''^src/libutil/signature/local-keys\.hh$''
-            ''^src/libutil/signature/signer\.cc$''
-            ''^src/libutil/signature/signer\.hh$''
-            ''^src/libutil/source-accessor\.cc$''
-            ''^src/libutil/source-accessor\.hh$''
-            ''^src/libutil/source-path\.cc$''
-            ''^src/libutil/source-path\.hh$''
-            ''^src/libutil/split\.hh$''
-            ''^src/libutil/suggestions\.cc$''
-            ''^src/libutil/suggestions\.hh$''
-            ''^src/libutil/sync\.hh$''
-            ''^src/libutil/terminal\.cc$''
-            ''^src/libutil/terminal\.hh$''
-            ''^src/libutil/thread-pool\.cc$''
-            ''^src/libutil/thread-pool\.hh$''
-            ''^src/libutil/topo-sort\.hh$''
-            ''^src/libutil/types\.hh$''
-            ''^src/libutil/unix/file-descriptor\.cc$''
-            ''^src/libutil/unix/file-path\.cc$''
-            ''^src/libutil/unix/monitor-fd\.hh$''
-            ''^src/libutil/unix/processes\.cc$''
-            ''^src/libutil/unix/signals-impl\.hh$''
-            ''^src/libutil/unix/signals\.cc$''
-            ''^src/libutil/unix-domain-socket\.cc$''
-            ''^src/libutil/unix/users\.cc$''
-            ''^src/libutil/url-parts\.hh$''
-            ''^src/libutil/url\.cc$''
-            ''^src/libutil/url\.hh$''
-            ''^src/libutil/users\.cc$''
-            ''^src/libutil/users\.hh$''
-            ''^src/libutil/util\.cc$''
-            ''^src/libutil/util\.hh$''
-            ''^src/libutil/variant-wrapper\.hh$''
-            ''^src/libutil/windows/file-descriptor\.cc$''
-            ''^src/libutil/windows/file-path\.cc$''
-            ''^src/libutil/windows/processes\.cc$''
-            ''^src/libutil/windows/users\.cc$''
-            ''^src/libutil/windows/windows-error\.cc$''
-            ''^src/libutil/windows/windows-error\.hh$''
-            ''^src/libutil/xml-writer\.cc$''
-            ''^src/libutil/xml-writer\.hh$''
-            ''^src/nix-build/nix-build\.cc$''
-            ''^src/nix-channel/nix-channel\.cc$''
-            ''^src/nix-collect-garbage/nix-collect-garbage\.cc$''
-            ''^src/nix-env/buildenv.nix$''
-            ''^src/nix-env/nix-env\.cc$''
-            ''^src/nix-env/user-env\.cc$''
-            ''^src/nix-env/user-env\.hh$''
-            ''^src/nix-instantiate/nix-instantiate\.cc$''
-            ''^src/nix-store/dotgraph\.cc$''
-            ''^src/nix-store/graphml\.cc$''
-            ''^src/nix-store/nix-store\.cc$''
-            ''^src/nix/add-to-store\.cc$''
-            ''^src/nix/app\.cc$''
-            ''^src/nix/build\.cc$''
-            ''^src/nix/bundle\.cc$''
-            ''^src/nix/cat\.cc$''
-            ''^src/nix/config-check\.cc$''
-            ''^src/nix/config\.cc$''
-            ''^src/nix/copy\.cc$''
-            ''^src/nix/derivation-add\.cc$''
-            ''^src/nix/derivation-show\.cc$''
-            ''^src/nix/derivation\.cc$''
-            ''^src/nix/develop\.cc$''
-            ''^src/nix/diff-closures\.cc$''
-            ''^src/nix/dump-path\.cc$''
-            ''^src/nix/edit\.cc$''
-            ''^src/nix/eval\.cc$''
-            ''^src/nix/flake\.cc$''
-            ''^src/nix/fmt\.cc$''
-            ''^src/nix/hash\.cc$''
-            ''^src/nix/log\.cc$''
-            ''^src/nix/ls\.cc$''
-            ''^src/nix/main\.cc$''
-            ''^src/nix/make-content-addressed\.cc$''
-            ''^src/nix/nar\.cc$''
-            ''^src/nix/optimise-store\.cc$''
-            ''^src/nix/path-from-hash-part\.cc$''
-            ''^src/nix/path-info\.cc$''
-            ''^src/nix/prefetch\.cc$''
-            ''^src/nix/profile\.cc$''
-            ''^src/nix/realisation\.cc$''
-            ''^src/nix/registry\.cc$''
-            ''^src/nix/repl\.cc$''
-            ''^src/nix/run\.cc$''
-            ''^src/nix/run\.hh$''
-            ''^src/nix/search\.cc$''
-            ''^src/nix/sigs\.cc$''
-            ''^src/nix/store-copy-log\.cc$''
-            ''^src/nix/store-delete\.cc$''
-            ''^src/nix/store-gc\.cc$''
-            ''^src/nix/store-info\.cc$''
-            ''^src/nix/store-repair\.cc$''
-            ''^src/nix/store\.cc$''
-            ''^src/nix/unix/daemon\.cc$''
-            ''^src/nix/upgrade-nix\.cc$''
-            ''^src/nix/verify\.cc$''
-            ''^src/nix/why-depends\.cc$''
+            ''^subprojects/build-remote/build-remote\.cc$''
+            ''^subprojects/libcmd/built-path\.cc$''
+            ''^subprojects/libcmd/built-path\.hh$''
+            ''^subprojects/libcmd/command\.cc$''
+            ''^subprojects/libcmd/command\.hh$''
+            ''^subprojects/libcmd/common-eval-args\.cc$''
+            ''^subprojects/libcmd/common-eval-args\.hh$''
+            ''^subprojects/libcmd/editor-for\.cc$''
+            ''^subprojects/libcmd/installable-attr-path\.cc$''
+            ''^subprojects/libcmd/installable-attr-path\.hh$''
+            ''^subprojects/libcmd/installable-derived-path\.cc$''
+            ''^subprojects/libcmd/installable-derived-path\.hh$''
+            ''^subprojects/libcmd/installable-flake\.cc$''
+            ''^subprojects/libcmd/installable-flake\.hh$''
+            ''^subprojects/libcmd/installable-value\.cc$''
+            ''^subprojects/libcmd/installable-value\.hh$''
+            ''^subprojects/libcmd/installables\.cc$''
+            ''^subprojects/libcmd/installables\.hh$''
+            ''^subprojects/libcmd/legacy\.hh$''
+            ''^subprojects/libcmd/markdown\.cc$''
+            ''^subprojects/libcmd/misc-store-flags\.cc$''
+            ''^subprojects/libcmd/repl-interacter\.cc$''
+            ''^subprojects/libcmd/repl-interacter\.hh$''
+            ''^subprojects/libcmd/repl\.cc$''
+            ''^subprojects/libcmd/repl\.hh$''
+            ''^subprojects/libexpr-c/nix_api_expr\.cc$''
+            ''^subprojects/libexpr-c/nix_api_external\.cc$''
+            ''^subprojects/libexpr/attr-path\.cc$''
+            ''^subprojects/libexpr/attr-path\.hh$''
+            ''^subprojects/libexpr/attr-set\.cc$''
+            ''^subprojects/libexpr/attr-set\.hh$''
+            ''^subprojects/libexpr/eval-cache\.cc$''
+            ''^subprojects/libexpr/eval-cache\.hh$''
+            ''^subprojects/libexpr/eval-error\.cc$''
+            ''^subprojects/libexpr/eval-inline\.hh$''
+            ''^subprojects/libexpr/eval-settings\.cc$''
+            ''^subprojects/libexpr/eval-settings\.hh$''
+            ''^subprojects/libexpr/eval\.cc$''
+            ''^subprojects/libexpr/eval\.hh$''
+            ''^subprojects/libexpr/function-trace\.cc$''
+            ''^subprojects/libexpr/gc-small-vector\.hh$''
+            ''^subprojects/libexpr/get-drvs\.cc$''
+            ''^subprojects/libexpr/get-drvs\.hh$''
+            ''^subprojects/libexpr/json-to-value\.cc$''
+            ''^subprojects/libexpr/nixexpr\.cc$''
+            ''^subprojects/libexpr/nixexpr\.hh$''
+            ''^subprojects/libexpr/parser-state\.hh$''
+            ''^subprojects/libexpr/pos-table\.hh$''
+            ''^subprojects/libexpr/primops\.cc$''
+            ''^subprojects/libexpr/primops\.hh$''
+            ''^subprojects/libexpr/primops/context\.cc$''
+            ''^subprojects/libexpr/primops/fetchClosure\.cc$''
+            ''^subprojects/libexpr/primops/fetchMercurial\.cc$''
+            ''^subprojects/libexpr/primops/fetchTree\.cc$''
+            ''^subprojects/libexpr/primops/fromTOML\.cc$''
+            ''^subprojects/libexpr/print-ambiguous\.cc$''
+            ''^subprojects/libexpr/print-ambiguous\.hh$''
+            ''^subprojects/libexpr/print-options\.hh$''
+            ''^subprojects/libexpr/print\.cc$''
+            ''^subprojects/libexpr/print\.hh$''
+            ''^subprojects/libexpr/search-path\.cc$''
+            ''^subprojects/libexpr/symbol-table\.hh$''
+            ''^subprojects/libexpr/value-to-json\.cc$''
+            ''^subprojects/libexpr/value-to-json\.hh$''
+            ''^subprojects/libexpr/value-to-xml\.cc$''
+            ''^subprojects/libexpr/value-to-xml\.hh$''
+            ''^subprojects/libexpr/value\.hh$''
+            ''^subprojects/libexpr/value/context\.cc$''
+            ''^subprojects/libexpr/value/context\.hh$''
+            ''^subprojects/libfetchers/attrs\.cc$''
+            ''^subprojects/libfetchers/cache\.cc$''
+            ''^subprojects/libfetchers/cache\.hh$''
+            ''^subprojects/libfetchers/fetch-settings\.cc$''
+            ''^subprojects/libfetchers/fetch-settings\.hh$''
+            ''^subprojects/libfetchers/fetch-to-store\.cc$''
+            ''^subprojects/libfetchers/fetchers\.cc$''
+            ''^subprojects/libfetchers/fetchers\.hh$''
+            ''^subprojects/libfetchers/filtering-source-accessor\.cc$''
+            ''^subprojects/libfetchers/filtering-source-accessor\.hh$''
+            ''^subprojects/libfetchers/fs-source-accessor\.cc$''
+            ''^subprojects/libfetchers/fs-source-accessor\.hh$''
+            ''^subprojects/libfetchers/git-utils\.cc$''
+            ''^subprojects/libfetchers/git-utils\.hh$''
+            ''^subprojects/libfetchers/github\.cc$''
+            ''^subprojects/libfetchers/indirect\.cc$''
+            ''^subprojects/libfetchers/memory-source-accessor\.cc$''
+            ''^subprojects/libfetchers/path\.cc$''
+            ''^subprojects/libfetchers/registry\.cc$''
+            ''^subprojects/libfetchers/registry\.hh$''
+            ''^subprojects/libfetchers/tarball\.cc$''
+            ''^subprojects/libfetchers/tarball\.hh$''
+            ''^subprojects/libfetchers/git\.cc$''
+            ''^subprojects/libfetchers/mercurial\.cc$''
+            ''^subprojects/libflake/flake/config\.cc$''
+            ''^subprojects/libflake/flake/flake\.cc$''
+            ''^subprojects/libflake/flake/flake\.hh$''
+            ''^subprojects/libflake/flake/flakeref\.cc$''
+            ''^subprojects/libflake/flake/flakeref\.hh$''
+            ''^subprojects/libflake/flake/lockfile\.cc$''
+            ''^subprojects/libflake/flake/lockfile\.hh$''
+            ''^subprojects/libflake/flake/url-name\.cc$''
+            ''^subprojects/libmain/common-args\.cc$''
+            ''^subprojects/libmain/common-args\.hh$''
+            ''^subprojects/libmain/loggers\.cc$''
+            ''^subprojects/libmain/loggers\.hh$''
+            ''^subprojects/libmain/progress-bar\.cc$''
+            ''^subprojects/libmain/shared\.cc$''
+            ''^subprojects/libmain/shared\.hh$''
+            ''^subprojects/libmain/unix/stack\.cc$''
+            ''^subprojects/libstore/binary-cache-store\.cc$''
+            ''^subprojects/libstore/binary-cache-store\.hh$''
+            ''^subprojects/libstore/build-result\.hh$''
+            ''^subprojects/libstore/builtins\.hh$''
+            ''^subprojects/libstore/builtins/buildenv\.cc$''
+            ''^subprojects/libstore/builtins/buildenv\.hh$''
+            ''^subprojects/libstore/common-protocol-impl\.hh$''
+            ''^subprojects/libstore/common-protocol\.cc$''
+            ''^subprojects/libstore/common-protocol\.hh$''
+            ''^subprojects/libstore/common-ssh-store-config\.hh$''
+            ''^subprojects/libstore/content-address\.cc$''
+            ''^subprojects/libstore/content-address\.hh$''
+            ''^subprojects/libstore/daemon\.cc$''
+            ''^subprojects/libstore/daemon\.hh$''
+            ''^subprojects/libstore/derivations\.cc$''
+            ''^subprojects/libstore/derivations\.hh$''
+            ''^subprojects/libstore/derived-path-map\.cc$''
+            ''^subprojects/libstore/derived-path-map\.hh$''
+            ''^subprojects/libstore/derived-path\.cc$''
+            ''^subprojects/libstore/derived-path\.hh$''
+            ''^subprojects/libstore/downstream-placeholder\.cc$''
+            ''^subprojects/libstore/downstream-placeholder\.hh$''
+            ''^subprojects/libstore/dummy-store\.cc$''
+            ''^subprojects/libstore/export-import\.cc$''
+            ''^subprojects/libstore/filetransfer\.cc$''
+            ''^subprojects/libstore/filetransfer\.hh$''
+            ''^subprojects/libstore/gc-store\.hh$''
+            ''^subprojects/libstore/globals\.cc$''
+            ''^subprojects/libstore/globals\.hh$''
+            ''^subprojects/libstore/http-binary-cache-store\.cc$''
+            ''^subprojects/libstore/legacy-ssh-store\.cc$''
+            ''^subprojects/libstore/legacy-ssh-store\.hh$''
+            ''^subprojects/libstore/length-prefixed-protocol-helper\.hh$''
+            ''^subprojects/libstore/linux/personality\.cc$''
+            ''^subprojects/libstore/linux/personality\.hh$''
+            ''^subprojects/libstore/local-binary-cache-store\.cc$''
+            ''^subprojects/libstore/local-fs-store\.cc$''
+            ''^subprojects/libstore/local-fs-store\.hh$''
+            ''^subprojects/libstore/log-store\.cc$''
+            ''^subprojects/libstore/log-store\.hh$''
+            ''^subprojects/libstore/machines\.cc$''
+            ''^subprojects/libstore/machines\.hh$''
+            ''^subprojects/libstore/make-content-addressed\.cc$''
+            ''^subprojects/libstore/make-content-addressed\.hh$''
+            ''^subprojects/libstore/misc\.cc$''
+            ''^subprojects/libstore/names\.cc$''
+            ''^subprojects/libstore/names\.hh$''
+            ''^subprojects/libstore/nar-accessor\.cc$''
+            ''^subprojects/libstore/nar-accessor\.hh$''
+            ''^subprojects/libstore/nar-info-disk-cache\.cc$''
+            ''^subprojects/libstore/nar-info-disk-cache\.hh$''
+            ''^subprojects/libstore/nar-info\.cc$''
+            ''^subprojects/libstore/nar-info\.hh$''
+            ''^subprojects/libstore/outputs-spec\.cc$''
+            ''^subprojects/libstore/outputs-spec\.hh$''
+            ''^subprojects/libstore/parsed-derivations\.cc$''
+            ''^subprojects/libstore/path-info\.cc$''
+            ''^subprojects/libstore/path-info\.hh$''
+            ''^subprojects/libstore/path-references\.cc$''
+            ''^subprojects/libstore/path-regex\.hh$''
+            ''^subprojects/libstore/path-with-outputs\.cc$''
+            ''^subprojects/libstore/path\.cc$''
+            ''^subprojects/libstore/path\.hh$''
+            ''^subprojects/libstore/pathlocks\.cc$''
+            ''^subprojects/libstore/pathlocks\.hh$''
+            ''^subprojects/libstore/profiles\.cc$''
+            ''^subprojects/libstore/profiles\.hh$''
+            ''^subprojects/libstore/realisation\.cc$''
+            ''^subprojects/libstore/realisation\.hh$''
+            ''^subprojects/libstore/remote-fs-accessor\.cc$''
+            ''^subprojects/libstore/remote-fs-accessor\.hh$''
+            ''^subprojects/libstore/remote-store-connection\.hh$''
+            ''^subprojects/libstore/remote-store\.cc$''
+            ''^subprojects/libstore/remote-store\.hh$''
+            ''^subprojects/libstore/s3-binary-cache-store\.cc$''
+            ''^subprojects/libstore/s3\.hh$''
+            ''^subprojects/libstore/serve-protocol-impl\.cc$''
+            ''^subprojects/libstore/serve-protocol-impl\.hh$''
+            ''^subprojects/libstore/serve-protocol\.cc$''
+            ''^subprojects/libstore/serve-protocol\.hh$''
+            ''^subprojects/libstore/sqlite\.cc$''
+            ''^subprojects/libstore/sqlite\.hh$''
+            ''^subprojects/libstore/ssh-store\.cc$''
+            ''^subprojects/libstore/ssh\.cc$''
+            ''^subprojects/libstore/ssh\.hh$''
+            ''^subprojects/libstore/store-api\.cc$''
+            ''^subprojects/libstore/store-api\.hh$''
+            ''^subprojects/libstore/store-dir-config\.hh$''
+            ''^subprojects/libstore/build/derivation-goal\.cc$''
+            ''^subprojects/libstore/build/derivation-goal\.hh$''
+            ''^subprojects/libstore/build/drv-output-substitution-goal\.cc$''
+            ''^subprojects/libstore/build/drv-output-substitution-goal\.hh$''
+            ''^subprojects/libstore/build/entry-points\.cc$''
+            ''^subprojects/libstore/build/goal\.cc$''
+            ''^subprojects/libstore/build/goal\.hh$''
+            ''^subprojects/libstore/unix/build/hook-instance\.cc$''
+            ''^subprojects/libstore/unix/build/local-derivation-goal\.cc$''
+            ''^subprojects/libstore/unix/build/local-derivation-goal\.hh$''
+            ''^subprojects/libstore/build/substitution-goal\.cc$''
+            ''^subprojects/libstore/build/substitution-goal\.hh$''
+            ''^subprojects/libstore/build/worker\.cc$''
+            ''^subprojects/libstore/build/worker\.hh$''
+            ''^subprojects/libstore/builtins/fetchurl\.cc$''
+            ''^subprojects/libstore/builtins/unpack-channel\.cc$''
+            ''^subprojects/libstore/gc\.cc$''
+            ''^subprojects/libstore/local-overlay-store\.cc$''
+            ''^subprojects/libstore/local-overlay-store\.hh$''
+            ''^subprojects/libstore/local-store\.cc$''
+            ''^subprojects/libstore/local-store\.hh$''
+            ''^subprojects/libstore/unix/user-lock\.cc$''
+            ''^subprojects/libstore/unix/user-lock\.hh$''
+            ''^subprojects/libstore/optimise-store\.cc$''
+            ''^subprojects/libstore/unix/pathlocks\.cc$''
+            ''^subprojects/libstore/posix-fs-canonicalise\.cc$''
+            ''^subprojects/libstore/posix-fs-canonicalise\.hh$''
+            ''^subprojects/libstore/uds-remote-store\.cc$''
+            ''^subprojects/libstore/uds-remote-store\.hh$''
+            ''^subprojects/libstore/windows/build\.cc$''
+            ''^subprojects/libstore/worker-protocol-impl\.hh$''
+            ''^subprojects/libstore/worker-protocol\.cc$''
+            ''^subprojects/libstore/worker-protocol\.hh$''
+            ''^subprojects/libutil-c/nix_api_util_internal\.h$''
+            ''^subprojects/libutil/archive\.cc$''
+            ''^subprojects/libutil/archive\.hh$''
+            ''^subprojects/libutil/args\.cc$''
+            ''^subprojects/libutil/args\.hh$''
+            ''^subprojects/libutil/args/root\.hh$''
+            ''^subprojects/libutil/callback\.hh$''
+            ''^subprojects/libutil/canon-path\.cc$''
+            ''^subprojects/libutil/canon-path\.hh$''
+            ''^subprojects/libutil/chunked-vector\.hh$''
+            ''^subprojects/libutil/closure\.hh$''
+            ''^subprojects/libutil/comparator\.hh$''
+            ''^subprojects/libutil/compute-levels\.cc$''
+            ''^subprojects/libutil/config-impl\.hh$''
+            ''^subprojects/libutil/config\.cc$''
+            ''^subprojects/libutil/config\.hh$''
+            ''^subprojects/libutil/current-process\.cc$''
+            ''^subprojects/libutil/current-process\.hh$''
+            ''^subprojects/libutil/english\.cc$''
+            ''^subprojects/libutil/english\.hh$''
+            ''^subprojects/libutil/error\.cc$''
+            ''^subprojects/libutil/error\.hh$''
+            ''^subprojects/libutil/exit\.hh$''
+            ''^subprojects/libutil/experimental-features\.cc$''
+            ''^subprojects/libutil/experimental-features\.hh$''
+            ''^subprojects/libutil/file-content-address\.cc$''
+            ''^subprojects/libutil/file-content-address\.hh$''
+            ''^subprojects/libutil/file-descriptor\.cc$''
+            ''^subprojects/libutil/file-descriptor\.hh$''
+            ''^subprojects/libutil/file-path-impl\.hh$''
+            ''^subprojects/libutil/file-path\.hh$''
+            ''^subprojects/libutil/file-system\.cc$''
+            ''^subprojects/libutil/file-system\.hh$''
+            ''^subprojects/libutil/finally\.hh$''
+            ''^subprojects/libutil/fmt\.hh$''
+            ''^subprojects/libutil/fs-sink\.cc$''
+            ''^subprojects/libutil/fs-sink\.hh$''
+            ''^subprojects/libutil/git\.cc$''
+            ''^subprojects/libutil/git\.hh$''
+            ''^subprojects/libutil/hash\.cc$''
+            ''^subprojects/libutil/hash\.hh$''
+            ''^subprojects/libutil/hilite\.cc$''
+            ''^subprojects/libutil/hilite\.hh$''
+            ''^subprojects/libutil/source-accessor\.hh$''
+            ''^subprojects/libutil/json-impls\.hh$''
+            ''^subprojects/libutil/json-utils\.cc$''
+            ''^subprojects/libutil/json-utils\.hh$''
+            ''^subprojects/libutil/linux/cgroup\.cc$''
+            ''^subprojects/libutil/linux/namespaces\.cc$''
+            ''^subprojects/libutil/logging\.cc$''
+            ''^subprojects/libutil/logging\.hh$''
+            ''^subprojects/libutil/lru-cache\.hh$''
+            ''^subprojects/libutil/memory-source-accessor\.cc$''
+            ''^subprojects/libutil/memory-source-accessor\.hh$''
+            ''^subprojects/libutil/pool\.hh$''
+            ''^subprojects/libutil/position\.cc$''
+            ''^subprojects/libutil/position\.hh$''
+            ''^subprojects/libutil/posix-source-accessor\.cc$''
+            ''^subprojects/libutil/posix-source-accessor\.hh$''
+            ''^subprojects/libutil/processes\.hh$''
+            ''^subprojects/libutil/ref\.hh$''
+            ''^subprojects/libutil/references\.cc$''
+            ''^subprojects/libutil/references\.hh$''
+            ''^subprojects/libutil/regex-combinators\.hh$''
+            ''^subprojects/libutil/serialise\.cc$''
+            ''^subprojects/libutil/serialise\.hh$''
+            ''^subprojects/libutil/signals\.hh$''
+            ''^subprojects/libutil/signature/local-keys\.cc$''
+            ''^subprojects/libutil/signature/local-keys\.hh$''
+            ''^subprojects/libutil/signature/signer\.cc$''
+            ''^subprojects/libutil/signature/signer\.hh$''
+            ''^subprojects/libutil/source-accessor\.cc$''
+            ''^subprojects/libutil/source-accessor\.hh$''
+            ''^subprojects/libutil/source-path\.cc$''
+            ''^subprojects/libutil/source-path\.hh$''
+            ''^subprojects/libutil/split\.hh$''
+            ''^subprojects/libutil/suggestions\.cc$''
+            ''^subprojects/libutil/suggestions\.hh$''
+            ''^subprojects/libutil/sync\.hh$''
+            ''^subprojects/libutil/terminal\.cc$''
+            ''^subprojects/libutil/terminal\.hh$''
+            ''^subprojects/libutil/thread-pool\.cc$''
+            ''^subprojects/libutil/thread-pool\.hh$''
+            ''^subprojects/libutil/topo-sort\.hh$''
+            ''^subprojects/libutil/types\.hh$''
+            ''^subprojects/libutil/unix/file-descriptor\.cc$''
+            ''^subprojects/libutil/unix/file-path\.cc$''
+            ''^subprojects/libutil/unix/monitor-fd\.hh$''
+            ''^subprojects/libutil/unix/processes\.cc$''
+            ''^subprojects/libutil/unix/signals-impl\.hh$''
+            ''^subprojects/libutil/unix/signals\.cc$''
+            ''^subprojects/libutil/unix-domain-socket\.cc$''
+            ''^subprojects/libutil/unix/users\.cc$''
+            ''^subprojects/libutil/url-parts\.hh$''
+            ''^subprojects/libutil/url\.cc$''
+            ''^subprojects/libutil/url\.hh$''
+            ''^subprojects/libutil/users\.cc$''
+            ''^subprojects/libutil/users\.hh$''
+            ''^subprojects/libutil/util\.cc$''
+            ''^subprojects/libutil/util\.hh$''
+            ''^subprojects/libutil/variant-wrapper\.hh$''
+            ''^subprojects/libutil/windows/file-descriptor\.cc$''
+            ''^subprojects/libutil/windows/file-path\.cc$''
+            ''^subprojects/libutil/windows/processes\.cc$''
+            ''^subprojects/libutil/windows/users\.cc$''
+            ''^subprojects/libutil/windows/windows-error\.cc$''
+            ''^subprojects/libutil/windows/windows-error\.hh$''
+            ''^subprojects/libutil/xml-writer\.cc$''
+            ''^subprojects/libutil/xml-writer\.hh$''
+            ''^subprojects/nix-build/nix-build\.cc$''
+            ''^subprojects/nix-channel/nix-channel\.cc$''
+            ''^subprojects/nix-collect-garbage/nix-collect-garbage\.cc$''
+            ''^subprojects/nix-env/buildenv.nix$''
+            ''^subprojects/nix-env/nix-env\.cc$''
+            ''^subprojects/nix-env/user-env\.cc$''
+            ''^subprojects/nix-env/user-env\.hh$''
+            ''^subprojects/nix-instantiate/nix-instantiate\.cc$''
+            ''^subprojects/nix-store/dotgraph\.cc$''
+            ''^subprojects/nix-store/graphml\.cc$''
+            ''^subprojects/nix-store/nix-store\.cc$''
+            ''^subprojects/nix/add-to-store\.cc$''
+            ''^subprojects/nix/app\.cc$''
+            ''^subprojects/nix/build\.cc$''
+            ''^subprojects/nix/bundle\.cc$''
+            ''^subprojects/nix/cat\.cc$''
+            ''^subprojects/nix/config-check\.cc$''
+            ''^subprojects/nix/config\.cc$''
+            ''^subprojects/nix/copy\.cc$''
+            ''^subprojects/nix/derivation-add\.cc$''
+            ''^subprojects/nix/derivation-show\.cc$''
+            ''^subprojects/nix/derivation\.cc$''
+            ''^subprojects/nix/develop\.cc$''
+            ''^subprojects/nix/diff-closures\.cc$''
+            ''^subprojects/nix/dump-path\.cc$''
+            ''^subprojects/nix/edit\.cc$''
+            ''^subprojects/nix/eval\.cc$''
+            ''^subprojects/nix/flake\.cc$''
+            ''^subprojects/nix/fmt\.cc$''
+            ''^subprojects/nix/hash\.cc$''
+            ''^subprojects/nix/log\.cc$''
+            ''^subprojects/nix/ls\.cc$''
+            ''^subprojects/nix/main\.cc$''
+            ''^subprojects/nix/make-content-addressed\.cc$''
+            ''^subprojects/nix/nar\.cc$''
+            ''^subprojects/nix/optimise-store\.cc$''
+            ''^subprojects/nix/path-from-hash-part\.cc$''
+            ''^subprojects/nix/path-info\.cc$''
+            ''^subprojects/nix/prefetch\.cc$''
+            ''^subprojects/nix/profile\.cc$''
+            ''^subprojects/nix/realisation\.cc$''
+            ''^subprojects/nix/registry\.cc$''
+            ''^subprojects/nix/repl\.cc$''
+            ''^subprojects/nix/run\.cc$''
+            ''^subprojects/nix/run\.hh$''
+            ''^subprojects/nix/search\.cc$''
+            ''^subprojects/nix/sigs\.cc$''
+            ''^subprojects/nix/store-copy-log\.cc$''
+            ''^subprojects/nix/store-delete\.cc$''
+            ''^subprojects/nix/store-gc\.cc$''
+            ''^subprojects/nix/store-info\.cc$''
+            ''^subprojects/nix/store-repair\.cc$''
+            ''^subprojects/nix/store\.cc$''
+            ''^subprojects/nix/unix/daemon\.cc$''
+            ''^subprojects/nix/upgrade-nix\.cc$''
+            ''^subprojects/nix/verify\.cc$''
+            ''^subprojects/nix/why-depends\.cc$''
 
             ''^tests/functional/plugins/plugintest\.cc''
             ''^tests/functional/test-libstoreconsumer/main\.cc''
@@ -500,7 +500,7 @@
             ''^scripts/install-multi-user\.sh$''
             ''^scripts/install-nix-from-closure\.sh$''
             ''^scripts/install-systemd-multi-user\.sh$''
-            ''^src/nix/get-env\.sh$''
+            ''^subprojects/nix/get-env\.sh$''
             ''^tests/functional/build\.sh$''
             ''^tests/functional/ca/build-dry\.sh$''
             ''^tests/functional/ca/build-with-garbage-path\.sh$''

mk/common-test.sh

@@ -4,7 +4,7 @@
 # remove file extension.
 
 test_name=$(echo -n "${test?must be defined by caller (test runner)}" | sed \
-    -e "s|^src/[^/]*-test/data/||" \
+    -e "s|^subprojects/[^/]*-test/data/||" \
     -e "s|^tests/functional/||" \
     -e "s|\.sh$||" \
     )

package.nix

@@ -171,7 +171,7 @@ in {
           ./doc
           ./misc
           ./precompiled-headers.h
-          (fileset.difference ./src ./src/perl)
+          (fileset.difference ./subprojects ./subprojects/perl)
           ./COPYING
           ./scripts/local.mk
         ] ++ lib.optionals enableManual [
@@ -316,7 +316,7 @@ in {
   # Work around weird bug where it doesn't think there is a Makefile.
   installCheckPhase = if (!doBuild && doInstallCheck) then ''
     runHook preInstallCheck
-    mkdir -p src/nix-channel
+    mkdir -p subprojects/nix-channel
     make installcheck -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
   '' else null;
 
@@ -324,7 +324,7 @@ in {
   # built Nix.
   preInstallCheck =
     lib.optionalString (! doBuild) ''
-      mkdir -p src/nix-channel
+      mkdir -p subprojects/nix-channel
     '';
 
   separateDebugInfo = !stdenv.hostPlatform.isStatic;

packaging/components.nix

@@ -30,41 +30,41 @@ in
     versionSuffix = fineVersionSuffix;
   };
 
-  nix-util = callPackage ../src/libutil/package.nix { };
-  nix-util-c = callPackage ../src/libutil-c/package.nix { };
+  nix-util = callPackage ../subprojects/libutil/package.nix { };
+  nix-util-c = callPackage ../subprojects/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-store = callPackage ../src/libstore/package.nix { };
-  nix-store-c = callPackage ../src/libstore-c/package.nix { };
+  nix-store = callPackage ../subprojects/libstore/package.nix { };
+  nix-store-c = callPackage ../subprojects/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-fetchers = callPackage ../src/libfetchers/package.nix { };
+  nix-fetchers = callPackage ../subprojects/libfetchers/package.nix { };
   nix-fetchers-tests = callPackage ../tests/unit/libfetchers/package.nix { };
 
-  nix-expr = callPackage ../src/libexpr/package.nix { };
-  nix-expr-c = callPackage ../src/libexpr-c/package.nix { };
+  nix-expr = callPackage ../subprojects/libexpr/package.nix { };
+  nix-expr-c = callPackage ../subprojects/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-flake = callPackage ../src/libflake/package.nix { };
+  nix-flake = callPackage ../subprojects/libflake/package.nix { };
   nix-flake-tests = callPackage ../tests/unit/libflake/package.nix { };
 
-  nix-main = callPackage ../src/libmain/package.nix { };
-  nix-main-c = callPackage ../src/libmain-c/package.nix { };
+  nix-main = callPackage ../subprojects/libmain/package.nix { };
+  nix-main-c = callPackage ../subprojects/libmain-c/package.nix { };
 
-  nix-cmd = callPackage ../src/libcmd/package.nix { };
+  nix-cmd = callPackage ../subprojects/libcmd/package.nix { };
 
-  nix-cli = callPackage ../src/nix/package.nix { version = fineVersion; };
+  nix-cli = callPackage ../subprojects/nix/package.nix { version = fineVersion; };
 
-  nix-functional-tests = callPackage ../src/nix-functional-tests/package.nix { version = fineVersion; };
+  nix-functional-tests = callPackage ../subprojects/nix-functional-tests/package.nix { version = fineVersion; };
 
   nix-manual = callPackage ../doc/manual/package.nix { version = fineVersion; };
-  nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { version = fineVersion; };
-  nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { version = fineVersion; };
+  nix-internal-api-docs = callPackage ../subprojects/internal-api-docs/package.nix { version = fineVersion; };
+  nix-external-api-docs = callPackage ../subprojects/external-api-docs/package.nix { version = fineVersion; };
 
-  nix-perl-bindings = callPackage ../src/perl/package.nix { };
+  nix-perl-bindings = callPackage ../subprojects/perl/package.nix { };
 
   # Will replace `nix` once the old build system is gone.
   nix-ng = callPackage ../packaging/everything.nix { };

subprojects

@@ -1 +0,0 @@
-src

subprojects/build-remote/build-remote.cc

@@ -311,7 +311,7 @@ connected:
         });
 
         // See the very large comment in `case WorkerProto::Op::BuildDerivation:` in
-        // `src/libstore/daemon.cc` that explains the trust model here.
+        // `subprojects/libstore/daemon.cc` that explains the trust model here.
         //
         // This condition mirrors that: that code enforces the "rules" outlined there;
         // we do the best we can given those "rules".

subprojects/external-api-docs/doxygen.cfg.in

@@ -38,9 +38,9 @@ GENERATE_LATEX         = NO
 # so they can expand variables despite configure variables.
 
 INPUT                  = \
-  @src@/src/libutil-c \
-  @src@/src/libexpr-c \
-  @src@/src/libstore-c \
+  @src@/subprojects/libutil-c \
+  @src@/subprojects/libexpr-c \
+  @src@/subprojects/libstore-c \
   @src@/doc/external-api/README.md
 
 FILE_PATTERNS = nix_api_*.h *.md

subprojects/internal-api-docs/doxygen.cfg.in

@@ -29,7 +29,7 @@ GENERATE_LATEX         = NO
 
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
+# directories like /usr/subprojects/myproject. Separate the files or directories with
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.