diff --git a/doc/manual/source/development/testing.md b/doc/manual/source/development/testing.md index ebc0e27d2..c0b130155 100644 --- a/doc/manual/source/development/testing.md +++ b/doc/manual/source/development/testing.md @@ -30,8 +30,8 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks. > src > ├── libexpr > │ ├── meson.build -> │ ├── value/context.hh -> │ ├── include/nix/value/context.cc +> │ ├── include/nix/expr/value/context.hh +> │ ├── value/context.cc > │ … > │ > ├── tests @@ -46,7 +46,7 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks. > │ │ > │ ├── libexpr-test-support > │ │ ├── meson.build -> │ │ ├── include/nix +> │ │ ├── include/nix/expr > │ │ │ ├── meson.build > │ │ │ └── tests > │ │ │ ├── value/context.hh @@ -63,7 +63,7 @@ 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/include/nix/value/context.hh` and `src/libexpr/value/context.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/include/nix/tests/value/context.hh` and `src/libexpr-test-support/tests/value/context.cc`. +Given an interface (header) and implementation pair in the original library, say, `src/libexpr/include/nix/expr/value/context.hh` and `src/libexpr/value/context.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/include/nix/expr/tests/value/context.hh` and `src/libexpr-test-support/tests/value/context.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/libstore-tests/data`. diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix index 87dc1e18a..a8c52eb46 100644 --- a/maintainers/flake-module.nix +++ b/maintainers/flake-module.nix @@ -84,92 +84,92 @@ ''^precompiled-headers\.h$'' ''^src/build-remote/build-remote\.cc$'' ''^src/libcmd/built-path\.cc$'' - ''^src/libcmd/include/nix/built-path\.hh$'' + ''^src/libcmd/include/nix/cmd/built-path\.hh$'' ''^src/libcmd/common-eval-args\.cc$'' - ''^src/libcmd/include/nix/common-eval-args\.hh$'' + ''^src/libcmd/include/nix/cmd/common-eval-args\.hh$'' ''^src/libcmd/editor-for\.cc$'' ''^src/libcmd/installable-attr-path\.cc$'' - ''^src/libcmd/include/nix/installable-attr-path\.hh$'' + ''^src/libcmd/include/nix/cmd/installable-attr-path\.hh$'' ''^src/libcmd/installable-derived-path\.cc$'' - ''^src/libcmd/include/nix/installable-derived-path\.hh$'' + ''^src/libcmd/include/nix/cmd/installable-derived-path\.hh$'' ''^src/libcmd/installable-flake\.cc$'' - ''^src/libcmd/include/nix/installable-flake\.hh$'' + ''^src/libcmd/include/nix/cmd/installable-flake\.hh$'' ''^src/libcmd/installable-value\.cc$'' - ''^src/libcmd/include/nix/installable-value\.hh$'' + ''^src/libcmd/include/nix/cmd/installable-value\.hh$'' ''^src/libcmd/installables\.cc$'' - ''^src/libcmd/include/nix/installables\.hh$'' - ''^src/libcmd/include/nix/legacy\.hh$'' + ''^src/libcmd/include/nix/cmd/installables\.hh$'' + ''^src/libcmd/include/nix/cmd/legacy\.hh$'' ''^src/libcmd/markdown\.cc$'' ''^src/libcmd/misc-store-flags\.cc$'' ''^src/libcmd/repl-interacter\.cc$'' - ''^src/libcmd/include/nix/repl-interacter\.hh$'' + ''^src/libcmd/include/nix/cmd/repl-interacter\.hh$'' ''^src/libcmd/repl\.cc$'' - ''^src/libcmd/include/nix/repl\.hh$'' + ''^src/libcmd/include/nix/cmd/repl\.hh$'' ''^src/libexpr-c/nix_api_expr\.cc$'' ''^src/libexpr-c/nix_api_external\.cc$'' ''^src/libexpr/attr-path\.cc$'' - ''^src/libexpr/include/nix/attr-path\.hh$'' + ''^src/libexpr/include/nix/expr/attr-path\.hh$'' ''^src/libexpr/attr-set\.cc$'' - ''^src/libexpr/include/nix/attr-set\.hh$'' + ''^src/libexpr/include/nix/expr/attr-set\.hh$'' ''^src/libexpr/eval-cache\.cc$'' - ''^src/libexpr/include/nix/eval-cache\.hh$'' + ''^src/libexpr/include/nix/expr/eval-cache\.hh$'' ''^src/libexpr/eval-error\.cc$'' - ''^src/libexpr/include/nix/eval-inline\.hh$'' + ''^src/libexpr/include/nix/expr/eval-inline\.hh$'' ''^src/libexpr/eval-settings\.cc$'' - ''^src/libexpr/include/nix/eval-settings\.hh$'' + ''^src/libexpr/include/nix/expr/eval-settings\.hh$'' ''^src/libexpr/eval\.cc$'' - ''^src/libexpr/include/nix/eval\.hh$'' + ''^src/libexpr/include/nix/expr/eval\.hh$'' ''^src/libexpr/function-trace\.cc$'' - ''^src/libexpr/include/nix/gc-small-vector\.hh$'' + ''^src/libexpr/include/nix/expr/gc-small-vector\.hh$'' ''^src/libexpr/get-drvs\.cc$'' - ''^src/libexpr/include/nix/get-drvs\.hh$'' + ''^src/libexpr/include/nix/expr/get-drvs\.hh$'' ''^src/libexpr/json-to-value\.cc$'' ''^src/libexpr/nixexpr\.cc$'' - ''^src/libexpr/include/nix/nixexpr\.hh$'' - ''^src/libexpr/include/nix/parser-state\.hh$'' + ''^src/libexpr/include/nix/expr/nixexpr\.hh$'' + ''^src/libexpr/include/nix/expr/parser-state\.hh$'' ''^src/libexpr/primops\.cc$'' - ''^src/libexpr/include/nix/primops\.hh$'' + ''^src/libexpr/include/nix/expr/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/include/nix/print-ambiguous\.hh$'' - ''^src/libexpr/include/nix/print-options\.hh$'' + ''^src/libexpr/include/nix/expr/print-ambiguous\.hh$'' + ''^src/libexpr/include/nix/expr/print-options\.hh$'' ''^src/libexpr/print\.cc$'' - ''^src/libexpr/include/nix/print\.hh$'' + ''^src/libexpr/include/nix/expr/print\.hh$'' ''^src/libexpr/search-path\.cc$'' - ''^src/libexpr/include/nix/symbol-table\.hh$'' + ''^src/libexpr/include/nix/expr/symbol-table\.hh$'' ''^src/libexpr/value-to-json\.cc$'' - ''^src/libexpr/include/nix/value-to-json\.hh$'' + ''^src/libexpr/include/nix/expr/value-to-json\.hh$'' ''^src/libexpr/value-to-xml\.cc$'' - ''^src/libexpr/include/nix/value-to-xml\.hh$'' - ''^src/libexpr/include/nix/value\.hh$'' + ''^src/libexpr/include/nix/expr/value-to-xml\.hh$'' + ''^src/libexpr/include/nix/expr/value\.hh$'' ''^src/libexpr/value/context\.cc$'' - ''^src/libexpr/include/nix/value/context\.hh$'' + ''^src/libexpr/include/nix/expr/value/context\.hh$'' ''^src/libfetchers/attrs\.cc$'' ''^src/libfetchers/cache\.cc$'' - ''^src/libfetchers/include/nix/cache\.hh$'' + ''^src/libfetchers/include/nix/fetchers/cache\.hh$'' ''^src/libfetchers/fetch-settings\.cc$'' - ''^src/libfetchers/include/nix/fetch-settings\.hh$'' + ''^src/libfetchers/include/nix/fetchers/fetch-settings\.hh$'' ''^src/libfetchers/fetch-to-store\.cc$'' ''^src/libfetchers/fetchers\.cc$'' - ''^src/libfetchers/include/nix/fetchers\.hh$'' + ''^src/libfetchers/include/nix/fetchers/fetchers\.hh$'' ''^src/libfetchers/filtering-source-accessor\.cc$'' - ''^src/libfetchers/include/nix/filtering-source-accessor\.hh$'' + ''^src/libfetchers/include/nix/fetchers/filtering-source-accessor\.hh$'' ''^src/libfetchers/fs-source-accessor\.cc$'' ''^src/libfetchers/include/nix/fs-source-accessor\.hh$'' ''^src/libfetchers/git-utils\.cc$'' - ''^src/libfetchers/include/nix/git-utils\.hh$'' + ''^src/libfetchers/include/nix/fetchers/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/include/nix/registry\.hh$'' + ''^src/libfetchers/include/nix/fetchers/registry\.hh$'' ''^src/libfetchers/tarball\.cc$'' - ''^src/libfetchers/include/nix/tarball\.hh$'' + ''^src/libfetchers/include/nix/fetchers/tarball\.hh$'' ''^src/libfetchers/git\.cc$'' ''^src/libfetchers/mercurial\.cc$'' ''^src/libflake/flake/config\.cc$'' @@ -181,243 +181,243 @@ ''^src/libflake/include/nix/flake/lockfile\.hh$'' ''^src/libflake/flake/url-name\.cc$'' ''^src/libmain/common-args\.cc$'' - ''^src/libmain/include/nix/common-args\.hh$'' + ''^src/libmain/include/nix/main/common-args\.hh$'' ''^src/libmain/loggers\.cc$'' - ''^src/libmain/include/nix/loggers\.hh$'' + ''^src/libmain/include/nix/main/loggers\.hh$'' ''^src/libmain/progress-bar\.cc$'' ''^src/libmain/shared\.cc$'' - ''^src/libmain/include/nix/shared\.hh$'' + ''^src/libmain/include/nix/main/shared\.hh$'' ''^src/libmain/unix/stack\.cc$'' ''^src/libstore/binary-cache-store\.cc$'' - ''^src/libstore/include/nix/binary-cache-store\.hh$'' - ''^src/libstore/include/nix/build-result\.hh$'' - ''^src/libstore/include/nix/builtins\.hh$'' + ''^src/libstore/include/nix/store/binary-cache-store\.hh$'' + ''^src/libstore/include/nix/store/build-result\.hh$'' + ''^src/libstore/include/nix/store/builtins\.hh$'' ''^src/libstore/builtins/buildenv\.cc$'' - ''^src/libstore/include/nix/builtins/buildenv\.hh$'' - ''^src/libstore/include/nix/common-protocol-impl\.hh$'' + ''^src/libstore/include/nix/store/builtins/buildenv\.hh$'' + ''^src/libstore/include/nix/store/common-protocol-impl\.hh$'' ''^src/libstore/common-protocol\.cc$'' - ''^src/libstore/include/nix/common-protocol\.hh$'' - ''^src/libstore/include/nix/common-ssh-store-config\.hh$'' + ''^src/libstore/include/nix/store/common-protocol\.hh$'' + ''^src/libstore/include/nix/store/common-ssh-store-config\.hh$'' ''^src/libstore/content-address\.cc$'' - ''^src/libstore/include/nix/content-address\.hh$'' + ''^src/libstore/include/nix/store/content-address\.hh$'' ''^src/libstore/daemon\.cc$'' - ''^src/libstore/include/nix/daemon\.hh$'' + ''^src/libstore/include/nix/store/daemon\.hh$'' ''^src/libstore/derivations\.cc$'' - ''^src/libstore/include/nix/derivations\.hh$'' + ''^src/libstore/include/nix/store/derivations\.hh$'' ''^src/libstore/derived-path-map\.cc$'' - ''^src/libstore/include/nix/derived-path-map\.hh$'' + ''^src/libstore/include/nix/store/derived-path-map\.hh$'' ''^src/libstore/derived-path\.cc$'' - ''^src/libstore/include/nix/derived-path\.hh$'' + ''^src/libstore/include/nix/store/derived-path\.hh$'' ''^src/libstore/downstream-placeholder\.cc$'' - ''^src/libstore/include/nix/downstream-placeholder\.hh$'' + ''^src/libstore/include/nix/store/downstream-placeholder\.hh$'' ''^src/libstore/dummy-store\.cc$'' ''^src/libstore/export-import\.cc$'' ''^src/libstore/filetransfer\.cc$'' - ''^src/libstore/include/nix/filetransfer\.hh$'' - ''^src/libstore/include/nix/gc-store\.hh$'' + ''^src/libstore/include/nix/store/filetransfer\.hh$'' + ''^src/libstore/include/nix/store/gc-store\.hh$'' ''^src/libstore/globals\.cc$'' - ''^src/libstore/include/nix/globals\.hh$'' + ''^src/libstore/include/nix/store/globals\.hh$'' ''^src/libstore/http-binary-cache-store\.cc$'' ''^src/libstore/legacy-ssh-store\.cc$'' - ''^src/libstore/include/nix/legacy-ssh-store\.hh$'' - ''^src/libstore/include/nix/length-prefixed-protocol-helper\.hh$'' + ''^src/libstore/include/nix/store/legacy-ssh-store\.hh$'' + ''^src/libstore/include/nix/store/length-prefixed-protocol-helper\.hh$'' ''^src/libstore/linux/personality\.cc$'' - ''^src/libstore/linux/include/nix/personality\.hh$'' + ''^src/libstore/linux/include/nix/store/personality\.hh$'' ''^src/libstore/local-binary-cache-store\.cc$'' ''^src/libstore/local-fs-store\.cc$'' - ''^src/libstore/include/nix/local-fs-store\.hh$'' + ''^src/libstore/include/nix/store/local-fs-store\.hh$'' ''^src/libstore/log-store\.cc$'' - ''^src/libstore/include/nix/log-store\.hh$'' + ''^src/libstore/include/nix/store/log-store\.hh$'' ''^src/libstore/machines\.cc$'' - ''^src/libstore/include/nix/machines\.hh$'' + ''^src/libstore/include/nix/store/machines\.hh$'' ''^src/libstore/make-content-addressed\.cc$'' - ''^src/libstore/include/nix/make-content-addressed\.hh$'' + ''^src/libstore/include/nix/store/make-content-addressed\.hh$'' ''^src/libstore/misc\.cc$'' ''^src/libstore/names\.cc$'' - ''^src/libstore/include/nix/names\.hh$'' + ''^src/libstore/include/nix/store/names\.hh$'' ''^src/libstore/nar-accessor\.cc$'' - ''^src/libstore/include/nix/nar-accessor\.hh$'' + ''^src/libstore/include/nix/store/nar-accessor\.hh$'' ''^src/libstore/nar-info-disk-cache\.cc$'' - ''^src/libstore/include/nix/nar-info-disk-cache\.hh$'' + ''^src/libstore/include/nix/store/nar-info-disk-cache\.hh$'' ''^src/libstore/nar-info\.cc$'' - ''^src/libstore/include/nix/nar-info\.hh$'' + ''^src/libstore/include/nix/store/nar-info\.hh$'' ''^src/libstore/outputs-spec\.cc$'' - ''^src/libstore/include/nix/outputs-spec\.hh$'' + ''^src/libstore/include/nix/store/outputs-spec\.hh$'' ''^src/libstore/parsed-derivations\.cc$'' ''^src/libstore/path-info\.cc$'' - ''^src/libstore/include/nix/path-info\.hh$'' + ''^src/libstore/include/nix/store/path-info\.hh$'' ''^src/libstore/path-references\.cc$'' - ''^src/libstore/include/nix/path-regex\.hh$'' + ''^src/libstore/include/nix/store/path-regex\.hh$'' ''^src/libstore/path-with-outputs\.cc$'' ''^src/libstore/path\.cc$'' - ''^src/libstore/include/nix/path\.hh$'' + ''^src/libstore/include/nix/store/path\.hh$'' ''^src/libstore/pathlocks\.cc$'' - ''^src/libstore/include/nix/pathlocks\.hh$'' + ''^src/libstore/include/nix/store/pathlocks\.hh$'' ''^src/libstore/profiles\.cc$'' - ''^src/libstore/include/nix/profiles\.hh$'' + ''^src/libstore/include/nix/store/profiles\.hh$'' ''^src/libstore/realisation\.cc$'' - ''^src/libstore/include/nix/realisation\.hh$'' + ''^src/libstore/include/nix/store/realisation\.hh$'' ''^src/libstore/remote-fs-accessor\.cc$'' - ''^src/libstore/include/nix/remote-fs-accessor\.hh$'' - ''^src/libstore/include/nix/remote-store-connection\.hh$'' + ''^src/libstore/include/nix/store/remote-fs-accessor\.hh$'' + ''^src/libstore/include/nix/store/remote-store-connection\.hh$'' ''^src/libstore/remote-store\.cc$'' - ''^src/libstore/include/nix/remote-store\.hh$'' + ''^src/libstore/include/nix/store/remote-store\.hh$'' ''^src/libstore/s3-binary-cache-store\.cc$'' - ''^src/libstore/include/nix/s3\.hh$'' + ''^src/libstore/include/nix/store/s3\.hh$'' ''^src/libstore/serve-protocol-impl\.cc$'' - ''^src/libstore/include/nix/serve-protocol-impl\.hh$'' + ''^src/libstore/include/nix/store/serve-protocol-impl\.hh$'' ''^src/libstore/serve-protocol\.cc$'' - ''^src/libstore/include/nix/serve-protocol\.hh$'' + ''^src/libstore/include/nix/store/serve-protocol\.hh$'' ''^src/libstore/sqlite\.cc$'' - ''^src/libstore/include/nix/sqlite\.hh$'' + ''^src/libstore/include/nix/store/sqlite\.hh$'' ''^src/libstore/ssh-store\.cc$'' ''^src/libstore/ssh\.cc$'' - ''^src/libstore/include/nix/ssh\.hh$'' + ''^src/libstore/include/nix/store/ssh\.hh$'' ''^src/libstore/store-api\.cc$'' - ''^src/libstore/include/nix/store-api\.hh$'' - ''^src/libstore/include/nix/store-dir-config\.hh$'' + ''^src/libstore/include/nix/store/store-api\.hh$'' + ''^src/libstore/include/nix/store/store-dir-config\.hh$'' ''^src/libstore/build/derivation-goal\.cc$'' - ''^src/libstore/include/nix/build/derivation-goal\.hh$'' + ''^src/libstore/include/nix/store/build/derivation-goal\.hh$'' ''^src/libstore/build/drv-output-substitution-goal\.cc$'' - ''^src/libstore/include/nix/build/drv-output-substitution-goal\.hh$'' + ''^src/libstore/include/nix/store/build/drv-output-substitution-goal\.hh$'' ''^src/libstore/build/entry-points\.cc$'' ''^src/libstore/build/goal\.cc$'' - ''^src/libstore/include/nix/build/goal\.hh$'' + ''^src/libstore/include/nix/store/build/goal\.hh$'' ''^src/libstore/unix/build/hook-instance\.cc$'' ''^src/libstore/unix/build/local-derivation-goal\.cc$'' - ''^src/libstore/unix/include/nix/build/local-derivation-goal\.hh$'' + ''^src/libstore/unix/include/nix/store/build/local-derivation-goal\.hh$'' ''^src/libstore/build/substitution-goal\.cc$'' - ''^src/libstore/include/nix/build/substitution-goal\.hh$'' + ''^src/libstore/include/nix/store/build/substitution-goal\.hh$'' ''^src/libstore/build/worker\.cc$'' - ''^src/libstore/include/nix/build/worker\.hh$'' + ''^src/libstore/include/nix/store/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/include/nix/local-overlay-store\.hh$'' + ''^src/libstore/include/nix/store/local-overlay-store\.hh$'' ''^src/libstore/local-store\.cc$'' - ''^src/libstore/include/nix/local-store\.hh$'' + ''^src/libstore/include/nix/store/local-store\.hh$'' ''^src/libstore/unix/user-lock\.cc$'' - ''^src/libstore/unix/include/nix/user-lock\.hh$'' + ''^src/libstore/unix/include/nix/store/user-lock\.hh$'' ''^src/libstore/optimise-store\.cc$'' ''^src/libstore/unix/pathlocks\.cc$'' ''^src/libstore/posix-fs-canonicalise\.cc$'' - ''^src/libstore/include/nix/posix-fs-canonicalise\.hh$'' + ''^src/libstore/include/nix/store/posix-fs-canonicalise\.hh$'' ''^src/libstore/uds-remote-store\.cc$'' - ''^src/libstore/include/nix/uds-remote-store\.hh$'' + ''^src/libstore/include/nix/store/uds-remote-store\.hh$'' ''^src/libstore/windows/build\.cc$'' - ''^src/libstore/include/nix/worker-protocol-impl\.hh$'' + ''^src/libstore/include/nix/store/worker-protocol-impl\.hh$'' ''^src/libstore/worker-protocol\.cc$'' - ''^src/libstore/include/nix/worker-protocol\.hh$'' + ''^src/libstore/include/nix/store/worker-protocol\.hh$'' ''^src/libutil-c/nix_api_util_internal\.h$'' ''^src/libutil/archive\.cc$'' - ''^src/libutil/include/nix/archive\.hh$'' + ''^src/libutil/include/nix/util/archive\.hh$'' ''^src/libutil/args\.cc$'' - ''^src/libutil/include/nix/args\.hh$'' - ''^src/libutil/include/nix/args/root\.hh$'' - ''^src/libutil/include/nix/callback\.hh$'' + ''^src/libutil/include/nix/util/args\.hh$'' + ''^src/libutil/include/nix/util/args/root\.hh$'' + ''^src/libutil/include/nix/util/callback\.hh$'' ''^src/libutil/canon-path\.cc$'' - ''^src/libutil/include/nix/canon-path\.hh$'' - ''^src/libutil/include/nix/chunked-vector\.hh$'' - ''^src/libutil/include/nix/closure\.hh$'' - ''^src/libutil/include/nix/comparator\.hh$'' + ''^src/libutil/include/nix/util/canon-path\.hh$'' + ''^src/libutil/include/nix/util/chunked-vector\.hh$'' + ''^src/libutil/include/nix/util/closure\.hh$'' + ''^src/libutil/include/nix/util/comparator\.hh$'' ''^src/libutil/compute-levels\.cc$'' - ''^src/libutil/include/nix/config-impl\.hh$'' - ''^src/libutil/config\.cc$'' - ''^src/libutil/include/nix/config\.hh$'' + ''^src/libutil/include/nix/util/config-impl\.hh$'' + ''^src/libutil/configuration\.cc$'' + ''^src/libutil/include/nix/util/configuration\.hh$'' ''^src/libutil/current-process\.cc$'' - ''^src/libutil/include/nix/current-process\.hh$'' + ''^src/libutil/include/nix/util/current-process\.hh$'' ''^src/libutil/english\.cc$'' - ''^src/libutil/include/nix/english\.hh$'' + ''^src/libutil/include/nix/util/english\.hh$'' ''^src/libutil/error\.cc$'' - ''^src/libutil/include/nix/error\.hh$'' - ''^src/libutil/include/nix/exit\.hh$'' + ''^src/libutil/include/nix/util/error\.hh$'' + ''^src/libutil/include/nix/util/exit\.hh$'' ''^src/libutil/experimental-features\.cc$'' - ''^src/libutil/include/nix/experimental-features\.hh$'' + ''^src/libutil/include/nix/util/experimental-features\.hh$'' ''^src/libutil/file-content-address\.cc$'' - ''^src/libutil/include/nix/file-content-address\.hh$'' + ''^src/libutil/include/nix/util/file-content-address\.hh$'' ''^src/libutil/file-descriptor\.cc$'' - ''^src/libutil/include/nix/file-descriptor\.hh$'' - ''^src/libutil/include/nix/file-path-impl\.hh$'' - ''^src/libutil/include/nix/file-path\.hh$'' + ''^src/libutil/include/nix/util/file-descriptor\.hh$'' + ''^src/libutil/include/nix/util/file-path-impl\.hh$'' + ''^src/libutil/include/nix/util/file-path\.hh$'' ''^src/libutil/file-system\.cc$'' - ''^src/libutil/include/nix/file-system\.hh$'' - ''^src/libutil/include/nix/finally\.hh$'' - ''^src/libutil/include/nix/fmt\.hh$'' + ''^src/libutil/include/nix/util/file-system\.hh$'' + ''^src/libutil/include/nix/util/finally\.hh$'' + ''^src/libutil/include/nix/util/fmt\.hh$'' ''^src/libutil/fs-sink\.cc$'' - ''^src/libutil/include/nix/fs-sink\.hh$'' + ''^src/libutil/include/nix/util/fs-sink\.hh$'' ''^src/libutil/git\.cc$'' - ''^src/libutil/include/nix/git\.hh$'' + ''^src/libutil/include/nix/util/git\.hh$'' ''^src/libutil/hash\.cc$'' - ''^src/libutil/include/nix/hash\.hh$'' + ''^src/libutil/include/nix/util/hash\.hh$'' ''^src/libutil/hilite\.cc$'' - ''^src/libutil/include/nix/hilite\.hh$'' + ''^src/libutil/include/nix/util/hilite\.hh$'' ''^src/libutil/source-accessor\.hh$'' - ''^src/libutil/include/nix/json-impls\.hh$'' + ''^src/libutil/include/nix/util/json-impls\.hh$'' ''^src/libutil/json-utils\.cc$'' - ''^src/libutil/include/nix/json-utils\.hh$'' + ''^src/libutil/include/nix/util/json-utils\.hh$'' ''^src/libutil/linux/cgroup\.cc$'' ''^src/libutil/linux/namespaces\.cc$'' ''^src/libutil/logging\.cc$'' - ''^src/libutil/include/nix/logging\.hh$'' - ''^src/libutil/include/nix/lru-cache\.hh$'' + ''^src/libutil/include/nix/util/logging\.hh$'' + ''^src/libutil/include/nix/util/lru-cache\.hh$'' ''^src/libutil/memory-source-accessor\.cc$'' - ''^src/libutil/include/nix/memory-source-accessor\.hh$'' - ''^src/libutil/include/nix/pool\.hh$'' + ''^src/libutil/include/nix/util/memory-source-accessor\.hh$'' + ''^src/libutil/include/nix/util/pool\.hh$'' ''^src/libutil/position\.cc$'' - ''^src/libutil/include/nix/position\.hh$'' + ''^src/libutil/include/nix/util/position\.hh$'' ''^src/libutil/posix-source-accessor\.cc$'' - ''^src/libutil/include/nix/posix-source-accessor\.hh$'' - ''^src/libutil/include/nix/processes\.hh$'' - ''^src/libutil/include/nix/ref\.hh$'' + ''^src/libutil/include/nix/util/posix-source-accessor\.hh$'' + ''^src/libutil/include/nix/util/processes\.hh$'' + ''^src/libutil/include/nix/util/ref\.hh$'' ''^src/libutil/references\.cc$'' - ''^src/libutil/include/nix/references\.hh$'' + ''^src/libutil/include/nix/util/references\.hh$'' ''^src/libutil/regex-combinators\.hh$'' ''^src/libutil/serialise\.cc$'' - ''^src/libutil/include/nix/serialise\.hh$'' - ''^src/libutil/include/nix/signals\.hh$'' + ''^src/libutil/include/nix/util/serialise\.hh$'' + ''^src/libutil/include/nix/util/signals\.hh$'' ''^src/libutil/signature/local-keys\.cc$'' - ''^src/libutil/include/nix/signature/local-keys\.hh$'' + ''^src/libutil/include/nix/util/signature/local-keys\.hh$'' ''^src/libutil/signature/signer\.cc$'' - ''^src/libutil/include/nix/signature/signer\.hh$'' + ''^src/libutil/include/nix/util/signature/signer\.hh$'' ''^src/libutil/source-accessor\.cc$'' - ''^src/libutil/include/nix/source-accessor\.hh$'' + ''^src/libutil/include/nix/util/source-accessor\.hh$'' ''^src/libutil/source-path\.cc$'' - ''^src/libutil/include/nix/source-path\.hh$'' - ''^src/libutil/include/nix/split\.hh$'' + ''^src/libutil/include/nix/util/source-path\.hh$'' + ''^src/libutil/include/nix/util/split\.hh$'' ''^src/libutil/suggestions\.cc$'' - ''^src/libutil/include/nix/suggestions\.hh$'' - ''^src/libutil/include/nix/sync\.hh$'' + ''^src/libutil/include/nix/util/suggestions\.hh$'' + ''^src/libutil/include/nix/util/sync\.hh$'' ''^src/libutil/terminal\.cc$'' - ''^src/libutil/include/nix/terminal\.hh$'' + ''^src/libutil/include/nix/util/terminal\.hh$'' ''^src/libutil/thread-pool\.cc$'' - ''^src/libutil/include/nix/thread-pool\.hh$'' - ''^src/libutil/include/nix/topo-sort\.hh$'' - ''^src/libutil/include/nix/types\.hh$'' + ''^src/libutil/include/nix/util/thread-pool\.hh$'' + ''^src/libutil/include/nix/util/topo-sort\.hh$'' + ''^src/libutil/include/nix/util/types\.hh$'' ''^src/libutil/unix/file-descriptor\.cc$'' ''^src/libutil/unix/file-path\.cc$'' ''^src/libutil/unix/processes\.cc$'' - ''^src/libutil/unix/include/nix/signals-impl\.hh$'' + ''^src/libutil/unix/include/nix/util/signals-impl\.hh$'' ''^src/libutil/unix/signals\.cc$'' ''^src/libutil/unix-domain-socket\.cc$'' ''^src/libutil/unix/users\.cc$'' - ''^src/libutil/include/nix/url-parts\.hh$'' + ''^src/libutil/include/nix/util/url-parts\.hh$'' ''^src/libutil/url\.cc$'' - ''^src/libutil/include/nix/url\.hh$'' + ''^src/libutil/include/nix/util/url\.hh$'' ''^src/libutil/users\.cc$'' - ''^src/libutil/include/nix/users\.hh$'' + ''^src/libutil/include/nix/util/users\.hh$'' ''^src/libutil/util\.cc$'' - ''^src/libutil/include/nix/util\.hh$'' - ''^src/libutil/include/nix/variant-wrapper\.hh$'' + ''^src/libutil/include/nix/util/util\.hh$'' + ''^src/libutil/include/nix/util/variant-wrapper\.hh$'' ''^src/libutil/widecharwidth/widechar_width\.h$'' # vendored source ''^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/include/nix/windows-error\.hh$'' + ''^src/libutil/windows/include/nix/util/windows-error\.hh$'' ''^src/libutil/xml-writer\.cc$'' - ''^src/libutil/include/nix/xml-writer\.hh$'' + ''^src/libutil/include/nix/util/xml-writer\.hh$'' ''^src/nix-build/nix-build\.cc$'' ''^src/nix-channel/nix-channel\.cc$'' ''^src/nix-collect-garbage/nix-collect-garbage\.cc$'' @@ -481,9 +481,9 @@ ''^tests/nixos/ca-fd-leak/sender\.c'' ''^tests/nixos/ca-fd-leak/smuggler\.c'' ''^tests/nixos/user-sandboxing/attacker\.c'' - ''^src/libexpr-test-support/include/nix/tests/libexpr\.hh'' + ''^src/libexpr-test-support/include/nix/expr/tests/libexpr\.hh'' ''^src/libexpr-test-support/tests/value/context\.cc'' - ''^src/libexpr-test-support/include/nix/tests/value/context\.hh'' + ''^src/libexpr-test-support/include/nix/expr/tests/value/context\.hh'' ''^src/libexpr-tests/derived-path\.cc'' ''^src/libexpr-tests/error_traces\.cc'' ''^src/libexpr-tests/eval\.cc'' @@ -498,13 +498,13 @@ ''^src/libflake-tests/flakeref\.cc'' ''^src/libflake-tests/url-name\.cc'' ''^src/libstore-test-support/tests/derived-path\.cc'' - ''^src/libstore-test-support/include/nix/tests/derived-path\.hh'' - ''^src/libstore-test-support/include/nix/tests/nix_api_store\.hh'' + ''^src/libstore-test-support/include/nix/store/tests/derived-path\.hh'' + ''^src/libstore-test-support/include/nix/store/tests/nix_api_store\.hh'' ''^src/libstore-test-support/tests/outputs-spec\.cc'' - ''^src/libstore-test-support/include/nix/tests/outputs-spec\.hh'' + ''^src/libstore-test-support/include/nix/store/tests/outputs-spec\.hh'' ''^src/libstore-test-support/path\.cc'' - ''^src/libstore-test-support/include/nix/tests/path\.hh'' - ''^src/libstore-test-support/include/nix/tests/protocol\.hh'' + ''^src/libstore-test-support/include/nix/store/tests/path\.hh'' + ''^src/libstore-test-support/include/nix/store/tests/protocol\.hh'' ''^src/libstore-tests/common-protocol\.cc'' ''^src/libstore-tests/content-address\.cc'' ''^src/libstore-tests/derivation\.cc'' @@ -518,9 +518,9 @@ ''^src/libstore-tests/path\.cc'' ''^src/libstore-tests/serve-protocol\.cc'' ''^src/libstore-tests/worker-protocol\.cc'' - ''^src/libutil-test-support/include/nix/tests/characterization\.hh'' + ''^src/libutil-test-support/include/nix/util/tests/characterization\.hh'' ''^src/libutil-test-support/hash\.cc'' - ''^src/libutil-test-support/include/nix/tests/hash\.hh'' + ''^src/libutil-test-support/include/nix/util/tests/hash\.hh'' ''^src/libutil-tests/args\.cc'' ''^src/libutil-tests/canon-path\.cc'' ''^src/libutil-tests/chunked-vector\.cc'' diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index 56eb248a5..b4eaa389b 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -9,19 +9,19 @@ #include #endif -#include "nix/machines.hh" -#include "nix/shared.hh" -#include "nix/plugin.hh" -#include "nix/pathlocks.hh" -#include "nix/globals.hh" -#include "nix/serialise.hh" -#include "nix/build-result.hh" -#include "nix/store-api.hh" -#include "nix/strings.hh" -#include "nix/derivations.hh" -#include "nix/local-store.hh" -#include "nix/legacy.hh" -#include "nix/experimental-features.hh" +#include "nix/store/machines.hh" +#include "nix/main/shared.hh" +#include "nix/main/plugin.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/globals.hh" +#include "nix/util/serialise.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/util/strings.hh" +#include "nix/store/derivations.hh" +#include "nix/store/local-store.hh" +#include "nix/cmd/legacy.hh" +#include "nix/util/experimental-features.hh" using namespace nix; using std::cin; diff --git a/src/libcmd/built-path.cc b/src/libcmd/built-path.cc index 21b52cea5..1238f9422 100644 --- a/src/libcmd/built-path.cc +++ b/src/libcmd/built-path.cc @@ -1,7 +1,7 @@ -#include "nix/built-path.hh" -#include "nix/derivations.hh" -#include "nix/store-api.hh" -#include "nix/comparator.hh" +#include "nix/cmd/built-path.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/util/comparator.hh" #include diff --git a/src/libcmd/command-installable-value.cc b/src/libcmd/command-installable-value.cc index 52fa61091..0884f17e9 100644 --- a/src/libcmd/command-installable-value.cc +++ b/src/libcmd/command-installable-value.cc @@ -1,4 +1,4 @@ -#include "nix/command-installable-value.hh" +#include "nix/cmd/command-installable-value.hh" namespace nix { diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc index efcdb799d..565f424dd 100644 --- a/src/libcmd/command.cc +++ b/src/libcmd/command.cc @@ -1,16 +1,16 @@ #include #include -#include "nix/command.hh" -#include "nix/markdown.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/derivations.hh" -#include "nix/nixexpr.hh" -#include "nix/profiles.hh" -#include "nix/repl.hh" -#include "nix/strings.hh" -#include "nix/environment-variables.hh" +#include "nix/cmd/command.hh" +#include "nix/cmd/markdown.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/derivations.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/store/profiles.hh" +#include "nix/cmd/repl.hh" +#include "nix/util/strings.hh" +#include "nix/util/environment-variables.hh" namespace nix { diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index 805701749..c051792f3 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -1,20 +1,20 @@ -#include "nix/fetch-settings.hh" -#include "nix/eval-settings.hh" -#include "nix/common-eval-args.hh" -#include "nix/shared.hh" -#include "nix/config-global.hh" -#include "nix/filetransfer.hh" -#include "nix/eval.hh" -#include "nix/fetchers.hh" -#include "nix/registry.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/main/shared.hh" +#include "nix/util/config-global.hh" +#include "nix/store/filetransfer.hh" +#include "nix/expr/eval.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" #include "nix/flake/flakeref.hh" #include "nix/flake/settings.hh" -#include "nix/store-api.hh" -#include "nix/command.hh" -#include "nix/tarball.hh" -#include "nix/fetch-to-store.hh" -#include "nix/compatibility-settings.hh" -#include "nix/eval-settings.hh" +#include "nix/store/store-api.hh" +#include "nix/cmd/command.hh" +#include "nix/fetchers/tarball.hh" +#include "nix/fetchers/fetch-to-store.hh" +#include "nix/cmd/compatibility-settings.hh" +#include "nix/expr/eval-settings.hh" namespace nix { diff --git a/src/libcmd/editor-for.cc b/src/libcmd/editor-for.cc index b82f41d2b..a5d635859 100644 --- a/src/libcmd/editor-for.cc +++ b/src/libcmd/editor-for.cc @@ -1,6 +1,6 @@ -#include "nix/editor-for.hh" -#include "nix/environment-variables.hh" -#include "nix/source-path.hh" +#include "nix/cmd/editor-for.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libcmd/include/nix/built-path.hh b/src/libcmd/include/nix/cmd/built-path.hh similarity index 97% rename from src/libcmd/include/nix/built-path.hh rename to src/libcmd/include/nix/cmd/built-path.hh index bd8f685e0..c885876a7 100644 --- a/src/libcmd/include/nix/built-path.hh +++ b/src/libcmd/include/nix/cmd/built-path.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/derived-path.hh" -#include "nix/realisation.hh" +#include "nix/store/derived-path.hh" +#include "nix/store/realisation.hh" namespace nix { diff --git a/src/libcmd/include/nix/command-installable-value.hh b/src/libcmd/include/nix/cmd/command-installable-value.hh similarity index 85% rename from src/libcmd/include/nix/command-installable-value.hh rename to src/libcmd/include/nix/cmd/command-installable-value.hh index 5ce352a63..b171d9f73 100644 --- a/src/libcmd/include/nix/command-installable-value.hh +++ b/src/libcmd/include/nix/cmd/command-installable-value.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/installable-value.hh" -#include "nix/command.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/cmd/command.hh" namespace nix { diff --git a/src/libcmd/include/nix/command.hh b/src/libcmd/include/nix/cmd/command.hh similarity index 98% rename from src/libcmd/include/nix/command.hh rename to src/libcmd/include/nix/cmd/command.hh index 9d3c8e343..6b6418f51 100644 --- a/src/libcmd/include/nix/command.hh +++ b/src/libcmd/include/nix/cmd/command.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/installable-value.hh" -#include "nix/args.hh" -#include "nix/common-eval-args.hh" -#include "nix/path.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/util/args.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/store/path.hh" #include "nix/flake/lockfile.hh" #include diff --git a/src/libcmd/include/nix/common-eval-args.hh b/src/libcmd/include/nix/cmd/common-eval-args.hh similarity index 91% rename from src/libcmd/include/nix/common-eval-args.hh rename to src/libcmd/include/nix/cmd/common-eval-args.hh index e72175891..6f3367e58 100644 --- a/src/libcmd/include/nix/common-eval-args.hh +++ b/src/libcmd/include/nix/cmd/common-eval-args.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/args.hh" -#include "nix/canon-path.hh" -#include "nix/common-args.hh" -#include "nix/search-path.hh" +#include "nix/util/args.hh" +#include "nix/util/canon-path.hh" +#include "nix/main/common-args.hh" +#include "nix/expr/search-path.hh" #include diff --git a/src/libcmd/include/nix/compatibility-settings.hh b/src/libcmd/include/nix/cmd/compatibility-settings.hh similarity index 97% rename from src/libcmd/include/nix/compatibility-settings.hh rename to src/libcmd/include/nix/cmd/compatibility-settings.hh index 18319c1f2..c7061a0a1 100644 --- a/src/libcmd/include/nix/compatibility-settings.hh +++ b/src/libcmd/include/nix/cmd/compatibility-settings.hh @@ -1,5 +1,5 @@ #pragma once -#include "nix/config.hh" +#include "nix/util/configuration.hh" namespace nix { struct CompatibilitySettings : public Config diff --git a/src/libcmd/include/nix/editor-for.hh b/src/libcmd/include/nix/cmd/editor-for.hh similarity index 74% rename from src/libcmd/include/nix/editor-for.hh rename to src/libcmd/include/nix/cmd/editor-for.hh index 0a8aa48bc..11414e823 100644 --- a/src/libcmd/include/nix/editor-for.hh +++ b/src/libcmd/include/nix/cmd/editor-for.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/source-path.hh" +#include "nix/util/types.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libcmd/include/nix/installable-attr-path.hh b/src/libcmd/include/nix/cmd/installable-attr-path.hh similarity index 61% rename from src/libcmd/include/nix/installable-attr-path.hh rename to src/libcmd/include/nix/cmd/installable-attr-path.hh index ceb2eca61..5a0dc993c 100644 --- a/src/libcmd/include/nix/installable-attr-path.hh +++ b/src/libcmd/include/nix/cmd/installable-attr-path.hh @@ -1,22 +1,22 @@ #pragma once ///@file -#include "nix/globals.hh" -#include "nix/installable-value.hh" -#include "nix/outputs-spec.hh" -#include "nix/command.hh" -#include "nix/attr-path.hh" -#include "nix/common-eval-args.hh" -#include "nix/derivations.hh" -#include "nix/eval-inline.hh" -#include "nix/eval.hh" -#include "nix/get-drvs.hh" -#include "nix/store-api.hh" -#include "nix/shared.hh" -#include "nix/eval-cache.hh" -#include "nix/url.hh" -#include "nix/registry.hh" -#include "nix/build-result.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/cmd/command.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/store/derivations.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/store/store-api.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/util/url.hh" +#include "nix/fetchers/registry.hh" +#include "nix/store/build-result.hh" #include #include diff --git a/src/libcmd/include/nix/installable-derived-path.hh b/src/libcmd/include/nix/cmd/installable-derived-path.hh similarity index 94% rename from src/libcmd/include/nix/installable-derived-path.hh rename to src/libcmd/include/nix/cmd/installable-derived-path.hh index 8f86e6c4c..daa6ba868 100644 --- a/src/libcmd/include/nix/installable-derived-path.hh +++ b/src/libcmd/include/nix/cmd/installable-derived-path.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/installables.hh" +#include "nix/cmd/installables.hh" namespace nix { diff --git a/src/libcmd/include/nix/installable-flake.hh b/src/libcmd/include/nix/cmd/installable-flake.hh similarity index 96% rename from src/libcmd/include/nix/installable-flake.hh rename to src/libcmd/include/nix/cmd/installable-flake.hh index 5bbe4beb5..8699031b5 100644 --- a/src/libcmd/include/nix/installable-flake.hh +++ b/src/libcmd/include/nix/cmd/installable-flake.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/common-eval-args.hh" -#include "nix/installable-value.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/cmd/installable-value.hh" namespace nix { diff --git a/src/libcmd/include/nix/installable-value.hh b/src/libcmd/include/nix/cmd/installable-value.hh similarity index 98% rename from src/libcmd/include/nix/installable-value.hh rename to src/libcmd/include/nix/cmd/installable-value.hh index f8840103f..9c8f1a9fb 100644 --- a/src/libcmd/include/nix/installable-value.hh +++ b/src/libcmd/include/nix/cmd/installable-value.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/installables.hh" +#include "nix/cmd/installables.hh" #include "nix/flake/flake.hh" namespace nix { diff --git a/src/libcmd/include/nix/installables.hh b/src/libcmd/include/nix/cmd/installables.hh similarity index 95% rename from src/libcmd/include/nix/installables.hh rename to src/libcmd/include/nix/cmd/installables.hh index 2393cbcff..84941278a 100644 --- a/src/libcmd/include/nix/installables.hh +++ b/src/libcmd/include/nix/cmd/installables.hh @@ -1,12 +1,12 @@ #pragma once ///@file -#include "nix/path.hh" -#include "nix/outputs-spec.hh" -#include "nix/derived-path.hh" -#include "nix/built-path.hh" -#include "nix/store-api.hh" -#include "nix/build-result.hh" +#include "nix/store/path.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/derived-path.hh" +#include "nix/cmd/built-path.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" #include diff --git a/src/libcmd/include/nix/legacy.hh b/src/libcmd/include/nix/cmd/legacy.hh similarity index 100% rename from src/libcmd/include/nix/legacy.hh rename to src/libcmd/include/nix/cmd/legacy.hh diff --git a/src/libcmd/include/nix/markdown.hh b/src/libcmd/include/nix/cmd/markdown.hh similarity index 100% rename from src/libcmd/include/nix/markdown.hh rename to src/libcmd/include/nix/cmd/markdown.hh diff --git a/src/libcmd/include/nix/meson.build b/src/libcmd/include/nix/cmd/meson.build similarity index 90% rename from src/libcmd/include/nix/meson.build rename to src/libcmd/include/nix/cmd/meson.build index debe4a605..368edb28e 100644 --- a/src/libcmd/include/nix/meson.build +++ b/src/libcmd/include/nix/cmd/meson.build @@ -1,6 +1,6 @@ # Public headers directory -include_dirs = [include_directories('..')] +include_dirs = [include_directories('../..')] headers = files( 'built-path.hh', diff --git a/src/libcmd/include/nix/misc-store-flags.hh b/src/libcmd/include/nix/cmd/misc-store-flags.hh similarity index 90% rename from src/libcmd/include/nix/misc-store-flags.hh rename to src/libcmd/include/nix/cmd/misc-store-flags.hh index b8579e90f..c9467ad8e 100644 --- a/src/libcmd/include/nix/misc-store-flags.hh +++ b/src/libcmd/include/nix/cmd/misc-store-flags.hh @@ -1,5 +1,5 @@ -#include "nix/args.hh" -#include "nix/content-address.hh" +#include "nix/util/args.hh" +#include "nix/store/content-address.hh" namespace nix::flag { diff --git a/src/libcmd/include/nix/network-proxy.hh b/src/libcmd/include/nix/cmd/network-proxy.hh similarity index 93% rename from src/libcmd/include/nix/network-proxy.hh rename to src/libcmd/include/nix/cmd/network-proxy.hh index ca797f465..255597a61 100644 --- a/src/libcmd/include/nix/network-proxy.hh +++ b/src/libcmd/include/nix/cmd/network-proxy.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libcmd/include/nix/repl-interacter.hh b/src/libcmd/include/nix/cmd/repl-interacter.hh similarity index 94% rename from src/libcmd/include/nix/repl-interacter.hh rename to src/libcmd/include/nix/cmd/repl-interacter.hh index 463ba6818..eb58563b2 100644 --- a/src/libcmd/include/nix/repl-interacter.hh +++ b/src/libcmd/include/nix/cmd/repl-interacter.hh @@ -1,8 +1,8 @@ #pragma once /// @file -#include "nix/finally.hh" -#include "nix/types.hh" +#include "nix/util/finally.hh" +#include "nix/util/types.hh" #include #include diff --git a/src/libcmd/include/nix/repl.hh b/src/libcmd/include/nix/cmd/repl.hh similarity index 97% rename from src/libcmd/include/nix/repl.hh rename to src/libcmd/include/nix/cmd/repl.hh index b22fb9438..83e39727f 100644 --- a/src/libcmd/include/nix/repl.hh +++ b/src/libcmd/include/nix/cmd/repl.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/eval.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libcmd/installable-attr-path.cc b/src/libcmd/installable-attr-path.cc index dfd7bdd65..fcbfe1482 100644 --- a/src/libcmd/installable-attr-path.cc +++ b/src/libcmd/installable-attr-path.cc @@ -1,21 +1,21 @@ -#include "nix/globals.hh" -#include "nix/installable-attr-path.hh" -#include "nix/outputs-spec.hh" -#include "nix/util.hh" -#include "nix/command.hh" -#include "nix/attr-path.hh" -#include "nix/common-eval-args.hh" -#include "nix/derivations.hh" -#include "nix/eval-inline.hh" -#include "nix/eval.hh" -#include "nix/get-drvs.hh" -#include "nix/store-api.hh" -#include "nix/shared.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/installable-attr-path.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/util/util.hh" +#include "nix/cmd/command.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/store/derivations.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/store/store-api.hh" +#include "nix/main/shared.hh" #include "nix/flake/flake.hh" -#include "nix/eval-cache.hh" -#include "nix/url.hh" -#include "nix/registry.hh" -#include "nix/build-result.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/util/url.hh" +#include "nix/fetchers/registry.hh" +#include "nix/store/build-result.hh" #include #include diff --git a/src/libcmd/installable-derived-path.cc b/src/libcmd/installable-derived-path.cc index 2e53f6198..5a92f81c7 100644 --- a/src/libcmd/installable-derived-path.cc +++ b/src/libcmd/installable-derived-path.cc @@ -1,5 +1,5 @@ -#include "nix/installable-derived-path.hh" -#include "nix/derivations.hh" +#include "nix/cmd/installable-derived-path.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libcmd/installable-flake.cc b/src/libcmd/installable-flake.cc index f4c272515..83285b739 100644 --- a/src/libcmd/installable-flake.cc +++ b/src/libcmd/installable-flake.cc @@ -1,22 +1,22 @@ -#include "nix/globals.hh" -#include "nix/installable-flake.hh" -#include "nix/installable-derived-path.hh" -#include "nix/outputs-spec.hh" -#include "nix/util.hh" -#include "nix/command.hh" -#include "nix/attr-path.hh" -#include "nix/common-eval-args.hh" -#include "nix/derivations.hh" -#include "nix/eval-inline.hh" -#include "nix/eval.hh" -#include "nix/get-drvs.hh" -#include "nix/store-api.hh" -#include "nix/shared.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/installable-flake.hh" +#include "nix/cmd/installable-derived-path.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/util/util.hh" +#include "nix/cmd/command.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/store/derivations.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/store/store-api.hh" +#include "nix/main/shared.hh" #include "nix/flake/flake.hh" -#include "nix/eval-cache.hh" -#include "nix/url.hh" -#include "nix/registry.hh" -#include "nix/build-result.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/util/url.hh" +#include "nix/fetchers/registry.hh" +#include "nix/store/build-result.hh" #include #include diff --git a/src/libcmd/installable-value.cc b/src/libcmd/installable-value.cc index ac2da0ed2..d9ac3a29e 100644 --- a/src/libcmd/installable-value.cc +++ b/src/libcmd/installable-value.cc @@ -1,6 +1,6 @@ -#include "nix/installable-value.hh" -#include "nix/eval-cache.hh" -#include "nix/fetch-to-store.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/fetchers/fetch-to-store.hh" namespace nix { diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index f1eaa71e9..c010887fa 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -1,33 +1,33 @@ -#include "nix/globals.hh" -#include "nix/installables.hh" -#include "nix/installable-derived-path.hh" -#include "nix/installable-attr-path.hh" -#include "nix/installable-flake.hh" -#include "nix/outputs-spec.hh" -#include "nix/users.hh" -#include "nix/util.hh" -#include "nix/command.hh" -#include "nix/attr-path.hh" -#include "nix/common-eval-args.hh" -#include "nix/derivations.hh" -#include "nix/eval-inline.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/get-drvs.hh" -#include "nix/store-api.hh" -#include "nix/shared.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/installables.hh" +#include "nix/cmd/installable-derived-path.hh" +#include "nix/cmd/installable-attr-path.hh" +#include "nix/cmd/installable-flake.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/util/users.hh" +#include "nix/util/util.hh" +#include "nix/cmd/command.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/store/derivations.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/store/store-api.hh" +#include "nix/main/shared.hh" #include "nix/flake/flake.hh" -#include "nix/eval-cache.hh" -#include "nix/url.hh" -#include "nix/registry.hh" -#include "nix/build-result.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/util/url.hh" +#include "nix/fetchers/registry.hh" +#include "nix/store/build-result.hh" #include #include #include -#include "nix/strings-inline.hh" +#include "nix/util/strings-inline.hh" namespace nix { diff --git a/src/libcmd/legacy.cc b/src/libcmd/legacy.cc index 25da75d3f..69b066831 100644 --- a/src/libcmd/legacy.cc +++ b/src/libcmd/legacy.cc @@ -1,4 +1,4 @@ -#include "nix/legacy.hh" +#include "nix/cmd/legacy.hh" namespace nix { diff --git a/src/libcmd/markdown.cc b/src/libcmd/markdown.cc index 5670b590b..41da73c7a 100644 --- a/src/libcmd/markdown.cc +++ b/src/libcmd/markdown.cc @@ -1,8 +1,8 @@ -#include "nix/markdown.hh" -#include "nix/environment-variables.hh" -#include "nix/error.hh" -#include "nix/finally.hh" -#include "nix/terminal.hh" +#include "nix/cmd/markdown.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/error.hh" +#include "nix/util/finally.hh" +#include "nix/util/terminal.hh" #include "cmd-config-private.hh" diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build index 07747e0a3..32f44697d 100644 --- a/src/libcmd/meson.build +++ b/src/libcmd/meson.build @@ -79,7 +79,7 @@ sources = files( 'repl.cc', ) -subdir('include/nix') +subdir('include/nix/cmd') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -95,7 +95,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/cmd', preserve_path : true) libraries_private = [] diff --git a/src/libcmd/misc-store-flags.cc b/src/libcmd/misc-store-flags.cc index 70933648f..a57ad35ff 100644 --- a/src/libcmd/misc-store-flags.cc +++ b/src/libcmd/misc-store-flags.cc @@ -1,4 +1,4 @@ -#include "nix/misc-store-flags.hh" +#include "nix/cmd/misc-store-flags.hh" namespace nix::flag { diff --git a/src/libcmd/network-proxy.cc b/src/libcmd/network-proxy.cc index 31e9eb8dd..a4a89685c 100644 --- a/src/libcmd/network-proxy.cc +++ b/src/libcmd/network-proxy.cc @@ -1,8 +1,8 @@ -#include "nix/network-proxy.hh" +#include "nix/cmd/network-proxy.hh" #include -#include "nix/environment-variables.hh" +#include "nix/util/environment-variables.hh" namespace nix { diff --git a/src/libcmd/package.nix b/src/libcmd/package.nix index 5cfe550a3..be5054f64 100644 --- a/src/libcmd/package.nix +++ b/src/libcmd/package.nix @@ -46,7 +46,7 @@ mkMesonLibrary (finalAttrs: { ./.version ./meson.build ./meson.options - ./include/nix/meson.build + ./include/nix/cmd/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libcmd/repl-interacter.cc b/src/libcmd/repl-interacter.cc index 093cc2b29..0da2cc615 100644 --- a/src/libcmd/repl-interacter.cc +++ b/src/libcmd/repl-interacter.cc @@ -16,12 +16,12 @@ extern "C" { } #endif -#include "nix/signals.hh" -#include "nix/finally.hh" -#include "nix/repl-interacter.hh" -#include "nix/file-system.hh" -#include "nix/repl.hh" -#include "nix/environment-variables.hh" +#include "nix/util/signals.hh" +#include "nix/util/finally.hh" +#include "nix/cmd/repl-interacter.hh" +#include "nix/util/file-system.hh" +#include "nix/cmd/repl.hh" +#include "nix/util/environment-variables.hh" namespace nix { diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index 8bd5417d7..c5a95268b 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -2,34 +2,34 @@ #include #include -#include "nix/error.hh" -#include "nix/repl-interacter.hh" -#include "nix/repl.hh" +#include "nix/util/error.hh" +#include "nix/cmd/repl-interacter.hh" +#include "nix/cmd/repl.hh" -#include "nix/ansicolor.hh" -#include "nix/shared.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/attr-path.hh" -#include "nix/signals.hh" -#include "nix/store-api.hh" -#include "nix/log-store.hh" -#include "nix/common-eval-args.hh" -#include "nix/get-drvs.hh" -#include "nix/derivations.hh" -#include "nix/globals.hh" +#include "nix/util/ansicolor.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/attr-path.hh" +#include "nix/util/signals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/log-store.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" #include "nix/flake/flake.hh" #include "nix/flake/lockfile.hh" -#include "nix/users.hh" -#include "nix/editor-for.hh" -#include "nix/finally.hh" -#include "nix/markdown.hh" -#include "nix/local-fs-store.hh" -#include "nix/print.hh" -#include "nix/ref.hh" -#include "nix/value.hh" +#include "nix/util/users.hh" +#include "nix/cmd/editor-for.hh" +#include "nix/util/finally.hh" +#include "nix/cmd/markdown.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/expr/print.hh" +#include "nix/util/ref.hh" +#include "nix/expr/value.hh" -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libexpr-c/nix_api_expr.cc b/src/libexpr-c/nix_api_expr.cc index 0ec4a6c1e..efaebf0e7 100644 --- a/src/libexpr-c/nix_api_expr.cc +++ b/src/libexpr-c/nix_api_expr.cc @@ -2,11 +2,11 @@ #include #include -#include "nix/eval.hh" -#include "nix/eval-gc.hh" -#include "nix/globals.hh" -#include "nix/eval-settings.hh" -#include "nix/ref.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-gc.hh" +#include "nix/store/globals.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/util/ref.hh" #include "nix_api_expr.h" #include "nix_api_expr_internal.h" diff --git a/src/libexpr-c/nix_api_expr_internal.h b/src/libexpr-c/nix_api_expr_internal.h index 205a2ee62..a26595cec 100644 --- a/src/libexpr-c/nix_api_expr_internal.h +++ b/src/libexpr-c/nix_api_expr_internal.h @@ -1,12 +1,12 @@ #ifndef NIX_API_EXPR_INTERNAL_H #define NIX_API_EXPR_INTERNAL_H -#include "nix/fetch-settings.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/attr-set.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/attr-set.hh" #include "nix_api_value.h" -#include "nix/search-path.hh" +#include "nix/expr/search-path.hh" struct nix_eval_state_builder { diff --git a/src/libexpr-c/nix_api_external.cc b/src/libexpr-c/nix_api_external.cc index ab124b73b..04d2e52b5 100644 --- a/src/libexpr-c/nix_api_external.cc +++ b/src/libexpr-c/nix_api_external.cc @@ -1,8 +1,8 @@ -#include "nix/attr-set.hh" -#include "nix/config.hh" -#include "nix/eval.hh" -#include "nix/globals.hh" -#include "nix/value.hh" +#include "nix/expr/attr-set.hh" +#include "nix/util/configuration.hh" +#include "nix/expr/eval.hh" +#include "nix/store/globals.hh" +#include "nix/expr/value.hh" #include "nix_api_expr.h" #include "nix_api_expr_internal.h" @@ -10,7 +10,7 @@ #include "nix_api_util.h" #include "nix_api_util_internal.h" #include "nix_api_value.h" -#include "nix/value/context.hh" +#include "nix/expr/value/context.hh" #include diff --git a/src/libexpr-c/nix_api_value.cc b/src/libexpr-c/nix_api_value.cc index 4c2fdee42..298d94845 100644 --- a/src/libexpr-c/nix_api_value.cc +++ b/src/libexpr-c/nix_api_value.cc @@ -1,10 +1,10 @@ -#include "nix/attr-set.hh" -#include "nix/config.hh" -#include "nix/eval.hh" -#include "nix/globals.hh" -#include "nix/path.hh" -#include "nix/primops.hh" -#include "nix/value.hh" +#include "nix/expr/attr-set.hh" +#include "nix/util/configuration.hh" +#include "nix/expr/eval.hh" +#include "nix/store/globals.hh" +#include "nix/store/path.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/value.hh" #include "nix_api_expr.h" #include "nix_api_expr_internal.h" @@ -12,7 +12,7 @@ #include "nix_api_util_internal.h" #include "nix_api_store_internal.h" #include "nix_api_value.h" -#include "nix/value/context.hh" +#include "nix/expr/value/context.hh" // Internal helper functions to check [in] and [out] `Value *` parameters static const nix::Value & check_value_not_null(const nix_value * value) diff --git a/src/libexpr-test-support/include/nix/tests/libexpr.hh b/src/libexpr-test-support/include/nix/expr/tests/libexpr.hh similarity index 93% rename from src/libexpr-test-support/include/nix/tests/libexpr.hh rename to src/libexpr-test-support/include/nix/expr/tests/libexpr.hh index dfd5fbd3d..48c96ae2c 100644 --- a/src/libexpr-test-support/include/nix/tests/libexpr.hh +++ b/src/libexpr-test-support/include/nix/expr/tests/libexpr.hh @@ -4,16 +4,16 @@ #include #include -#include "nix/fetch-settings.hh" -#include "nix/value.hh" -#include "nix/nixexpr.hh" -#include "nix/nixexpr.hh" -#include "nix/eval.hh" -#include "nix/eval-gc.hh" -#include "nix/eval-inline.hh" -#include "nix/eval-settings.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/expr/value.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-gc.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-settings.hh" -#include "nix/tests/libstore.hh" +#include "nix/store/tests/libstore.hh" namespace nix { class LibExprTest : public LibStoreTest { diff --git a/src/libexpr-test-support/include/nix/expr/tests/meson.build b/src/libexpr-test-support/include/nix/expr/tests/meson.build new file mode 100644 index 000000000..710bd8d4e --- /dev/null +++ b/src/libexpr-test-support/include/nix/expr/tests/meson.build @@ -0,0 +1,9 @@ +# Public headers directory + +include_dirs = [include_directories('../../..')] + +headers = files( + 'libexpr.hh', + 'nix_api_expr.hh', + 'value/context.hh', +) diff --git a/src/libexpr-test-support/include/nix/tests/nix_api_expr.hh b/src/libexpr-test-support/include/nix/expr/tests/nix_api_expr.hh similarity index 92% rename from src/libexpr-test-support/include/nix/tests/nix_api_expr.hh rename to src/libexpr-test-support/include/nix/expr/tests/nix_api_expr.hh index e5960b177..3e5aec313 100644 --- a/src/libexpr-test-support/include/nix/tests/nix_api_expr.hh +++ b/src/libexpr-test-support/include/nix/expr/tests/nix_api_expr.hh @@ -2,7 +2,7 @@ ///@file #include "nix_api_expr.h" #include "nix_api_value.h" -#include "nix/tests/nix_api_store.hh" +#include "nix/store/tests/nix_api_store.hh" #include diff --git a/src/libexpr-test-support/include/nix/tests/value/context.hh b/src/libexpr-test-support/include/nix/expr/tests/value/context.hh similarity index 93% rename from src/libexpr-test-support/include/nix/tests/value/context.hh rename to src/libexpr-test-support/include/nix/expr/tests/value/context.hh index d98e72242..a6a851d3a 100644 --- a/src/libexpr-test-support/include/nix/tests/value/context.hh +++ b/src/libexpr-test-support/include/nix/expr/tests/value/context.hh @@ -3,7 +3,7 @@ #include -#include "nix/value/context.hh" +#include "nix/expr/value/context.hh" namespace rc { using namespace nix; diff --git a/src/libexpr-test-support/include/nix/meson.build b/src/libexpr-test-support/include/nix/meson.build deleted file mode 100644 index 9e517c7f6..000000000 --- a/src/libexpr-test-support/include/nix/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -# Public headers directory - -include_dirs = [include_directories('..')] - -headers = files( - 'tests/libexpr.hh', - 'tests/nix_api_expr.hh', - 'tests/value/context.hh', -) diff --git a/src/libexpr-test-support/meson.build b/src/libexpr-test-support/meson.build index 3409dbf20..b97f94362 100644 --- a/src/libexpr-test-support/meson.build +++ b/src/libexpr-test-support/meson.build @@ -35,7 +35,7 @@ sources = files( 'tests/value/context.cc', ) -subdir('include/nix') +subdir('include/nix/expr/tests') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -52,7 +52,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/expr/tests', preserve_path : true) libraries_private = [] diff --git a/src/libexpr-test-support/package.nix b/src/libexpr-test-support/package.nix index 5d4af1088..5cb4adaa8 100644 --- a/src/libexpr-test-support/package.nix +++ b/src/libexpr-test-support/package.nix @@ -29,7 +29,7 @@ mkMesonLibrary (finalAttrs: { ./.version ./meson.build # ./meson.options - ./include/nix/meson.build + ./include/nix/expr/tests/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libexpr-test-support/tests/value/context.cc b/src/libexpr-test-support/tests/value/context.cc index 7b2d60269..51ff1b2ae 100644 --- a/src/libexpr-test-support/tests/value/context.cc +++ b/src/libexpr-test-support/tests/value/context.cc @@ -1,7 +1,7 @@ #include -#include "nix/tests/path.hh" -#include "nix/tests/value/context.hh" +#include "nix/store/tests/path.hh" +#include "nix/expr/tests/value/context.hh" namespace rc { using namespace nix; diff --git a/src/libexpr-tests/derived-path.cc b/src/libexpr-tests/derived-path.cc index 1e427ffa5..9cc5d5371 100644 --- a/src/libexpr-tests/derived-path.cc +++ b/src/libexpr-tests/derived-path.cc @@ -2,8 +2,8 @@ #include #include -#include "nix/tests/derived-path.hh" -#include "nix/tests/libexpr.hh" +#include "nix/store/tests/derived-path.hh" +#include "nix/expr/tests/libexpr.hh" namespace nix { diff --git a/src/libexpr-tests/error_traces.cc b/src/libexpr-tests/error_traces.cc index abba15db8..d0ccd970a 100644 --- a/src/libexpr-tests/error_traces.cc +++ b/src/libexpr-tests/error_traces.cc @@ -1,7 +1,7 @@ #include #include -#include "nix/tests/libexpr.hh" +#include "nix/expr/tests/libexpr.hh" namespace nix { diff --git a/src/libexpr-tests/eval.cc b/src/libexpr-tests/eval.cc index 3bc672746..e9664dc58 100644 --- a/src/libexpr-tests/eval.cc +++ b/src/libexpr-tests/eval.cc @@ -1,8 +1,8 @@ #include #include -#include "nix/eval.hh" -#include "nix/tests/libexpr.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/tests/libexpr.hh" namespace nix { diff --git a/src/libexpr-tests/json.cc b/src/libexpr-tests/json.cc index 67fdcf209..11f31d058 100644 --- a/src/libexpr-tests/json.cc +++ b/src/libexpr-tests/json.cc @@ -1,5 +1,5 @@ -#include "nix/tests/libexpr.hh" -#include "nix/value-to-json.hh" +#include "nix/expr/tests/libexpr.hh" +#include "nix/expr/value-to-json.hh" namespace nix { // Testing the conversion to JSON diff --git a/src/libexpr-tests/main.cc b/src/libexpr-tests/main.cc index 719b5a727..6fdaa9178 100644 --- a/src/libexpr-tests/main.cc +++ b/src/libexpr-tests/main.cc @@ -1,7 +1,7 @@ #include #include -#include "nix/globals.hh" -#include "nix/logging.hh" +#include "nix/store/globals.hh" +#include "nix/util/logging.hh" using namespace nix; diff --git a/src/libexpr-tests/nix_api_expr.cc b/src/libexpr-tests/nix_api_expr.cc index 55893488f..e2eeace6c 100644 --- a/src/libexpr-tests/nix_api_expr.cc +++ b/src/libexpr-tests/nix_api_expr.cc @@ -5,9 +5,9 @@ #include "nix_api_expr.h" #include "nix_api_value.h" -#include "nix/tests/nix_api_expr.hh" -#include "nix/tests/string_callback.hh" -#include "nix/file-system.hh" +#include "nix/expr/tests/nix_api_expr.hh" +#include "nix/util/tests/string_callback.hh" +#include "nix/util/file-system.hh" #include #include diff --git a/src/libexpr-tests/nix_api_external.cc b/src/libexpr-tests/nix_api_external.cc index 49a86b826..c1deabad6 100644 --- a/src/libexpr-tests/nix_api_external.cc +++ b/src/libexpr-tests/nix_api_external.cc @@ -7,8 +7,8 @@ #include "nix_api_value.h" #include "nix_api_external.h" -#include "nix/tests/nix_api_expr.hh" -#include "nix/tests/string_callback.hh" +#include "nix/expr/tests/nix_api_expr.hh" +#include "nix/util/tests/string_callback.hh" #include diff --git a/src/libexpr-tests/nix_api_value.cc b/src/libexpr-tests/nix_api_value.cc index 0f86ba650..14f8bd0b0 100644 --- a/src/libexpr-tests/nix_api_value.cc +++ b/src/libexpr-tests/nix_api_value.cc @@ -6,8 +6,8 @@ #include "nix_api_value.h" #include "nix_api_expr_internal.h" -#include "nix/tests/nix_api_expr.hh" -#include "nix/tests/string_callback.hh" +#include "nix/expr/tests/nix_api_expr.hh" +#include "nix/util/tests/string_callback.hh" #include #include diff --git a/src/libexpr-tests/primops.cc b/src/libexpr-tests/primops.cc index 4114f08f6..66850d78b 100644 --- a/src/libexpr-tests/primops.cc +++ b/src/libexpr-tests/primops.cc @@ -1,10 +1,10 @@ #include #include -#include "nix/eval-settings.hh" -#include "nix/memory-source-accessor.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/util/memory-source-accessor.hh" -#include "nix/tests/libexpr.hh" +#include "nix/expr/tests/libexpr.hh" namespace nix { class CaptureLogger : public Logger diff --git a/src/libexpr-tests/search-path.cc b/src/libexpr-tests/search-path.cc index 72f233597..792bb0812 100644 --- a/src/libexpr-tests/search-path.cc +++ b/src/libexpr-tests/search-path.cc @@ -1,7 +1,7 @@ #include #include -#include "nix/search-path.hh" +#include "nix/expr/search-path.hh" namespace nix { diff --git a/src/libexpr-tests/trivial.cc b/src/libexpr-tests/trivial.cc index 4ddd24d12..50a8f29f8 100644 --- a/src/libexpr-tests/trivial.cc +++ b/src/libexpr-tests/trivial.cc @@ -1,4 +1,4 @@ -#include "nix/tests/libexpr.hh" +#include "nix/expr/tests/libexpr.hh" namespace nix { // Testing of trivial expressions diff --git a/src/libexpr-tests/value/context.cc b/src/libexpr-tests/value/context.cc index bf3b501f4..97cd50f75 100644 --- a/src/libexpr-tests/value/context.cc +++ b/src/libexpr-tests/value/context.cc @@ -2,9 +2,9 @@ #include #include -#include "nix/tests/path.hh" -#include "nix/tests/libexpr.hh" -#include "nix/tests/value/context.hh" +#include "nix/store/tests/path.hh" +#include "nix/expr/tests/libexpr.hh" +#include "nix/expr/tests/value/context.hh" namespace nix { diff --git a/src/libexpr-tests/value/print.cc b/src/libexpr-tests/value/print.cc index 8590f9aac..d337a29a3 100644 --- a/src/libexpr-tests/value/print.cc +++ b/src/libexpr-tests/value/print.cc @@ -1,7 +1,7 @@ -#include "nix/tests/libexpr.hh" +#include "nix/expr/tests/libexpr.hh" -#include "nix/value.hh" -#include "nix/print.hh" +#include "nix/expr/value.hh" +#include "nix/expr/print.hh" namespace nix { diff --git a/src/libexpr-tests/value/value.cc b/src/libexpr-tests/value/value.cc index 9f91f8ff5..63501dd49 100644 --- a/src/libexpr-tests/value/value.cc +++ b/src/libexpr-tests/value/value.cc @@ -1,6 +1,6 @@ -#include "nix/value.hh" +#include "nix/expr/value.hh" -#include "nix/tests/libstore.hh" +#include "nix/store/tests/libstore.hh" namespace nix { diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index 8dde64790..cee805d14 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -1,5 +1,5 @@ -#include "nix/attr-path.hh" -#include "nix/eval-inline.hh" +#include "nix/expr/attr-path.hh" +#include "nix/expr/eval-inline.hh" namespace nix { diff --git a/src/libexpr/attr-set.cc b/src/libexpr/attr-set.cc index c6fc9f32a..06e245aea 100644 --- a/src/libexpr/attr-set.cc +++ b/src/libexpr/attr-set.cc @@ -1,5 +1,5 @@ -#include "nix/attr-set.hh" -#include "nix/eval-inline.hh" +#include "nix/expr/attr-set.hh" +#include "nix/expr/eval-inline.hh" #include diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc index 5491f5d4c..30aa6076a 100644 --- a/src/libexpr/eval-cache.cc +++ b/src/libexpr/eval-cache.cc @@ -1,11 +1,11 @@ -#include "nix/users.hh" -#include "nix/eval-cache.hh" -#include "nix/sqlite.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/store-api.hh" +#include "nix/util/users.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/store/sqlite.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/store-api.hh" // Need specialization involving `SymbolStr` just in this one module. -#include "nix/strings-inline.hh" +#include "nix/util/strings-inline.hh" namespace nix::eval_cache { diff --git a/src/libexpr/eval-error.cc b/src/libexpr/eval-error.cc index d80fa473e..eac135008 100644 --- a/src/libexpr/eval-error.cc +++ b/src/libexpr/eval-error.cc @@ -1,6 +1,6 @@ -#include "nix/eval-error.hh" -#include "nix/eval.hh" -#include "nix/value.hh" +#include "nix/expr/eval-error.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/value.hh" namespace nix { diff --git a/src/libexpr/eval-gc.cc b/src/libexpr/eval-gc.cc index 1166548f6..6fc5ac334 100644 --- a/src/libexpr/eval-gc.cc +++ b/src/libexpr/eval-gc.cc @@ -1,9 +1,9 @@ -#include "nix/error.hh" -#include "nix/environment-variables.hh" -#include "nix/eval-settings.hh" -#include "nix/config-global.hh" -#include "nix/serialise.hh" -#include "nix/eval-gc.hh" +#include "nix/util/error.hh" +#include "nix/util/environment-variables.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/util/config-global.hh" +#include "nix/util/serialise.hh" +#include "nix/expr/eval-gc.hh" #include "expr-config-private.hh" diff --git a/src/libexpr/eval-settings.cc b/src/libexpr/eval-settings.cc index 458507db8..659c01a9e 100644 --- a/src/libexpr/eval-settings.cc +++ b/src/libexpr/eval-settings.cc @@ -1,8 +1,8 @@ -#include "nix/users.hh" -#include "nix/globals.hh" -#include "nix/profiles.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" +#include "nix/util/users.hh" +#include "nix/store/globals.hh" +#include "nix/store/profiles.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" namespace nix { diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 41b64a90a..624d7d4aa 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1,24 +1,24 @@ -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/primops.hh" -#include "nix/print-options.hh" -#include "nix/exit.hh" -#include "nix/types.hh" -#include "nix/util.hh" -#include "nix/store-api.hh" -#include "nix/derivations.hh" -#include "nix/downstream-placeholder.hh" -#include "nix/eval-inline.hh" -#include "nix/filetransfer.hh" -#include "nix/function-trace.hh" -#include "nix/profiles.hh" -#include "nix/print.hh" -#include "nix/filtering-source-accessor.hh" -#include "nix/memory-source-accessor.hh" -#include "nix/gc-small-vector.hh" -#include "nix/url.hh" -#include "nix/fetch-to-store.hh" -#include "nix/tarball.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/print-options.hh" +#include "nix/util/exit.hh" +#include "nix/util/types.hh" +#include "nix/util/util.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/downstream-placeholder.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/filetransfer.hh" +#include "nix/expr/function-trace.hh" +#include "nix/store/profiles.hh" +#include "nix/expr/print.hh" +#include "nix/fetchers/filtering-source-accessor.hh" +#include "nix/util/memory-source-accessor.hh" +#include "nix/expr/gc-small-vector.hh" +#include "nix/util/url.hh" +#include "nix/fetchers/fetch-to-store.hh" +#include "nix/fetchers/tarball.hh" #include "parser-tab.hh" @@ -39,7 +39,7 @@ # include #endif -#include "nix/strings-inline.hh" +#include "nix/util/strings-inline.hh" using json = nlohmann::json; diff --git a/src/libexpr/function-trace.cc b/src/libexpr/function-trace.cc index 9c6e54e4b..1dce51726 100644 --- a/src/libexpr/function-trace.cc +++ b/src/libexpr/function-trace.cc @@ -1,5 +1,5 @@ -#include "nix/function-trace.hh" -#include "nix/logging.hh" +#include "nix/expr/function-trace.hh" +#include "nix/util/logging.hh" namespace nix { diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 61b44aa17..f15ad4d73 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -1,8 +1,8 @@ -#include "nix/get-drvs.hh" -#include "nix/eval-inline.hh" -#include "nix/derivations.hh" -#include "nix/store-api.hh" -#include "nix/path-with-outputs.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/path-with-outputs.hh" #include #include diff --git a/src/libexpr/include/nix/attr-path.hh b/src/libexpr/include/nix/expr/attr-path.hh similarity index 95% rename from src/libexpr/include/nix/attr-path.hh rename to src/libexpr/include/nix/expr/attr-path.hh index 06d00efc2..66a3f4e00 100644 --- a/src/libexpr/include/nix/attr-path.hh +++ b/src/libexpr/include/nix/expr/attr-path.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/eval.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/include/nix/attr-set.hh b/src/libexpr/include/nix/expr/attr-set.hh similarity index 98% rename from src/libexpr/include/nix/attr-set.hh rename to src/libexpr/include/nix/expr/attr-set.hh index 93360e4e3..283786f4d 100644 --- a/src/libexpr/include/nix/attr-set.hh +++ b/src/libexpr/include/nix/expr/attr-set.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/nixexpr.hh" -#include "nix/symbol-table.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/symbol-table.hh" #include diff --git a/src/libexpr/include/nix/eval-cache.hh b/src/libexpr/include/nix/expr/eval-cache.hh similarity index 97% rename from src/libexpr/include/nix/eval-cache.hh rename to src/libexpr/include/nix/expr/eval-cache.hh index 2d70aa99e..31873f7a3 100644 --- a/src/libexpr/include/nix/eval-cache.hh +++ b/src/libexpr/include/nix/expr/eval-cache.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/sync.hh" -#include "nix/hash.hh" -#include "nix/eval.hh" +#include "nix/util/sync.hh" +#include "nix/util/hash.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/include/nix/eval-error.hh b/src/libexpr/include/nix/expr/eval-error.hh similarity index 98% rename from src/libexpr/include/nix/eval-error.hh rename to src/libexpr/include/nix/expr/eval-error.hh index ebed23dbb..6f4c37f90 100644 --- a/src/libexpr/include/nix/eval-error.hh +++ b/src/libexpr/include/nix/expr/eval-error.hh @@ -1,7 +1,7 @@ #pragma once -#include "nix/error.hh" -#include "nix/pos-idx.hh" +#include "nix/util/error.hh" +#include "nix/util/pos-idx.hh" namespace nix { diff --git a/src/libexpr/include/nix/eval-gc.hh b/src/libexpr/include/nix/expr/eval-gc.hh similarity index 96% rename from src/libexpr/include/nix/eval-gc.hh rename to src/libexpr/include/nix/expr/eval-gc.hh index 8f28fe0e2..25144d40c 100644 --- a/src/libexpr/include/nix/eval-gc.hh +++ b/src/libexpr/include/nix/expr/eval-gc.hh @@ -4,7 +4,7 @@ #include // For `NIX_USE_BOEHMGC`, and if that's set, `GC_THREADS` -#include "nix/expr-config.hh" +#include "nix/expr/config.hh" #if NIX_USE_BOEHMGC diff --git a/src/libexpr/include/nix/eval-inline.hh b/src/libexpr/include/nix/expr/eval-inline.hh similarity index 96% rename from src/libexpr/include/nix/eval-inline.hh rename to src/libexpr/include/nix/expr/eval-inline.hh index 09a85db06..6e5759c0b 100644 --- a/src/libexpr/include/nix/eval-inline.hh +++ b/src/libexpr/include/nix/expr/eval-inline.hh @@ -1,13 +1,13 @@ #pragma once ///@file -#include "nix/print.hh" -#include "nix/eval.hh" -#include "nix/eval-error.hh" -#include "nix/eval-settings.hh" +#include "nix/expr/print.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-error.hh" +#include "nix/expr/eval-settings.hh" // For `NIX_USE_BOEHMGC`, and if that's set, `GC_THREADS` -#include "nix/expr-config.hh" +#include "nix/expr/config.hh" namespace nix { diff --git a/src/libexpr/include/nix/eval-settings.hh b/src/libexpr/include/nix/expr/eval-settings.hh similarity index 99% rename from src/libexpr/include/nix/eval-settings.hh rename to src/libexpr/include/nix/expr/eval-settings.hh index 48d8a544b..8d3db59b3 100644 --- a/src/libexpr/include/nix/eval-settings.hh +++ b/src/libexpr/include/nix/expr/eval-settings.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/config.hh" -#include "nix/source-path.hh" +#include "nix/util/configuration.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libexpr/include/nix/eval.hh b/src/libexpr/include/nix/expr/eval.hh similarity index 98% rename from src/libexpr/include/nix/eval.hh rename to src/libexpr/include/nix/expr/eval.hh index 7a3ec065d..0933c6e89 100644 --- a/src/libexpr/include/nix/eval.hh +++ b/src/libexpr/include/nix/expr/eval.hh @@ -1,23 +1,23 @@ #pragma once ///@file -#include "nix/attr-set.hh" -#include "nix/eval-error.hh" -#include "nix/types.hh" -#include "nix/value.hh" -#include "nix/nixexpr.hh" -#include "nix/symbol-table.hh" -#include "nix/config.hh" -#include "nix/experimental-features.hh" -#include "nix/position.hh" -#include "nix/pos-table.hh" -#include "nix/source-accessor.hh" -#include "nix/search-path.hh" -#include "nix/repl-exit-status.hh" -#include "nix/ref.hh" +#include "nix/expr/attr-set.hh" +#include "nix/expr/eval-error.hh" +#include "nix/util/types.hh" +#include "nix/expr/value.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/symbol-table.hh" +#include "nix/util/configuration.hh" +#include "nix/util/experimental-features.hh" +#include "nix/util/position.hh" +#include "nix/util/pos-table.hh" +#include "nix/util/source-accessor.hh" +#include "nix/expr/search-path.hh" +#include "nix/expr/repl-exit-status.hh" +#include "nix/util/ref.hh" // For `NIX_USE_BOEHMGC`, and if that's set, `GC_THREADS` -#include "nix/expr-config.hh" +#include "nix/expr/config.hh" #include #include @@ -947,4 +947,4 @@ bool isAllowedURI(std::string_view uri, const Strings & allowedPaths); } -#include "nix/eval-inline.hh" +#include "nix/expr/eval-inline.hh" diff --git a/src/libexpr/include/nix/function-trace.hh b/src/libexpr/include/nix/expr/function-trace.hh similarity index 86% rename from src/libexpr/include/nix/function-trace.hh rename to src/libexpr/include/nix/expr/function-trace.hh index 59743fe79..dc92d4b5c 100644 --- a/src/libexpr/include/nix/function-trace.hh +++ b/src/libexpr/include/nix/expr/function-trace.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/eval.hh" +#include "nix/expr/eval.hh" #include diff --git a/src/libexpr/include/nix/gc-small-vector.hh b/src/libexpr/include/nix/expr/gc-small-vector.hh similarity index 95% rename from src/libexpr/include/nix/gc-small-vector.hh rename to src/libexpr/include/nix/expr/gc-small-vector.hh index 2becffe7c..ad4503de7 100644 --- a/src/libexpr/include/nix/gc-small-vector.hh +++ b/src/libexpr/include/nix/expr/gc-small-vector.hh @@ -2,7 +2,7 @@ #include -#include "nix/value.hh" +#include "nix/expr/value.hh" namespace nix { diff --git a/src/libexpr/include/nix/get-drvs.hh b/src/libexpr/include/nix/expr/get-drvs.hh similarity index 97% rename from src/libexpr/include/nix/get-drvs.hh rename to src/libexpr/include/nix/expr/get-drvs.hh index aeb70c79e..0787c44a8 100644 --- a/src/libexpr/include/nix/get-drvs.hh +++ b/src/libexpr/include/nix/expr/get-drvs.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/eval.hh" -#include "nix/path.hh" +#include "nix/expr/eval.hh" +#include "nix/store/path.hh" #include #include diff --git a/src/libexpr/include/nix/json-to-value.hh b/src/libexpr/include/nix/expr/json-to-value.hh similarity index 87% rename from src/libexpr/include/nix/json-to-value.hh rename to src/libexpr/include/nix/expr/json-to-value.hh index a2e0d303d..b01d63bfe 100644 --- a/src/libexpr/include/nix/json-to-value.hh +++ b/src/libexpr/include/nix/expr/json-to-value.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/error.hh" +#include "nix/util/error.hh" #include diff --git a/src/libexpr/include/nix/lexer-helpers.hh b/src/libexpr/include/nix/expr/lexer-helpers.hh similarity index 100% rename from src/libexpr/include/nix/lexer-helpers.hh rename to src/libexpr/include/nix/expr/lexer-helpers.hh diff --git a/src/libexpr/include/nix/meson.build b/src/libexpr/include/nix/expr/meson.build similarity index 90% rename from src/libexpr/include/nix/meson.build rename to src/libexpr/include/nix/expr/meson.build index 89422004a..01275e52e 100644 --- a/src/libexpr/include/nix/meson.build +++ b/src/libexpr/include/nix/expr/meson.build @@ -1,10 +1,10 @@ # Public headers directory -include_dirs = [include_directories('..')] +include_dirs = [include_directories('../..')] config_pub_h = configure_file( configuration : configdata_pub, - output : 'expr-config.hh', + output : 'config.hh', ) headers = [config_pub_h] + files( diff --git a/src/libexpr/include/nix/nixexpr.hh b/src/libexpr/include/nix/expr/nixexpr.hh similarity index 99% rename from src/libexpr/include/nix/nixexpr.hh rename to src/libexpr/include/nix/expr/nixexpr.hh index deb26dd29..9409bdca8 100644 --- a/src/libexpr/include/nix/nixexpr.hh +++ b/src/libexpr/include/nix/expr/nixexpr.hh @@ -4,10 +4,10 @@ #include #include -#include "nix/value.hh" -#include "nix/symbol-table.hh" -#include "nix/eval-error.hh" -#include "nix/pos-idx.hh" +#include "nix/expr/value.hh" +#include "nix/expr/symbol-table.hh" +#include "nix/expr/eval-error.hh" +#include "nix/util/pos-idx.hh" namespace nix { diff --git a/src/libexpr/include/nix/parser-state.hh b/src/libexpr/include/nix/expr/parser-state.hh similarity index 99% rename from src/libexpr/include/nix/parser-state.hh rename to src/libexpr/include/nix/expr/parser-state.hh index aa3c2455d..0505913d0 100644 --- a/src/libexpr/include/nix/parser-state.hh +++ b/src/libexpr/include/nix/expr/parser-state.hh @@ -3,7 +3,7 @@ #include -#include "nix/eval.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libexpr/include/nix/primops.hh b/src/libexpr/include/nix/expr/primops.hh similarity index 98% rename from src/libexpr/include/nix/primops.hh rename to src/libexpr/include/nix/expr/primops.hh index 75c6f0d46..f0742a138 100644 --- a/src/libexpr/include/nix/primops.hh +++ b/src/libexpr/include/nix/expr/primops.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/eval.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/include/nix/print-ambiguous.hh b/src/libexpr/include/nix/expr/print-ambiguous.hh similarity index 95% rename from src/libexpr/include/nix/print-ambiguous.hh rename to src/libexpr/include/nix/expr/print-ambiguous.hh index 06f4e805c..09a849c49 100644 --- a/src/libexpr/include/nix/print-ambiguous.hh +++ b/src/libexpr/include/nix/expr/print-ambiguous.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/value.hh" +#include "nix/expr/value.hh" namespace nix { diff --git a/src/libexpr/include/nix/print-options.hh b/src/libexpr/include/nix/expr/print-options.hh similarity index 100% rename from src/libexpr/include/nix/print-options.hh rename to src/libexpr/include/nix/expr/print-options.hh diff --git a/src/libexpr/include/nix/print.hh b/src/libexpr/include/nix/expr/print.hh similarity index 97% rename from src/libexpr/include/nix/print.hh rename to src/libexpr/include/nix/expr/print.hh index 09405e8f0..ac9bf23a4 100644 --- a/src/libexpr/include/nix/print.hh +++ b/src/libexpr/include/nix/expr/print.hh @@ -9,8 +9,8 @@ #include -#include "nix/fmt.hh" -#include "nix/print-options.hh" +#include "nix/util/fmt.hh" +#include "nix/expr/print-options.hh" namespace nix { diff --git a/src/libexpr/include/nix/repl-exit-status.hh b/src/libexpr/include/nix/expr/repl-exit-status.hh similarity index 100% rename from src/libexpr/include/nix/repl-exit-status.hh rename to src/libexpr/include/nix/expr/repl-exit-status.hh diff --git a/src/libexpr/include/nix/search-path.hh b/src/libexpr/include/nix/expr/search-path.hh similarity index 97% rename from src/libexpr/include/nix/search-path.hh rename to src/libexpr/include/nix/expr/search-path.hh index 22a97b5f3..202527fd2 100644 --- a/src/libexpr/include/nix/search-path.hh +++ b/src/libexpr/include/nix/expr/search-path.hh @@ -3,8 +3,8 @@ #include -#include "nix/types.hh" -#include "nix/comparator.hh" +#include "nix/util/types.hh" +#include "nix/util/comparator.hh" namespace nix { diff --git a/src/libexpr/include/nix/symbol-table.hh b/src/libexpr/include/nix/expr/symbol-table.hh similarity index 97% rename from src/libexpr/include/nix/symbol-table.hh rename to src/libexpr/include/nix/expr/symbol-table.hh index b55674b12..018465bf5 100644 --- a/src/libexpr/include/nix/symbol-table.hh +++ b/src/libexpr/include/nix/expr/symbol-table.hh @@ -5,9 +5,9 @@ #include #include -#include "nix/types.hh" -#include "nix/chunked-vector.hh" -#include "nix/error.hh" +#include "nix/util/types.hh" +#include "nix/util/chunked-vector.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libexpr/include/nix/value-to-json.hh b/src/libexpr/include/nix/expr/value-to-json.hh similarity index 88% rename from src/libexpr/include/nix/value-to-json.hh rename to src/libexpr/include/nix/expr/value-to-json.hh index 9875c83c6..1a6911347 100644 --- a/src/libexpr/include/nix/value-to-json.hh +++ b/src/libexpr/include/nix/expr/value-to-json.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/nixexpr.hh" -#include "nix/eval.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/include/nix/value-to-xml.hh b/src/libexpr/include/nix/expr/value-to-xml.hh similarity index 79% rename from src/libexpr/include/nix/value-to-xml.hh rename to src/libexpr/include/nix/expr/value-to-xml.hh index 3e9dce4d6..e22325de5 100644 --- a/src/libexpr/include/nix/value-to-xml.hh +++ b/src/libexpr/include/nix/expr/value-to-xml.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/nixexpr.hh" -#include "nix/eval.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/include/nix/value.hh b/src/libexpr/include/nix/expr/value.hh similarity index 98% rename from src/libexpr/include/nix/value.hh rename to src/libexpr/include/nix/expr/value.hh index 45155b3d4..e9cc1cd3f 100644 --- a/src/libexpr/include/nix/value.hh +++ b/src/libexpr/include/nix/expr/value.hh @@ -4,12 +4,12 @@ #include #include -#include "nix/eval-gc.hh" -#include "nix/symbol-table.hh" -#include "nix/value/context.hh" -#include "nix/source-path.hh" -#include "nix/print-options.hh" -#include "nix/checked-arithmetic.hh" +#include "nix/expr/eval-gc.hh" +#include "nix/expr/symbol-table.hh" +#include "nix/expr/value/context.hh" +#include "nix/util/source-path.hh" +#include "nix/expr/print-options.hh" +#include "nix/util/checked-arithmetic.hh" #include diff --git a/src/libexpr/include/nix/value/context.hh b/src/libexpr/include/nix/expr/value/context.hh similarity index 94% rename from src/libexpr/include/nix/value/context.hh rename to src/libexpr/include/nix/expr/value/context.hh index f996cce42..f2de184ea 100644 --- a/src/libexpr/include/nix/value/context.hh +++ b/src/libexpr/include/nix/expr/value/context.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/comparator.hh" -#include "nix/derived-path.hh" -#include "nix/variant-wrapper.hh" +#include "nix/util/comparator.hh" +#include "nix/store/derived-path.hh" +#include "nix/util/variant-wrapper.hh" #include diff --git a/src/libexpr/json-to-value.cc b/src/libexpr/json-to-value.cc index d5da3f2b1..e38ac7db4 100644 --- a/src/libexpr/json-to-value.cc +++ b/src/libexpr/json-to-value.cc @@ -1,6 +1,6 @@ -#include "nix/json-to-value.hh" -#include "nix/value.hh" -#include "nix/eval.hh" +#include "nix/expr/json-to-value.hh" +#include "nix/expr/value.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/lexer-helpers.cc b/src/libexpr/lexer-helpers.cc index 9eb4502fc..4b27393bb 100644 --- a/src/libexpr/lexer-helpers.cc +++ b/src/libexpr/lexer-helpers.cc @@ -1,7 +1,7 @@ #include "lexer-tab.hh" #include "parser-tab.hh" -#include "nix/lexer-helpers.hh" +#include "nix/expr/lexer-helpers.hh" void nix::lexer::internal::initLoc(YYLTYPE * loc) { diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l index c8a5ec9fd..511c8e47b 100644 --- a/src/libexpr/lexer.l +++ b/src/libexpr/lexer.l @@ -16,7 +16,7 @@ %top { #include "parser-tab.hh" // YYSTYPE -#include "nix/parser-state.hh" +#include "nix/expr/parser-state.hh" } %{ @@ -24,9 +24,9 @@ #pragma clang diagnostic ignored "-Wunneeded-internal-declaration" #endif -#include "nix/nixexpr.hh" +#include "nix/expr/nixexpr.hh" #include "parser-tab.hh" -#include "nix/lexer-helpers.hh" +#include "nix/expr/lexer-helpers.hh" namespace nix { struct LexerState; diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build index 02873f4db..2e773938d 100644 --- a/src/libexpr/meson.build +++ b/src/libexpr/meson.build @@ -156,7 +156,7 @@ sources = files( 'value/context.cc', ) -subdir('include/nix') +subdir('include/nix/expr') subdir('primops') @@ -177,7 +177,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/expr', preserve_path : true) libraries_private = [] diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index e5289de6a..1a71096d4 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -1,13 +1,13 @@ -#include "nix/nixexpr.hh" -#include "nix/eval.hh" -#include "nix/symbol-table.hh" -#include "nix/util.hh" -#include "nix/print.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/symbol-table.hh" +#include "nix/util/util.hh" +#include "nix/expr/print.hh" #include #include -#include "nix/strings-inline.hh" +#include "nix/util/strings-inline.hh" namespace nix { diff --git a/src/libexpr/package.nix b/src/libexpr/package.nix index 8f309b14e..50161c58b 100644 --- a/src/libexpr/package.nix +++ b/src/libexpr/package.nix @@ -48,7 +48,7 @@ mkMesonLibrary (finalAttrs: { ./meson.build ./meson.options ./primops/meson.build - ./include/nix/meson.build + ./include/nix/expr/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ./lexer.l diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 27fec4c51..8878b86c2 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -17,14 +17,14 @@ #include -#include "nix/finally.hh" -#include "nix/util.hh" -#include "nix/users.hh" +#include "nix/util/finally.hh" +#include "nix/util/util.hh" +#include "nix/util/users.hh" -#include "nix/nixexpr.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/parser-state.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/parser-state.hh" // Bison seems to have difficulty growing the parser stack when using C++ with // a custom location type. This undocumented macro tells Bison that our @@ -519,7 +519,7 @@ formal %% -#include "nix/eval.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libexpr/paths.cc b/src/libexpr/paths.cc index 5aae69f9d..c5107de3a 100644 --- a/src/libexpr/paths.cc +++ b/src/libexpr/paths.cc @@ -1,5 +1,5 @@ -#include "nix/store-api.hh" -#include "nix/eval.hh" +#include "nix/store/store-api.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 2e2f2c18e..5e331f84d 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1,19 +1,19 @@ -#include "nix/derivations.hh" -#include "nix/downstream-placeholder.hh" -#include "nix/eval-inline.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/gc-small-vector.hh" -#include "nix/json-to-value.hh" -#include "nix/names.hh" -#include "nix/path-references.hh" -#include "nix/store-api.hh" -#include "nix/util.hh" -#include "nix/processes.hh" -#include "nix/value-to-json.hh" -#include "nix/value-to-xml.hh" -#include "nix/primops.hh" -#include "nix/fetch-to-store.hh" +#include "nix/store/derivations.hh" +#include "nix/store/downstream-placeholder.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/gc-small-vector.hh" +#include "nix/expr/json-to-value.hh" +#include "nix/store/names.hh" +#include "nix/store/path-references.hh" +#include "nix/store/store-api.hh" +#include "nix/util/util.hh" +#include "nix/util/processes.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/expr/value-to-xml.hh" +#include "nix/expr/primops.hh" +#include "nix/fetchers/fetch-to-store.hh" #include #include diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc index 832d17cbb..6a7284e05 100644 --- a/src/libexpr/primops/context.cc +++ b/src/libexpr/primops/context.cc @@ -1,7 +1,7 @@ -#include "nix/primops.hh" -#include "nix/eval-inline.hh" -#include "nix/derivations.hh" -#include "nix/store-api.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index fc48c54ee..d28680ae5 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -1,8 +1,8 @@ -#include "nix/primops.hh" -#include "nix/store-api.hh" -#include "nix/realisation.hh" -#include "nix/make-content-addressed.hh" -#include "nix/url.hh" +#include "nix/expr/primops.hh" +#include "nix/store/store-api.hh" +#include "nix/store/realisation.hh" +#include "nix/store/make-content-addressed.hh" +#include "nix/util/url.hh" namespace nix { diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index 59698552e..189bd1f73 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -1,10 +1,10 @@ -#include "nix/primops.hh" -#include "nix/eval-inline.hh" -#include "nix/eval-settings.hh" -#include "nix/store-api.hh" -#include "nix/fetchers.hh" -#include "nix/url.hh" -#include "nix/url-parts.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/store/store-api.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" namespace nix { diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index b14d54113..0be9f4bdc 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -1,15 +1,15 @@ -#include "nix/attrs.hh" -#include "nix/primops.hh" -#include "nix/eval-inline.hh" -#include "nix/eval-settings.hh" -#include "nix/store-api.hh" -#include "nix/fetchers.hh" -#include "nix/filetransfer.hh" -#include "nix/registry.hh" -#include "nix/tarball.hh" -#include "nix/url.hh" -#include "nix/value-to-json.hh" -#include "nix/fetch-to-store.hh" +#include "nix/fetchers/attrs.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/store/store-api.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/store/filetransfer.hh" +#include "nix/fetchers/registry.hh" +#include "nix/fetchers/tarball.hh" +#include "nix/util/url.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/fetchers/fetch-to-store.hh" #include diff --git a/src/libexpr/primops/fromTOML.cc b/src/libexpr/primops/fromTOML.cc index 05fe2e7bd..2a29e0424 100644 --- a/src/libexpr/primops/fromTOML.cc +++ b/src/libexpr/primops/fromTOML.cc @@ -1,5 +1,5 @@ -#include "nix/primops.hh" -#include "nix/eval-inline.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" #include diff --git a/src/libexpr/print-ambiguous.cc b/src/libexpr/print-ambiguous.cc index b275e1e5c..0646783c2 100644 --- a/src/libexpr/print-ambiguous.cc +++ b/src/libexpr/print-ambiguous.cc @@ -1,7 +1,7 @@ -#include "nix/print-ambiguous.hh" -#include "nix/print.hh" -#include "nix/signals.hh" -#include "nix/eval.hh" +#include "nix/expr/print-ambiguous.hh" +#include "nix/expr/print.hh" +#include "nix/util/signals.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libexpr/print.cc b/src/libexpr/print.cc index 39f97e68b..06bae9c5c 100644 --- a/src/libexpr/print.cc +++ b/src/libexpr/print.cc @@ -2,13 +2,13 @@ #include #include -#include "nix/print.hh" -#include "nix/ansicolor.hh" -#include "nix/signals.hh" -#include "nix/store-api.hh" -#include "nix/terminal.hh" -#include "nix/english.hh" -#include "nix/eval.hh" +#include "nix/expr/print.hh" +#include "nix/util/ansicolor.hh" +#include "nix/util/signals.hh" +#include "nix/store/store-api.hh" +#include "nix/util/terminal.hh" +#include "nix/util/english.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libexpr/search-path.cc b/src/libexpr/search-path.cc index 8c33430f1..76aecd4e5 100644 --- a/src/libexpr/search-path.cc +++ b/src/libexpr/search-path.cc @@ -1,4 +1,4 @@ -#include "nix/search-path.hh" +#include "nix/expr/search-path.hh" namespace nix { diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc index 846776aed..51652db1f 100644 --- a/src/libexpr/value-to-json.cc +++ b/src/libexpr/value-to-json.cc @@ -1,7 +1,7 @@ -#include "nix/value-to-json.hh" -#include "nix/eval-inline.hh" -#include "nix/store-api.hh" -#include "nix/signals.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/store-api.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc index e4df226a4..e26fff71b 100644 --- a/src/libexpr/value-to-xml.cc +++ b/src/libexpr/value-to-xml.cc @@ -1,7 +1,7 @@ -#include "nix/value-to-xml.hh" -#include "nix/xml-writer.hh" -#include "nix/eval-inline.hh" -#include "nix/signals.hh" +#include "nix/expr/value-to-xml.hh" +#include "nix/util/xml-writer.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/util/signals.hh" #include diff --git a/src/libexpr/value/context.cc b/src/libexpr/value/context.cc index 2052e193a..40d08da59 100644 --- a/src/libexpr/value/context.cc +++ b/src/libexpr/value/context.cc @@ -1,5 +1,5 @@ -#include "nix/util.hh" -#include "nix/value/context.hh" +#include "nix/util/util.hh" +#include "nix/expr/value/context.hh" #include diff --git a/src/libfetchers-tests/access-tokens.cc b/src/libfetchers-tests/access-tokens.cc index 25c3e6b5f..93043ba3e 100644 --- a/src/libfetchers-tests/access-tokens.cc +++ b/src/libfetchers-tests/access-tokens.cc @@ -1,10 +1,10 @@ #include #include -#include "nix/fetchers.hh" -#include "nix/fetch-settings.hh" -#include "nix/json-utils.hh" -#include "nix/tests/characterization.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/util/json-utils.hh" +#include "nix/util/tests/characterization.hh" namespace nix::fetchers { diff --git a/src/libfetchers-tests/git-utils.cc b/src/libfetchers-tests/git-utils.cc index e41db0b5b..ceac809de 100644 --- a/src/libfetchers-tests/git-utils.cc +++ b/src/libfetchers-tests/git-utils.cc @@ -1,13 +1,13 @@ -#include "nix/git-utils.hh" -#include "nix/file-system.hh" +#include "nix/fetchers/git-utils.hh" +#include "nix/util/file-system.hh" #include #include #include #include #include -#include "nix/fs-sink.hh" -#include "nix/serialise.hh" -#include "nix/git-lfs-fetch.hh" +#include "nix/util/fs-sink.hh" +#include "nix/util/serialise.hh" +#include "nix/fetchers/git-lfs-fetch.hh" namespace nix { diff --git a/src/libfetchers-tests/public-key.cc b/src/libfetchers-tests/public-key.cc index 98965cf79..39a7cf4bd 100644 --- a/src/libfetchers-tests/public-key.cc +++ b/src/libfetchers-tests/public-key.cc @@ -1,8 +1,8 @@ #include -#include "nix/fetchers.hh" -#include "nix/json-utils.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/util/json-utils.hh" #include -#include "nix/tests/characterization.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libfetchers/attrs.cc b/src/libfetchers/attrs.cc index 68e5e932b..47f6aa8c5 100644 --- a/src/libfetchers/attrs.cc +++ b/src/libfetchers/attrs.cc @@ -1,5 +1,5 @@ -#include "nix/attrs.hh" -#include "nix/fetchers.hh" +#include "nix/fetchers/attrs.hh" +#include "nix/fetchers/fetchers.hh" #include diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc index 089c8d6f3..d369d213f 100644 --- a/src/libfetchers/cache.cc +++ b/src/libfetchers/cache.cc @@ -1,8 +1,8 @@ -#include "nix/cache.hh" -#include "nix/users.hh" -#include "nix/sqlite.hh" -#include "nix/sync.hh" -#include "nix/store-api.hh" +#include "nix/fetchers/cache.hh" +#include "nix/util/users.hh" +#include "nix/store/sqlite.hh" +#include "nix/util/sync.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libfetchers/fetch-settings.cc b/src/libfetchers/fetch-settings.cc index bdd095538..4b4e4e29d 100644 --- a/src/libfetchers/fetch-settings.cc +++ b/src/libfetchers/fetch-settings.cc @@ -1,4 +1,4 @@ -#include "nix/fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" namespace nix::fetchers { diff --git a/src/libfetchers/fetch-to-store.cc b/src/libfetchers/fetch-to-store.cc index 2be08feaf..ea33922b6 100644 --- a/src/libfetchers/fetch-to-store.cc +++ b/src/libfetchers/fetch-to-store.cc @@ -1,6 +1,6 @@ -#include "nix/fetch-to-store.hh" -#include "nix/fetchers.hh" -#include "nix/cache.hh" +#include "nix/fetchers/fetch-to-store.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/cache.hh" namespace nix { diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc index 068a6722f..8b1b2b0cb 100644 --- a/src/libfetchers/fetchers.cc +++ b/src/libfetchers/fetchers.cc @@ -1,10 +1,10 @@ -#include "nix/fetchers.hh" -#include "nix/store-api.hh" -#include "nix/source-path.hh" -#include "nix/fetch-to-store.hh" -#include "nix/json-utils.hh" -#include "nix/store-path-accessor.hh" -#include "nix/fetch-settings.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/store/store-api.hh" +#include "nix/util/source-path.hh" +#include "nix/fetchers/fetch-to-store.hh" +#include "nix/util/json-utils.hh" +#include "nix/fetchers/store-path-accessor.hh" +#include "nix/fetchers/fetch-settings.hh" #include diff --git a/src/libfetchers/filtering-source-accessor.cc b/src/libfetchers/filtering-source-accessor.cc index 1a9c8ae6b..b1ba84140 100644 --- a/src/libfetchers/filtering-source-accessor.cc +++ b/src/libfetchers/filtering-source-accessor.cc @@ -1,4 +1,4 @@ -#include "nix/filtering-source-accessor.hh" +#include "nix/fetchers/filtering-source-accessor.hh" namespace nix { diff --git a/src/libfetchers/git-lfs-fetch.cc b/src/libfetchers/git-lfs-fetch.cc index 9f48d1e98..dbf4b1eb9 100644 --- a/src/libfetchers/git-lfs-fetch.cc +++ b/src/libfetchers/git-lfs-fetch.cc @@ -1,10 +1,10 @@ -#include "nix/git-lfs-fetch.hh" -#include "nix/git-utils.hh" -#include "nix/filetransfer.hh" -#include "nix/processes.hh" -#include "nix/url.hh" -#include "nix/users.hh" -#include "nix/hash.hh" +#include "nix/fetchers/git-lfs-fetch.hh" +#include "nix/fetchers/git-utils.hh" +#include "nix/store/filetransfer.hh" +#include "nix/util/processes.hh" +#include "nix/util/url.hh" +#include "nix/util/users.hh" +#include "nix/util/hash.hh" #include #include diff --git a/src/libfetchers/git-utils.cc b/src/libfetchers/git-utils.cc index a4adbdea9..2bef348de 100644 --- a/src/libfetchers/git-utils.cc +++ b/src/libfetchers/git-utils.cc @@ -1,12 +1,12 @@ -#include "nix/git-utils.hh" -#include "nix/git-lfs-fetch.hh" -#include "nix/cache.hh" -#include "nix/finally.hh" -#include "nix/processes.hh" -#include "nix/signals.hh" -#include "nix/users.hh" -#include "nix/fs-sink.hh" -#include "nix/sync.hh" +#include "nix/fetchers/git-utils.hh" +#include "nix/fetchers/git-lfs-fetch.hh" +#include "nix/fetchers/cache.hh" +#include "nix/util/finally.hh" +#include "nix/util/processes.hh" +#include "nix/util/signals.hh" +#include "nix/util/users.hh" +#include "nix/util/fs-sink.hh" +#include "nix/util/sync.hh" #include #include diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index f41e8e863..07caddaf8 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -1,20 +1,20 @@ -#include "nix/error.hh" -#include "nix/fetchers.hh" -#include "nix/users.hh" -#include "nix/cache.hh" -#include "nix/globals.hh" -#include "nix/tarfile.hh" -#include "nix/store-api.hh" -#include "nix/url-parts.hh" -#include "nix/pathlocks.hh" -#include "nix/processes.hh" -#include "nix/git.hh" -#include "nix/git-utils.hh" -#include "nix/logging.hh" -#include "nix/finally.hh" -#include "nix/fetch-settings.hh" -#include "nix/json-utils.hh" -#include "nix/archive.hh" +#include "nix/util/error.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/util/users.hh" +#include "nix/fetchers/cache.hh" +#include "nix/store/globals.hh" +#include "nix/util/tarfile.hh" +#include "nix/store/store-api.hh" +#include "nix/util/url-parts.hh" +#include "nix/store/pathlocks.hh" +#include "nix/util/processes.hh" +#include "nix/util/git.hh" +#include "nix/fetchers/git-utils.hh" +#include "nix/util/logging.hh" +#include "nix/util/finally.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/util/json-utils.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index 80b7e7156..4fcad5f26 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -1,15 +1,15 @@ -#include "nix/filetransfer.hh" -#include "nix/cache.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" -#include "nix/types.hh" -#include "nix/url-parts.hh" -#include "nix/git.hh" -#include "nix/fetchers.hh" -#include "nix/fetch-settings.hh" -#include "nix/tarball.hh" -#include "nix/tarfile.hh" -#include "nix/git-utils.hh" +#include "nix/store/filetransfer.hh" +#include "nix/fetchers/cache.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/util/types.hh" +#include "nix/util/url-parts.hh" +#include "nix/util/git.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/fetchers/tarball.hh" +#include "nix/util/tarfile.hh" +#include "nix/fetchers/git-utils.hh" #include #include diff --git a/src/libfetchers/include/nix/attrs.hh b/src/libfetchers/include/nix/fetchers/attrs.hh similarity index 95% rename from src/libfetchers/include/nix/attrs.hh rename to src/libfetchers/include/nix/fetchers/attrs.hh index f1fdee35f..1b757d712 100644 --- a/src/libfetchers/include/nix/attrs.hh +++ b/src/libfetchers/include/nix/fetchers/attrs.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/hash.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" #include diff --git a/src/libfetchers/include/nix/cache.hh b/src/libfetchers/include/nix/fetchers/cache.hh similarity index 97% rename from src/libfetchers/include/nix/cache.hh rename to src/libfetchers/include/nix/fetchers/cache.hh index 592401785..5b9319d77 100644 --- a/src/libfetchers/include/nix/cache.hh +++ b/src/libfetchers/include/nix/fetchers/cache.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/fetchers.hh" -#include "nix/path.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/store/path.hh" namespace nix::fetchers { diff --git a/src/libfetchers/include/nix/fetch-settings.hh b/src/libfetchers/include/nix/fetchers/fetch-settings.hh similarity index 98% rename from src/libfetchers/include/nix/fetch-settings.hh rename to src/libfetchers/include/nix/fetchers/fetch-settings.hh index 811e27b30..54c420843 100644 --- a/src/libfetchers/include/nix/fetch-settings.hh +++ b/src/libfetchers/include/nix/fetchers/fetch-settings.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/config.hh" +#include "nix/util/types.hh" +#include "nix/util/configuration.hh" #include #include diff --git a/src/libfetchers/include/nix/fetch-to-store.hh b/src/libfetchers/include/nix/fetchers/fetch-to-store.hh similarity index 68% rename from src/libfetchers/include/nix/fetch-to-store.hh rename to src/libfetchers/include/nix/fetchers/fetch-to-store.hh index 7ef809c1c..a0144cb76 100644 --- a/src/libfetchers/include/nix/fetch-to-store.hh +++ b/src/libfetchers/include/nix/fetchers/fetch-to-store.hh @@ -1,10 +1,10 @@ #pragma once -#include "nix/source-path.hh" -#include "nix/store-api.hh" -#include "nix/file-system.hh" -#include "nix/repair-flag.hh" -#include "nix/file-content-address.hh" +#include "nix/util/source-path.hh" +#include "nix/store/store-api.hh" +#include "nix/util/file-system.hh" +#include "nix/util/repair-flag.hh" +#include "nix/util/file-content-address.hh" namespace nix { diff --git a/src/libfetchers/include/nix/fetchers.hh b/src/libfetchers/include/nix/fetchers/fetchers.hh similarity index 97% rename from src/libfetchers/include/nix/fetchers.hh rename to src/libfetchers/include/nix/fetchers/fetchers.hh index 07a9adfbe..3288ecc5e 100644 --- a/src/libfetchers/include/nix/fetchers.hh +++ b/src/libfetchers/include/nix/fetchers/fetchers.hh @@ -1,17 +1,17 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/hash.hh" -#include "nix/canon-path.hh" -#include "nix/json-impls.hh" -#include "nix/attrs.hh" -#include "nix/url.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" +#include "nix/util/canon-path.hh" +#include "nix/util/json-impls.hh" +#include "nix/fetchers/attrs.hh" +#include "nix/util/url.hh" #include #include -#include "nix/ref.hh" +#include "nix/util/ref.hh" namespace nix { class Store; class StorePath; struct SourceAccessor; } diff --git a/src/libfetchers/include/nix/filtering-source-accessor.hh b/src/libfetchers/include/nix/fetchers/filtering-source-accessor.hh similarity index 98% rename from src/libfetchers/include/nix/filtering-source-accessor.hh rename to src/libfetchers/include/nix/fetchers/filtering-source-accessor.hh index 04855c070..0e6b71e9a 100644 --- a/src/libfetchers/include/nix/filtering-source-accessor.hh +++ b/src/libfetchers/include/nix/fetchers/filtering-source-accessor.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/source-path.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libfetchers/include/nix/git-lfs-fetch.hh b/src/libfetchers/include/nix/fetchers/git-lfs-fetch.hh similarity index 90% rename from src/libfetchers/include/nix/git-lfs-fetch.hh rename to src/libfetchers/include/nix/fetchers/git-lfs-fetch.hh index cd7c86a82..e701288cf 100644 --- a/src/libfetchers/include/nix/git-lfs-fetch.hh +++ b/src/libfetchers/include/nix/fetchers/git-lfs-fetch.hh @@ -1,6 +1,6 @@ -#include "nix/canon-path.hh" -#include "nix/serialise.hh" -#include "nix/url.hh" +#include "nix/util/canon-path.hh" +#include "nix/util/serialise.hh" +#include "nix/util/url.hh" #include diff --git a/src/libfetchers/include/nix/git-utils.hh b/src/libfetchers/include/nix/fetchers/git-utils.hh similarity index 97% rename from src/libfetchers/include/nix/git-utils.hh rename to src/libfetchers/include/nix/fetchers/git-utils.hh index 65c86a7c4..1506f8509 100644 --- a/src/libfetchers/include/nix/git-utils.hh +++ b/src/libfetchers/include/nix/fetchers/git-utils.hh @@ -1,7 +1,7 @@ #pragma once -#include "nix/filtering-source-accessor.hh" -#include "nix/fs-sink.hh" +#include "nix/fetchers/filtering-source-accessor.hh" +#include "nix/util/fs-sink.hh" namespace nix { diff --git a/src/libfetchers/include/nix/meson.build b/src/libfetchers/include/nix/fetchers/meson.build similarity index 84% rename from src/libfetchers/include/nix/meson.build rename to src/libfetchers/include/nix/fetchers/meson.build index eb02be43c..3a752d9cb 100644 --- a/src/libfetchers/include/nix/meson.build +++ b/src/libfetchers/include/nix/fetchers/meson.build @@ -1,4 +1,4 @@ -include_dirs = [include_directories('..')] +include_dirs = [include_directories('../..')] headers = files( 'attrs.hh', diff --git a/src/libfetchers/include/nix/registry.hh b/src/libfetchers/include/nix/fetchers/registry.hh similarity index 96% rename from src/libfetchers/include/nix/registry.hh rename to src/libfetchers/include/nix/fetchers/registry.hh index 7c091ea12..47ff9e86f 100644 --- a/src/libfetchers/include/nix/registry.hh +++ b/src/libfetchers/include/nix/fetchers/registry.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/fetchers.hh" +#include "nix/util/types.hh" +#include "nix/fetchers/fetchers.hh" namespace nix { class Store; } diff --git a/src/libfetchers/include/nix/store-path-accessor.hh b/src/libfetchers/include/nix/fetchers/store-path-accessor.hh similarity index 85% rename from src/libfetchers/include/nix/store-path-accessor.hh rename to src/libfetchers/include/nix/fetchers/store-path-accessor.hh index 8e65fda11..021df5a62 100644 --- a/src/libfetchers/include/nix/store-path-accessor.hh +++ b/src/libfetchers/include/nix/fetchers/store-path-accessor.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/source-path.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libfetchers/include/nix/tarball.hh b/src/libfetchers/include/nix/fetchers/tarball.hh similarity index 88% rename from src/libfetchers/include/nix/tarball.hh rename to src/libfetchers/include/nix/fetchers/tarball.hh index 63a217124..691142091 100644 --- a/src/libfetchers/include/nix/tarball.hh +++ b/src/libfetchers/include/nix/fetchers/tarball.hh @@ -2,10 +2,10 @@ #include -#include "nix/hash.hh" -#include "nix/path.hh" -#include "nix/ref.hh" -#include "nix/types.hh" +#include "nix/util/hash.hh" +#include "nix/store/path.hh" +#include "nix/util/ref.hh" +#include "nix/util/types.hh" namespace nix { class Store; diff --git a/src/libfetchers/indirect.cc b/src/libfetchers/indirect.cc index 7e5eb0be3..47cb7587c 100644 --- a/src/libfetchers/indirect.cc +++ b/src/libfetchers/indirect.cc @@ -1,6 +1,6 @@ -#include "nix/fetchers.hh" -#include "nix/url-parts.hh" -#include "nix/path.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/util/url-parts.hh" +#include "nix/store/path.hh" namespace nix::fetchers { diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc index 73e677f44..eb6bdd1eb 100644 --- a/src/libfetchers/mercurial.cc +++ b/src/libfetchers/mercurial.cc @@ -1,13 +1,13 @@ -#include "nix/fetchers.hh" -#include "nix/processes.hh" -#include "nix/users.hh" -#include "nix/cache.hh" -#include "nix/globals.hh" -#include "nix/tarfile.hh" -#include "nix/store-api.hh" -#include "nix/url-parts.hh" -#include "nix/store-path-accessor.hh" -#include "nix/fetch-settings.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/util/processes.hh" +#include "nix/util/users.hh" +#include "nix/fetchers/cache.hh" +#include "nix/store/globals.hh" +#include "nix/util/tarfile.hh" +#include "nix/store/store-api.hh" +#include "nix/util/url-parts.hh" +#include "nix/fetchers/store-path-accessor.hh" +#include "nix/fetchers/fetch-settings.hh" #include diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build index 14a2647d5..6e7129f4c 100644 --- a/src/libfetchers/meson.build +++ b/src/libfetchers/meson.build @@ -51,7 +51,7 @@ sources = files( 'tarball.cc', ) -subdir('include/nix') +subdir('include/nix/fetchers') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -66,7 +66,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/fetchers', preserve_path : true) libraries_private = [] diff --git a/src/libfetchers/package.nix b/src/libfetchers/package.nix index aaeaa4b5d..145920879 100644 --- a/src/libfetchers/package.nix +++ b/src/libfetchers/package.nix @@ -27,7 +27,7 @@ mkMesonLibrary (finalAttrs: { ../../.version ./.version ./meson.build - ./include/nix/meson.build + ./include/nix/fetchers/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc index 95bc2ce50..173368dcc 100644 --- a/src/libfetchers/path.cc +++ b/src/libfetchers/path.cc @@ -1,7 +1,7 @@ -#include "nix/fetchers.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/store-path-accessor.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/fetchers/store-path-accessor.hh" namespace nix::fetchers { diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc index ec470159b..e9b55f7f2 100644 --- a/src/libfetchers/registry.cc +++ b/src/libfetchers/registry.cc @@ -1,10 +1,10 @@ -#include "nix/fetch-settings.hh" -#include "nix/registry.hh" -#include "nix/tarball.hh" -#include "nix/users.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" +#include "nix/fetchers/fetch-settings.hh" +#include "nix/fetchers/registry.hh" +#include "nix/fetchers/tarball.hh" +#include "nix/util/users.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include diff --git a/src/libfetchers/store-path-accessor.cc b/src/libfetchers/store-path-accessor.cc index 997582b57..bed51541e 100644 --- a/src/libfetchers/store-path-accessor.cc +++ b/src/libfetchers/store-path-accessor.cc @@ -1,5 +1,5 @@ -#include "nix/store-path-accessor.hh" -#include "nix/store-api.hh" +#include "nix/fetchers/store-path-accessor.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc index 01bff82f7..ef91d6b25 100644 --- a/src/libfetchers/tarball.cc +++ b/src/libfetchers/tarball.cc @@ -1,14 +1,14 @@ -#include "nix/tarball.hh" -#include "nix/fetchers.hh" -#include "nix/cache.hh" -#include "nix/filetransfer.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/tarfile.hh" -#include "nix/types.hh" -#include "nix/store-path-accessor.hh" -#include "nix/store-api.hh" -#include "nix/git-utils.hh" +#include "nix/fetchers/tarball.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/cache.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/util/tarfile.hh" +#include "nix/util/types.hh" +#include "nix/fetchers/store-path-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/fetchers/git-utils.hh" namespace nix::fetchers { diff --git a/src/libflake-c/nix_api_flake_internal.hh b/src/libflake-c/nix_api_flake_internal.hh index 4565b4f5d..f7c5e7838 100644 --- a/src/libflake-c/nix_api_flake_internal.hh +++ b/src/libflake-c/nix_api_flake_internal.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/ref.hh" +#include "nix/util/ref.hh" #include "nix/flake/settings.hh" struct nix_flake_settings diff --git a/src/libflake-tests/flakeref.cc b/src/libflake-tests/flakeref.cc index f378ba6d6..1abaffb96 100644 --- a/src/libflake-tests/flakeref.cc +++ b/src/libflake-tests/flakeref.cc @@ -1,6 +1,6 @@ #include -#include "nix/fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" #include "nix/flake/flakeref.hh" namespace nix { diff --git a/src/libflake-tests/nix_api_flake.cc b/src/libflake-tests/nix_api_flake.cc index eb6de4e6e..455fcb15d 100644 --- a/src/libflake-tests/nix_api_flake.cc +++ b/src/libflake-tests/nix_api_flake.cc @@ -6,8 +6,8 @@ #include "nix_api_value.h" #include "nix_api_flake.h" -#include "nix/tests/nix_api_expr.hh" -#include "nix/tests/string_callback.hh" +#include "nix/expr/tests/nix_api_expr.hh" +#include "nix/util/tests/string_callback.hh" #include #include diff --git a/src/libflake/flake/config.cc b/src/libflake/flake/config.cc index a0ddf0387..a67f7884c 100644 --- a/src/libflake/flake/config.cc +++ b/src/libflake/flake/config.cc @@ -1,5 +1,5 @@ -#include "nix/users.hh" -#include "nix/config-global.hh" +#include "nix/util/users.hh" +#include "nix/util/config-global.hh" #include "nix/flake/settings.hh" #include "nix/flake/flake.hh" diff --git a/src/libflake/flake/flake-primops.cc b/src/libflake/flake/flake-primops.cc index 508274dbd..7c5ce01b2 100644 --- a/src/libflake/flake/flake-primops.cc +++ b/src/libflake/flake/flake-primops.cc @@ -1,5 +1,5 @@ #include "nix/flake/flake-primops.hh" -#include "nix/eval.hh" +#include "nix/expr/eval.hh" #include "nix/flake/flake.hh" #include "nix/flake/flakeref.hh" #include "nix/flake/settings.hh" diff --git a/src/libflake/flake/flake.cc b/src/libflake/flake/flake.cc index 8bf9fa196..8856a03dd 100644 --- a/src/libflake/flake/flake.cc +++ b/src/libflake/flake/flake.cc @@ -1,19 +1,19 @@ -#include "nix/terminal.hh" +#include "nix/util/terminal.hh" #include "nix/flake/flake.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" #include "nix/flake/lockfile.hh" -#include "nix/primops.hh" -#include "nix/eval-inline.hh" -#include "nix/store-api.hh" -#include "nix/fetchers.hh" -#include "nix/finally.hh" -#include "nix/fetch-settings.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/store-api.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/util/finally.hh" +#include "nix/fetchers/fetch-settings.hh" #include "nix/flake/settings.hh" -#include "nix/value-to-json.hh" -#include "nix/local-fs-store.hh" -#include "nix/fetch-to-store.hh" -#include "nix/memory-source-accessor.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/fetchers/fetch-to-store.hh" +#include "nix/util/memory-source-accessor.hh" #include diff --git a/src/libflake/flake/flakeref.cc b/src/libflake/flake/flakeref.cc index 340fe4dc7..6e95eb767 100644 --- a/src/libflake/flake/flakeref.cc +++ b/src/libflake/flake/flakeref.cc @@ -1,8 +1,8 @@ #include "nix/flake/flakeref.hh" -#include "nix/store-api.hh" -#include "nix/url.hh" -#include "nix/url-parts.hh" -#include "nix/fetchers.hh" +#include "nix/store/store-api.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" +#include "nix/fetchers/fetchers.hh" namespace nix { diff --git a/src/libflake/flake/lockfile.cc b/src/libflake/flake/lockfile.cc index 08a384366..ba6f18c57 100644 --- a/src/libflake/flake/lockfile.cc +++ b/src/libflake/flake/lockfile.cc @@ -1,10 +1,10 @@ #include -#include "nix/fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" #include "nix/flake/settings.hh" #include "nix/flake/lockfile.hh" -#include "nix/store-api.hh" -#include "nix/strings.hh" +#include "nix/store/store-api.hh" +#include "nix/util/strings.hh" #include #include diff --git a/src/libflake/include/nix/flake/flake-primops.hh b/src/libflake/include/nix/flake/flake-primops.hh index 07be75123..e7b86b9b3 100644 --- a/src/libflake/include/nix/flake/flake-primops.hh +++ b/src/libflake/include/nix/flake/flake-primops.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/eval.hh" +#include "nix/expr/eval.hh" #include "nix/flake/settings.hh" namespace nix::flake::primops { diff --git a/src/libflake/include/nix/flake/flake.hh b/src/libflake/include/nix/flake/flake.hh index 2fa385060..3336f8557 100644 --- a/src/libflake/include/nix/flake/flake.hh +++ b/src/libflake/include/nix/flake/flake.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" #include "nix/flake/flakeref.hh" #include "nix/flake/lockfile.hh" -#include "nix/value.hh" +#include "nix/expr/value.hh" namespace nix { diff --git a/src/libflake/include/nix/flake/flakeref.hh b/src/libflake/include/nix/flake/flakeref.hh index 93ebaa497..0fd1fec4d 100644 --- a/src/libflake/include/nix/flake/flakeref.hh +++ b/src/libflake/include/nix/flake/flakeref.hh @@ -3,10 +3,10 @@ #include -#include "nix/types.hh" -#include "nix/fetchers.hh" -#include "nix/outputs-spec.hh" -#include "nix/registry.hh" +#include "nix/util/types.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/fetchers/registry.hh" namespace nix { diff --git a/src/libflake/include/nix/flake/meson.build b/src/libflake/include/nix/flake/meson.build new file mode 100644 index 000000000..ece1ad4ea --- /dev/null +++ b/src/libflake/include/nix/flake/meson.build @@ -0,0 +1,11 @@ +# Public headers directory + +include_dirs = [include_directories('../..')] + +headers = files( + 'flake.hh', + 'flakeref.hh', + 'lockfile.hh', + 'settings.hh', + 'url-name.hh', +) diff --git a/src/libflake/include/nix/flake/settings.hh b/src/libflake/include/nix/flake/settings.hh index 54f501e11..b3bffad4c 100644 --- a/src/libflake/include/nix/flake/settings.hh +++ b/src/libflake/include/nix/flake/settings.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/config.hh" +#include "nix/util/configuration.hh" #include diff --git a/src/libflake/include/nix/flake/url-name.hh b/src/libflake/include/nix/flake/url-name.hh index 4577e8f38..d295ca8f8 100644 --- a/src/libflake/include/nix/flake/url-name.hh +++ b/src/libflake/include/nix/flake/url-name.hh @@ -1,7 +1,7 @@ -#include "nix/url.hh" -#include "nix/url-parts.hh" -#include "nix/util.hh" -#include "nix/split.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" +#include "nix/util/util.hh" +#include "nix/util/split.hh" namespace nix { diff --git a/src/libflake/include/nix/meson.build b/src/libflake/include/nix/meson.build deleted file mode 100644 index 023bd64bd..000000000 --- a/src/libflake/include/nix/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -# Public headers directory - -include_dirs = [include_directories('..')] - -headers = files( - 'flake/flake.hh', - 'flake/flakeref.hh', - 'flake/lockfile.hh', - 'flake/settings.hh', - 'flake/url-name.hh', -) diff --git a/src/libflake/meson.build b/src/libflake/meson.build index de880c28d..f4c034490 100644 --- a/src/libflake/meson.build +++ b/src/libflake/meson.build @@ -48,7 +48,7 @@ sources = files( 'flake/url-name.cc', ) -subdir('include/nix') +subdir('include/nix/flake') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -64,7 +64,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/flake', preserve_path : true) libraries_private = [] diff --git a/src/libflake/package.nix b/src/libflake/package.nix index 683880b20..dd442a44e 100644 --- a/src/libflake/package.nix +++ b/src/libflake/package.nix @@ -28,7 +28,7 @@ mkMesonLibrary (finalAttrs: { ../../.version ./.version ./meson.build - ./include/nix/meson.build + ./include/nix/flake/meson.build ./call-flake.nix (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) diff --git a/src/libmain-c/nix_api_main.cc b/src/libmain-c/nix_api_main.cc index 61dbceff8..eacb80455 100644 --- a/src/libmain-c/nix_api_main.cc +++ b/src/libmain-c/nix_api_main.cc @@ -3,7 +3,7 @@ #include "nix_api_util.h" #include "nix_api_util_internal.h" -#include "nix/plugin.hh" +#include "nix/main/plugin.hh" nix_err nix_init_plugins(nix_c_context * context) { diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc index 090d8b464..35fad3a9a 100644 --- a/src/libmain/common-args.cc +++ b/src/libmain/common-args.cc @@ -1,13 +1,13 @@ #include -#include "nix/common-args.hh" -#include "nix/args/root.hh" -#include "nix/config-global.hh" -#include "nix/globals.hh" -#include "nix/logging.hh" -#include "nix/loggers.hh" -#include "nix/util.hh" -#include "nix/plugin.hh" +#include "nix/main/common-args.hh" +#include "nix/util/args/root.hh" +#include "nix/util/config-global.hh" +#include "nix/store/globals.hh" +#include "nix/util/logging.hh" +#include "nix/main/loggers.hh" +#include "nix/util/util.hh" +#include "nix/main/plugin.hh" namespace nix { diff --git a/src/libmain/include/nix/common-args.hh b/src/libmain/include/nix/main/common-args.hh similarity index 98% rename from src/libmain/include/nix/common-args.hh rename to src/libmain/include/nix/main/common-args.hh index f7b2e2d1c..cc6d3d3f0 100644 --- a/src/libmain/include/nix/common-args.hh +++ b/src/libmain/include/nix/main/common-args.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/args.hh" -#include "nix/repair-flag.hh" +#include "nix/util/args.hh" +#include "nix/util/repair-flag.hh" namespace nix { diff --git a/src/libmain/include/nix/loggers.hh b/src/libmain/include/nix/main/loggers.hh similarity index 88% rename from src/libmain/include/nix/loggers.hh rename to src/libmain/include/nix/main/loggers.hh index dabdae83c..061b4a32a 100644 --- a/src/libmain/include/nix/loggers.hh +++ b/src/libmain/include/nix/main/loggers.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libmain/include/nix/meson.build b/src/libmain/include/nix/main/meson.build similarity index 74% rename from src/libmain/include/nix/meson.build rename to src/libmain/include/nix/main/meson.build index e29981d3f..992a5ff0e 100644 --- a/src/libmain/include/nix/meson.build +++ b/src/libmain/include/nix/main/meson.build @@ -1,6 +1,6 @@ # Public headers directory -include_dirs = [include_directories('..')] +include_dirs = [include_directories('../..')] headers = files( 'common-args.hh', diff --git a/src/libmain/include/nix/plugin.hh b/src/libmain/include/nix/main/plugin.hh similarity index 100% rename from src/libmain/include/nix/plugin.hh rename to src/libmain/include/nix/main/plugin.hh diff --git a/src/libmain/include/nix/progress-bar.hh b/src/libmain/include/nix/main/progress-bar.hh similarity index 73% rename from src/libmain/include/nix/progress-bar.hh rename to src/libmain/include/nix/main/progress-bar.hh index 195c5ceee..f49fb2198 100644 --- a/src/libmain/include/nix/progress-bar.hh +++ b/src/libmain/include/nix/main/progress-bar.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/logging.hh" +#include "nix/util/logging.hh" namespace nix { diff --git a/src/libmain/include/nix/shared.hh b/src/libmain/include/nix/main/shared.hh similarity index 94% rename from src/libmain/include/nix/shared.hh rename to src/libmain/include/nix/main/shared.hh index 8144ad845..2ff57135b 100644 --- a/src/libmain/include/nix/shared.hh +++ b/src/libmain/include/nix/main/shared.hh @@ -1,13 +1,13 @@ #pragma once ///@file -#include "nix/file-descriptor.hh" -#include "nix/processes.hh" -#include "nix/args.hh" -#include "nix/args/root.hh" -#include "nix/common-args.hh" -#include "nix/path.hh" -#include "nix/derived-path.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/util/processes.hh" +#include "nix/util/args.hh" +#include "nix/util/args/root.hh" +#include "nix/main/common-args.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" #include diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc index 1cf7c6dcf..c78e49b63 100644 --- a/src/libmain/loggers.cc +++ b/src/libmain/loggers.cc @@ -1,6 +1,6 @@ -#include "nix/loggers.hh" -#include "nix/environment-variables.hh" -#include "nix/progress-bar.hh" +#include "nix/main/loggers.hh" +#include "nix/util/environment-variables.hh" +#include "nix/main/progress-bar.hh" namespace nix { diff --git a/src/libmain/meson.build b/src/libmain/meson.build index f7ff93b66..414fc679f 100644 --- a/src/libmain/meson.build +++ b/src/libmain/meson.build @@ -63,7 +63,7 @@ if host_machine.system() != 'windows' ) endif -subdir('include/nix') +subdir('include/nix/main') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -79,7 +79,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/main', preserve_path : true) libraries_private = [] diff --git a/src/libmain/package.nix b/src/libmain/package.nix index 31b36dbcf..949603464 100644 --- a/src/libmain/package.nix +++ b/src/libmain/package.nix @@ -27,7 +27,7 @@ mkMesonLibrary (finalAttrs: { ../../.version ./.version ./meson.build - ./include/nix/meson.build + ./include/nix/main/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libmain/plugin.cc b/src/libmain/plugin.cc index db1067c1a..63ed650a7 100644 --- a/src/libmain/plugin.cc +++ b/src/libmain/plugin.cc @@ -4,8 +4,8 @@ #include -#include "nix/config-global.hh" -#include "nix/signals.hh" +#include "nix/util/config-global.hh" +#include "nix/util/signals.hh" namespace nix { diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index eb4db83e6..23f5ff8f7 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -1,8 +1,8 @@ -#include "nix/progress-bar.hh" -#include "nix/terminal.hh" -#include "nix/sync.hh" -#include "nix/store-api.hh" -#include "nix/names.hh" +#include "nix/main/progress-bar.hh" +#include "nix/util/terminal.hh" +#include "nix/util/sync.hh" +#include "nix/store/store-api.hh" +#include "nix/store/names.hh" #include #include diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 0643e20ed..65bfcfbd5 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -1,11 +1,11 @@ -#include "nix/globals.hh" -#include "nix/current-process.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/gc-store.hh" -#include "nix/loggers.hh" -#include "nix/progress-bar.hh" -#include "nix/signals.hh" +#include "nix/store/globals.hh" +#include "nix/util/current-process.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/gc-store.hh" +#include "nix/main/loggers.hh" +#include "nix/main/progress-bar.hh" +#include "nix/util/signals.hh" #include #include @@ -22,11 +22,12 @@ #include -#include "nix/exit.hh" -#include "nix/strings.hh" +#include "nix/util/exit.hh" +#include "nix/util/strings.hh" #include "main-config-private.hh" + namespace nix { char * * savedArgv; diff --git a/src/libmain/unix/stack.cc b/src/libmain/unix/stack.cc index b4ec5967e..cee21d2a2 100644 --- a/src/libmain/unix/stack.cc +++ b/src/libmain/unix/stack.cc @@ -1,5 +1,5 @@ -#include "nix/error.hh" -#include "nix/shared.hh" +#include "nix/util/error.hh" +#include "nix/main/shared.hh" #include #include diff --git a/src/libstore-c/nix_api_store.cc b/src/libstore-c/nix_api_store.cc index ab0af1f52..92aed9187 100644 --- a/src/libstore-c/nix_api_store.cc +++ b/src/libstore-c/nix_api_store.cc @@ -3,11 +3,11 @@ #include "nix_api_util.h" #include "nix_api_util_internal.h" -#include "nix/path.hh" -#include "nix/store-api.hh" -#include "nix/build-result.hh" +#include "nix/store/path.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" -#include "nix/globals.hh" +#include "nix/store/globals.hh" nix_err nix_libstore_init(nix_c_context * context) { diff --git a/src/libstore-c/nix_api_store_internal.h b/src/libstore-c/nix_api_store_internal.h index e32cdfcca..b0194bfd3 100644 --- a/src/libstore-c/nix_api_store_internal.h +++ b/src/libstore-c/nix_api_store_internal.h @@ -1,6 +1,6 @@ #ifndef NIX_API_STORE_INTERNAL_H #define NIX_API_STORE_INTERNAL_H -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" struct Store { diff --git a/src/libstore-test-support/derived-path.cc b/src/libstore-test-support/derived-path.cc index 4c04facce..c7714449c 100644 --- a/src/libstore-test-support/derived-path.cc +++ b/src/libstore-test-support/derived-path.cc @@ -2,7 +2,7 @@ #include -#include "nix/tests/derived-path.hh" +#include "nix/store/tests/derived-path.hh" namespace rc { using namespace nix; diff --git a/src/libstore-test-support/include/nix/meson.build b/src/libstore-test-support/include/nix/meson.build deleted file mode 100644 index ed3e4f2ff..000000000 --- a/src/libstore-test-support/include/nix/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -# Public headers directory - -include_dirs = [include_directories('..')] - -headers = files( - 'tests/derived-path.hh', - 'tests/libstore.hh', - 'tests/nix_api_store.hh', - 'tests/outputs-spec.hh', - 'tests/path.hh', - 'tests/protocol.hh', -) diff --git a/src/libstore-test-support/include/nix/tests/derived-path.hh b/src/libstore-test-support/include/nix/store/tests/derived-path.hh similarity index 84% rename from src/libstore-test-support/include/nix/tests/derived-path.hh rename to src/libstore-test-support/include/nix/store/tests/derived-path.hh index 57cad487c..642ce557c 100644 --- a/src/libstore-test-support/include/nix/tests/derived-path.hh +++ b/src/libstore-test-support/include/nix/store/tests/derived-path.hh @@ -3,10 +3,10 @@ #include -#include "nix/derived-path.hh" +#include "nix/store/derived-path.hh" -#include "nix/tests/path.hh" -#include "nix/tests/outputs-spec.hh" +#include "nix/store/tests/path.hh" +#include "nix/store/tests/outputs-spec.hh" namespace rc { using namespace nix; diff --git a/src/libstore-test-support/include/nix/tests/libstore.hh b/src/libstore-test-support/include/nix/store/tests/libstore.hh similarity index 93% rename from src/libstore-test-support/include/nix/tests/libstore.hh rename to src/libstore-test-support/include/nix/store/tests/libstore.hh index 02e818f97..466b6f9b1 100644 --- a/src/libstore-test-support/include/nix/tests/libstore.hh +++ b/src/libstore-test-support/include/nix/store/tests/libstore.hh @@ -4,7 +4,7 @@ #include #include -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore-test-support/include/nix/store/tests/meson.build b/src/libstore-test-support/include/nix/store/tests/meson.build new file mode 100644 index 000000000..ae5db049e --- /dev/null +++ b/src/libstore-test-support/include/nix/store/tests/meson.build @@ -0,0 +1,12 @@ +# Public headers directory + +include_dirs = [include_directories('../../..')] + +headers = files( + 'derived-path.hh', + 'libstore.hh', + 'nix_api_store.hh', + 'outputs-spec.hh', + 'path.hh', + 'protocol.hh', +) diff --git a/src/libstore-test-support/include/nix/tests/nix_api_store.hh b/src/libstore-test-support/include/nix/store/tests/nix_api_store.hh similarity index 96% rename from src/libstore-test-support/include/nix/tests/nix_api_store.hh rename to src/libstore-test-support/include/nix/store/tests/nix_api_store.hh index f418b563d..bc0f31d05 100644 --- a/src/libstore-test-support/include/nix/tests/nix_api_store.hh +++ b/src/libstore-test-support/include/nix/store/tests/nix_api_store.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/tests/nix_api_util.hh" +#include "nix/util/tests/nix_api_util.hh" -#include "nix/file-system.hh" +#include "nix/util/file-system.hh" #include #include "nix_api_store.h" diff --git a/src/libstore-test-support/include/nix/tests/outputs-spec.hh b/src/libstore-test-support/include/nix/store/tests/outputs-spec.hh similarity index 72% rename from src/libstore-test-support/include/nix/tests/outputs-spec.hh rename to src/libstore-test-support/include/nix/store/tests/outputs-spec.hh index 14a74d2e4..c13c992b6 100644 --- a/src/libstore-test-support/include/nix/tests/outputs-spec.hh +++ b/src/libstore-test-support/include/nix/store/tests/outputs-spec.hh @@ -3,9 +3,9 @@ #include -#include "nix/outputs-spec.hh" +#include "nix/store/outputs-spec.hh" -#include "nix/tests/path.hh" +#include "nix/store/tests/path.hh" namespace rc { using namespace nix; diff --git a/src/libstore-test-support/include/nix/tests/path.hh b/src/libstore-test-support/include/nix/store/tests/path.hh similarity index 93% rename from src/libstore-test-support/include/nix/tests/path.hh rename to src/libstore-test-support/include/nix/store/tests/path.hh index eebcda28e..59ff604d7 100644 --- a/src/libstore-test-support/include/nix/tests/path.hh +++ b/src/libstore-test-support/include/nix/store/tests/path.hh @@ -3,7 +3,7 @@ #include -#include "nix/path.hh" +#include "nix/store/path.hh" namespace nix { diff --git a/src/libstore-test-support/include/nix/tests/protocol.hh b/src/libstore-test-support/include/nix/store/tests/protocol.hh similarity index 96% rename from src/libstore-test-support/include/nix/tests/protocol.hh rename to src/libstore-test-support/include/nix/store/tests/protocol.hh index 6c7d69adb..acd10bf9d 100644 --- a/src/libstore-test-support/include/nix/tests/protocol.hh +++ b/src/libstore-test-support/include/nix/store/tests/protocol.hh @@ -4,8 +4,8 @@ #include #include -#include "nix/tests/libstore.hh" -#include "nix/tests/characterization.hh" +#include "nix/store/tests/libstore.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libstore-test-support/meson.build b/src/libstore-test-support/meson.build index a1f6777e4..779b122fa 100644 --- a/src/libstore-test-support/meson.build +++ b/src/libstore-test-support/meson.build @@ -35,7 +35,7 @@ sources = files( 'path.cc', ) -subdir('include/nix') +subdir('include/nix/store/tests') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -52,7 +52,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/store/tests', preserve_path : true) libraries_private = [] diff --git a/src/libstore-test-support/outputs-spec.cc b/src/libstore-test-support/outputs-spec.cc index e1b987720..e186ad8ae 100644 --- a/src/libstore-test-support/outputs-spec.cc +++ b/src/libstore-test-support/outputs-spec.cc @@ -1,4 +1,4 @@ -#include "nix/tests/outputs-spec.hh" +#include "nix/store/tests/outputs-spec.hh" #include diff --git a/src/libstore-test-support/package.nix b/src/libstore-test-support/package.nix index c223ad116..391ddeefd 100644 --- a/src/libstore-test-support/package.nix +++ b/src/libstore-test-support/package.nix @@ -29,7 +29,7 @@ mkMesonLibrary (finalAttrs: { ./.version ./meson.build # ./meson.options - ./include/nix/meson.build + ./include/nix/store/tests/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libstore-test-support/path.cc b/src/libstore-test-support/path.cc index 945230187..47c1d693b 100644 --- a/src/libstore-test-support/path.cc +++ b/src/libstore-test-support/path.cc @@ -3,11 +3,11 @@ #include -#include "nix/path-regex.hh" -#include "nix/store-api.hh" +#include "nix/store/path-regex.hh" +#include "nix/store/store-api.hh" -#include "nix/tests/hash.hh" -#include "nix/tests/path.hh" +#include "nix/util/tests/hash.hh" +#include "nix/store/tests/path.hh" namespace nix { diff --git a/src/libstore-tests/common-protocol.cc b/src/libstore-tests/common-protocol.cc index 39293b0c0..6bfb8bd80 100644 --- a/src/libstore-tests/common-protocol.cc +++ b/src/libstore-tests/common-protocol.cc @@ -3,11 +3,11 @@ #include #include -#include "nix/common-protocol.hh" -#include "nix/common-protocol-impl.hh" -#include "nix/build-result.hh" -#include "nix/tests/protocol.hh" -#include "nix/tests/characterization.hh" +#include "nix/store/common-protocol.hh" +#include "nix/store/common-protocol-impl.hh" +#include "nix/store/build-result.hh" +#include "nix/store/tests/protocol.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libstore-tests/content-address.cc b/src/libstore-tests/content-address.cc index 428ebcd76..c208c944d 100644 --- a/src/libstore-tests/content-address.cc +++ b/src/libstore-tests/content-address.cc @@ -1,6 +1,6 @@ #include -#include "nix/content-address.hh" +#include "nix/store/content-address.hh" namespace nix { diff --git a/src/libstore-tests/derivation-advanced-attrs.cc b/src/libstore-tests/derivation-advanced-attrs.cc index d8f9642ab..57b226826 100644 --- a/src/libstore-tests/derivation-advanced-attrs.cc +++ b/src/libstore-tests/derivation-advanced-attrs.cc @@ -1,16 +1,16 @@ #include #include -#include "nix/experimental-features.hh" -#include "nix/derivations.hh" -#include "nix/derivations.hh" -#include "nix/derivation-options.hh" -#include "nix/parsed-derivations.hh" -#include "nix/types.hh" -#include "nix/json-utils.hh" +#include "nix/util/experimental-features.hh" +#include "nix/store/derivations.hh" +#include "nix/store/derivations.hh" +#include "nix/store/derivation-options.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/util/types.hh" +#include "nix/util/json-utils.hh" -#include "nix/tests/libstore.hh" -#include "nix/tests/characterization.hh" +#include "nix/store/tests/libstore.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libstore-tests/derivation.cc b/src/libstore-tests/derivation.cc index 5ef1c0094..fa6711d40 100644 --- a/src/libstore-tests/derivation.cc +++ b/src/libstore-tests/derivation.cc @@ -1,11 +1,11 @@ #include #include -#include "nix/experimental-features.hh" -#include "nix/derivations.hh" +#include "nix/util/experimental-features.hh" +#include "nix/store/derivations.hh" -#include "nix/tests/libstore.hh" -#include "nix/tests/characterization.hh" +#include "nix/store/tests/libstore.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libstore-tests/derived-path.cc b/src/libstore-tests/derived-path.cc index e6a2fcace..51df25198 100644 --- a/src/libstore-tests/derived-path.cc +++ b/src/libstore-tests/derived-path.cc @@ -3,8 +3,8 @@ #include #include -#include "nix/tests/derived-path.hh" -#include "nix/tests/libstore.hh" +#include "nix/store/tests/derived-path.hh" +#include "nix/store/tests/libstore.hh" namespace nix { diff --git a/src/libstore-tests/downstream-placeholder.cc b/src/libstore-tests/downstream-placeholder.cc index 76c6410ad..604c80017 100644 --- a/src/libstore-tests/downstream-placeholder.cc +++ b/src/libstore-tests/downstream-placeholder.cc @@ -1,6 +1,6 @@ #include -#include "nix/downstream-placeholder.hh" +#include "nix/store/downstream-placeholder.hh" namespace nix { diff --git a/src/libstore-tests/http-binary-cache-store.cc b/src/libstore-tests/http-binary-cache-store.cc index bc4e52936..f4a3408b5 100644 --- a/src/libstore-tests/http-binary-cache-store.cc +++ b/src/libstore-tests/http-binary-cache-store.cc @@ -1,6 +1,6 @@ #include -#include "nix/http-binary-cache-store.hh" +#include "nix/store/http-binary-cache-store.hh" namespace nix { diff --git a/src/libstore-tests/legacy-ssh-store.cc b/src/libstore-tests/legacy-ssh-store.cc index 5a23cf5b2..158da2831 100644 --- a/src/libstore-tests/legacy-ssh-store.cc +++ b/src/libstore-tests/legacy-ssh-store.cc @@ -1,6 +1,6 @@ #include -#include "nix/legacy-ssh-store.hh" +#include "nix/store/legacy-ssh-store.hh" namespace nix { diff --git a/src/libstore-tests/local-binary-cache-store.cc b/src/libstore-tests/local-binary-cache-store.cc index 8adc22202..01f514e89 100644 --- a/src/libstore-tests/local-binary-cache-store.cc +++ b/src/libstore-tests/local-binary-cache-store.cc @@ -1,6 +1,6 @@ #include -#include "nix/local-binary-cache-store.hh" +#include "nix/store/local-binary-cache-store.hh" namespace nix { diff --git a/src/libstore-tests/local-overlay-store.cc b/src/libstore-tests/local-overlay-store.cc index 8e9d25bc3..fe064c3a5 100644 --- a/src/libstore-tests/local-overlay-store.cc +++ b/src/libstore-tests/local-overlay-store.cc @@ -3,7 +3,7 @@ #if 0 # include -# include "nix/local-overlay-store.hh" +# include "nix/store/local-overlay-store.hh" namespace nix { diff --git a/src/libstore-tests/local-store.cc b/src/libstore-tests/local-store.cc index 8977234a3..ece277609 100644 --- a/src/libstore-tests/local-store.cc +++ b/src/libstore-tests/local-store.cc @@ -3,13 +3,13 @@ #if 0 # include -# include "nix/local-store.hh" +# include "nix/store/local-store.hh" // Needed for template specialisations. This is not good! When we // overhaul how store configs work, this should be fixed. -# include "nix/args.hh" -# include "nix/config-impl.hh" -# include "nix/abstract-setting-to-json.hh" +# include "nix/util/args.hh" +# include "nix/util/config-impl.hh" +# include "nix/util/abstract-setting-to-json.hh" namespace nix { diff --git a/src/libstore-tests/machines.cc b/src/libstore-tests/machines.cc index 219494f16..1d574ceeb 100644 --- a/src/libstore-tests/machines.cc +++ b/src/libstore-tests/machines.cc @@ -1,8 +1,8 @@ -#include "nix/machines.hh" -#include "nix/file-system.hh" -#include "nix/util.hh" +#include "nix/store/machines.hh" +#include "nix/util/file-system.hh" +#include "nix/util/util.hh" -#include "nix/tests/characterization.hh" +#include "nix/util/tests/characterization.hh" #include #include diff --git a/src/libstore-tests/nar-info-disk-cache.cc b/src/libstore-tests/nar-info-disk-cache.cc index b15ee351a..4c7354c0c 100644 --- a/src/libstore-tests/nar-info-disk-cache.cc +++ b/src/libstore-tests/nar-info-disk-cache.cc @@ -1,8 +1,8 @@ -#include "nix/nar-info-disk-cache.hh" +#include "nix/store/nar-info-disk-cache.hh" #include #include -#include "nix/sqlite.hh" +#include "nix/store/sqlite.hh" #include diff --git a/src/libstore-tests/nar-info.cc b/src/libstore-tests/nar-info.cc index 544680914..1979deef8 100644 --- a/src/libstore-tests/nar-info.cc +++ b/src/libstore-tests/nar-info.cc @@ -1,11 +1,11 @@ #include #include -#include "nix/path-info.hh" -#include "nix/nar-info.hh" +#include "nix/store/path-info.hh" +#include "nix/store/nar-info.hh" -#include "nix/tests/characterization.hh" -#include "nix/tests/libstore.hh" +#include "nix/util/tests/characterization.hh" +#include "nix/store/tests/libstore.hh" namespace nix { diff --git a/src/libstore-tests/nix_api_store.cc b/src/libstore-tests/nix_api_store.cc index 293547c95..4eb95360a 100644 --- a/src/libstore-tests/nix_api_store.cc +++ b/src/libstore-tests/nix_api_store.cc @@ -3,8 +3,8 @@ #include "nix_api_store.h" #include "nix_api_store_internal.h" -#include "nix/tests/nix_api_store.hh" -#include "nix/tests/string_callback.hh" +#include "nix/store/tests/nix_api_store.hh" +#include "nix/util/tests/string_callback.hh" #include "store-tests-config.hh" diff --git a/src/libstore-tests/outputs-spec.cc b/src/libstore-tests/outputs-spec.cc index 007e5a935..a17922c46 100644 --- a/src/libstore-tests/outputs-spec.cc +++ b/src/libstore-tests/outputs-spec.cc @@ -1,4 +1,4 @@ -#include "nix/tests/outputs-spec.hh" +#include "nix/store/tests/outputs-spec.hh" #include #include diff --git a/src/libstore-tests/path-info.cc b/src/libstore-tests/path-info.cc index df3b60f13..9cd98a3d9 100644 --- a/src/libstore-tests/path-info.cc +++ b/src/libstore-tests/path-info.cc @@ -1,10 +1,10 @@ #include #include -#include "nix/path-info.hh" +#include "nix/store/path-info.hh" -#include "nix/tests/characterization.hh" -#include "nix/tests/libstore.hh" +#include "nix/util/tests/characterization.hh" +#include "nix/store/tests/libstore.hh" namespace nix { diff --git a/src/libstore-tests/path.cc b/src/libstore-tests/path.cc index bcfce2c9f..4da73a0ad 100644 --- a/src/libstore-tests/path.cc +++ b/src/libstore-tests/path.cc @@ -4,12 +4,12 @@ #include #include -#include "nix/path-regex.hh" -#include "nix/store-api.hh" +#include "nix/store/path-regex.hh" +#include "nix/store/store-api.hh" -#include "nix/tests/hash.hh" -#include "nix/tests/libstore.hh" -#include "nix/tests/path.hh" +#include "nix/util/tests/hash.hh" +#include "nix/store/tests/libstore.hh" +#include "nix/store/tests/path.hh" namespace nix { diff --git a/src/libstore-tests/references.cc b/src/libstore-tests/references.cc index da4b7af39..59993727d 100644 --- a/src/libstore-tests/references.cc +++ b/src/libstore-tests/references.cc @@ -1,4 +1,4 @@ -#include "nix/references.hh" +#include "nix/util/references.hh" #include diff --git a/src/libstore-tests/s3-binary-cache-store.cc b/src/libstore-tests/s3-binary-cache-store.cc index 99db360ce..be338084f 100644 --- a/src/libstore-tests/s3-binary-cache-store.cc +++ b/src/libstore-tests/s3-binary-cache-store.cc @@ -2,7 +2,7 @@ # include -# include "nix/s3-binary-cache-store.hh" +# include "nix/store/s3-binary-cache-store.hh" namespace nix { diff --git a/src/libstore-tests/serve-protocol.cc b/src/libstore-tests/serve-protocol.cc index dd53b80d6..9297d46ea 100644 --- a/src/libstore-tests/serve-protocol.cc +++ b/src/libstore-tests/serve-protocol.cc @@ -4,13 +4,13 @@ #include #include -#include "nix/serve-protocol.hh" -#include "nix/serve-protocol-impl.hh" -#include "nix/serve-protocol-connection.hh" -#include "nix/build-result.hh" -#include "nix/file-descriptor.hh" -#include "nix/tests/protocol.hh" -#include "nix/tests/characterization.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/serve-protocol-impl.hh" +#include "nix/store/serve-protocol-connection.hh" +#include "nix/store/build-result.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/store/tests/protocol.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libstore-tests/ssh-store.cc b/src/libstore-tests/ssh-store.cc index 1c54a229e..ccb87b767 100644 --- a/src/libstore-tests/ssh-store.cc +++ b/src/libstore-tests/ssh-store.cc @@ -3,7 +3,7 @@ #if 0 # include -# include "nix/ssh-store.hh" +# include "nix/store/ssh-store.hh" namespace nix { diff --git a/src/libstore-tests/store-reference.cc b/src/libstore-tests/store-reference.cc index f8e533fa0..dd1b83090 100644 --- a/src/libstore-tests/store-reference.cc +++ b/src/libstore-tests/store-reference.cc @@ -1,11 +1,11 @@ #include #include -#include "nix/file-system.hh" -#include "nix/store-reference.hh" +#include "nix/util/file-system.hh" +#include "nix/store/store-reference.hh" -#include "nix/tests/characterization.hh" -#include "nix/tests/libstore.hh" +#include "nix/util/tests/characterization.hh" +#include "nix/store/tests/libstore.hh" namespace nix { diff --git a/src/libstore-tests/uds-remote-store.cc b/src/libstore-tests/uds-remote-store.cc index 7157bfbfd..c6a926668 100644 --- a/src/libstore-tests/uds-remote-store.cc +++ b/src/libstore-tests/uds-remote-store.cc @@ -3,7 +3,7 @@ #if 0 # include -# include "nix/uds-remote-store.hh" +# include "nix/store/uds-remote-store.hh" namespace nix { diff --git a/src/libstore-tests/worker-protocol.cc b/src/libstore-tests/worker-protocol.cc index 0a417ed3e..091cf8a0e 100644 --- a/src/libstore-tests/worker-protocol.cc +++ b/src/libstore-tests/worker-protocol.cc @@ -4,13 +4,13 @@ #include #include -#include "nix/worker-protocol.hh" -#include "nix/worker-protocol-connection.hh" -#include "nix/worker-protocol-impl.hh" -#include "nix/derived-path.hh" -#include "nix/build-result.hh" -#include "nix/tests/protocol.hh" -#include "nix/tests/characterization.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/worker-protocol-connection.hh" +#include "nix/store/worker-protocol-impl.hh" +#include "nix/store/derived-path.hh" +#include "nix/store/build-result.hh" +#include "nix/store/tests/protocol.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 48c449e79..60bd68026 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -1,18 +1,18 @@ -#include "nix/archive.hh" -#include "nix/binary-cache-store.hh" -#include "nix/compression.hh" -#include "nix/derivations.hh" -#include "nix/source-accessor.hh" -#include "nix/globals.hh" -#include "nix/nar-info.hh" -#include "nix/sync.hh" -#include "nix/remote-fs-accessor.hh" -#include "nix/nar-info-disk-cache.hh" -#include "nix/nar-accessor.hh" -#include "nix/thread-pool.hh" -#include "nix/callback.hh" -#include "nix/signals.hh" -#include "nix/archive.hh" +#include "nix/util/archive.hh" +#include "nix/store/binary-cache-store.hh" +#include "nix/util/compression.hh" +#include "nix/store/derivations.hh" +#include "nix/util/source-accessor.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info.hh" +#include "nix/util/sync.hh" +#include "nix/store/remote-fs-accessor.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/store/nar-accessor.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/callback.hh" +#include "nix/util/signals.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libstore/build-result.cc b/src/libstore/build-result.cc index 72ad11fae..091661337 100644 --- a/src/libstore/build-result.cc +++ b/src/libstore/build-result.cc @@ -1,4 +1,4 @@ -#include "nix/build-result.hh" +#include "nix/store/build-result.hh" namespace nix { diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index b99d2770d..76456dac5 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -1,22 +1,22 @@ -#include "nix/build/derivation-goal.hh" +#include "nix/store/build/derivation-goal.hh" #ifndef _WIN32 // TODO enable build hook on Windows -# include "nix/build/hook-instance.hh" +# include "nix/store/build/hook-instance.hh" #endif -#include "nix/processes.hh" -#include "nix/config-global.hh" -#include "nix/build/worker.hh" -#include "nix/builtins.hh" -#include "nix/builtins/buildenv.hh" -#include "nix/references.hh" -#include "nix/finally.hh" -#include "nix/util.hh" -#include "nix/archive.hh" -#include "nix/compression.hh" -#include "nix/common-protocol.hh" -#include "nix/common-protocol-impl.hh" -#include "nix/topo-sort.hh" -#include "nix/callback.hh" -#include "nix/local-store.hh" // TODO remove, along with remaining downcasts +#include "nix/util/processes.hh" +#include "nix/util/config-global.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/builtins.hh" +#include "nix/store/builtins/buildenv.hh" +#include "nix/util/references.hh" +#include "nix/util/finally.hh" +#include "nix/util/util.hh" +#include "nix/util/archive.hh" +#include "nix/util/compression.hh" +#include "nix/store/common-protocol.hh" +#include "nix/store/common-protocol-impl.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/callback.hh" +#include "nix/store/local-store.hh" // TODO remove, along with remaining downcasts #include #include @@ -32,7 +32,7 @@ #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index bc410be92..0b912357e 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -1,8 +1,8 @@ -#include "nix/build/drv-output-substitution-goal.hh" -#include "nix/finally.hh" -#include "nix/build/worker.hh" -#include "nix/build/substitution-goal.hh" -#include "nix/callback.hh" +#include "nix/store/build/drv-output-substitution-goal.hh" +#include "nix/util/finally.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/build/entry-points.cc b/src/libstore/build/entry-points.cc index 70b32d3ad..c934b0704 100644 --- a/src/libstore/build/entry-points.cc +++ b/src/libstore/build/entry-points.cc @@ -1,10 +1,10 @@ -#include "nix/build/worker.hh" -#include "nix/build/substitution-goal.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" #ifndef _WIN32 // TODO Enable building on Windows -# include "nix/build/derivation-goal.hh" +# include "nix/store/build/derivation-goal.hh" #endif -#include "nix/local-store.hh" -#include "nix/strings.hh" +#include "nix/store/local-store.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libstore/build/goal.cc b/src/libstore/build/goal.cc index 04eea96c9..d2feb34c7 100644 --- a/src/libstore/build/goal.cc +++ b/src/libstore/build/goal.cc @@ -1,5 +1,5 @@ -#include "nix/build/goal.hh" -#include "nix/build/worker.hh" +#include "nix/store/build/goal.hh" +#include "nix/store/build/worker.hh" namespace nix { diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index 7f5790e5a..b1313808e 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -1,8 +1,8 @@ -#include "nix/build/worker.hh" -#include "nix/build/substitution-goal.hh" -#include "nix/nar-info.hh" -#include "nix/finally.hh" -#include "nix/signals.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" +#include "nix/store/nar-info.hh" +#include "nix/util/finally.hh" +#include "nix/util/signals.hh" #include namespace nix { diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index 964291464..ae50dc3b5 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -1,14 +1,14 @@ -#include "nix/local-store.hh" -#include "nix/machines.hh" -#include "nix/build/worker.hh" -#include "nix/build/substitution-goal.hh" -#include "nix/build/drv-output-substitution-goal.hh" -#include "nix/build/derivation-goal.hh" +#include "nix/store/local-store.hh" +#include "nix/store/machines.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" +#include "nix/store/build/drv-output-substitution-goal.hh" +#include "nix/store/build/derivation-goal.hh" #ifndef _WIN32 // TODO Enable building on Windows -# include "nix/build/local-derivation-goal.hh" -# include "nix/build/hook-instance.hh" +# include "nix/store/build/local-derivation-goal.hh" +# include "nix/store/build/hook-instance.hh" #endif -#include "nix/signals.hh" +#include "nix/util/signals.hh" namespace nix { diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc index 4145593cf..c3b80bb0b 100644 --- a/src/libstore/builtins/buildenv.cc +++ b/src/libstore/builtins/buildenv.cc @@ -1,6 +1,6 @@ -#include "nix/builtins/buildenv.hh" -#include "nix/derivations.hh" -#include "nix/signals.hh" +#include "nix/store/builtins/buildenv.hh" +#include "nix/store/derivations.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc index 28af8427c..82f268d80 100644 --- a/src/libstore/builtins/fetchurl.cc +++ b/src/libstore/builtins/fetchurl.cc @@ -1,8 +1,8 @@ -#include "nix/builtins.hh" -#include "nix/filetransfer.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/compression.hh" +#include "nix/store/builtins.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/util/compression.hh" namespace nix { diff --git a/src/libstore/builtins/unpack-channel.cc b/src/libstore/builtins/unpack-channel.cc index 9e76ee7d3..f6be21e35 100644 --- a/src/libstore/builtins/unpack-channel.cc +++ b/src/libstore/builtins/unpack-channel.cc @@ -1,5 +1,5 @@ -#include "nix/builtins.hh" -#include "nix/tarfile.hh" +#include "nix/store/builtins.hh" +#include "nix/util/tarfile.hh" namespace nix { diff --git a/src/libstore/common-protocol.cc b/src/libstore/common-protocol.cc index 4845d5873..311f4888c 100644 --- a/src/libstore/common-protocol.cc +++ b/src/libstore/common-protocol.cc @@ -1,11 +1,11 @@ -#include "nix/serialise.hh" -#include "nix/path-with-outputs.hh" -#include "nix/store-api.hh" -#include "nix/build-result.hh" -#include "nix/common-protocol.hh" -#include "nix/common-protocol-impl.hh" -#include "nix/archive.hh" -#include "nix/derivations.hh" +#include "nix/util/serialise.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" +#include "nix/store/common-protocol.hh" +#include "nix/store/common-protocol-impl.hh" +#include "nix/util/archive.hh" +#include "nix/store/derivations.hh" #include diff --git a/src/libstore/common-ssh-store-config.cc b/src/libstore/common-ssh-store-config.cc index d4123e326..7cfbc5f98 100644 --- a/src/libstore/common-ssh-store-config.cc +++ b/src/libstore/common-ssh-store-config.cc @@ -1,7 +1,7 @@ #include -#include "nix/common-ssh-store-config.hh" -#include "nix/ssh.hh" +#include "nix/store/common-ssh-store-config.hh" +#include "nix/store/ssh.hh" namespace nix { diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc index a3745b4ef..5d27c4136 100644 --- a/src/libstore/content-address.cc +++ b/src/libstore/content-address.cc @@ -1,6 +1,6 @@ -#include "nix/args.hh" -#include "nix/content-address.hh" -#include "nix/split.hh" +#include "nix/util/args.hh" +#include "nix/store/content-address.hh" +#include "nix/util/split.hh" namespace nix { diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index 6de844748..8f7514273 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -1,23 +1,23 @@ -#include "nix/daemon.hh" -#include "nix/signals.hh" -#include "nix/worker-protocol.hh" -#include "nix/worker-protocol-connection.hh" -#include "nix/worker-protocol-impl.hh" -#include "nix/build-result.hh" -#include "nix/store-api.hh" -#include "nix/store-cast.hh" -#include "nix/gc-store.hh" -#include "nix/log-store.hh" -#include "nix/indirect-root-store.hh" -#include "nix/path-with-outputs.hh" -#include "nix/finally.hh" -#include "nix/archive.hh" -#include "nix/derivations.hh" -#include "nix/args.hh" -#include "nix/git.hh" +#include "nix/store/daemon.hh" +#include "nix/util/signals.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/worker-protocol-connection.hh" +#include "nix/store/worker-protocol-impl.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" +#include "nix/store/indirect-root-store.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/util/finally.hh" +#include "nix/util/archive.hh" +#include "nix/store/derivations.hh" +#include "nix/util/args.hh" +#include "nix/util/git.hh" #ifndef _WIN32 // TODO need graceful async exit support on Windows? -# include "nix/monitor-fd.hh" +# include "nix/util/monitor-fd.hh" #endif #include diff --git a/src/libstore/derivation-options.cc b/src/libstore/derivation-options.cc index 8683fd8ad..962222f6d 100644 --- a/src/libstore/derivation-options.cc +++ b/src/libstore/derivation-options.cc @@ -1,8 +1,8 @@ -#include "nix/derivation-options.hh" -#include "nix/json-utils.hh" -#include "nix/parsed-derivations.hh" -#include "nix/types.hh" -#include "nix/util.hh" +#include "nix/store/derivation-options.hh" +#include "nix/util/json-utils.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/util/types.hh" +#include "nix/util/util.hh" #include #include #include diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 794ce6b6e..9f1271ea7 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -1,14 +1,14 @@ -#include "nix/derivations.hh" -#include "nix/downstream-placeholder.hh" -#include "nix/store-api.hh" -#include "nix/globals.hh" -#include "nix/types.hh" -#include "nix/util.hh" -#include "nix/split.hh" -#include "nix/common-protocol.hh" -#include "nix/common-protocol-impl.hh" -#include "nix/strings-inline.hh" -#include "nix/json-utils.hh" +#include "nix/store/derivations.hh" +#include "nix/store/downstream-placeholder.hh" +#include "nix/store/store-api.hh" +#include "nix/store/globals.hh" +#include "nix/util/types.hh" +#include "nix/util/util.hh" +#include "nix/util/split.hh" +#include "nix/store/common-protocol.hh" +#include "nix/store/common-protocol-impl.hh" +#include "nix/util/strings-inline.hh" +#include "nix/util/json-utils.hh" #include #include diff --git a/src/libstore/derived-path-map.cc b/src/libstore/derived-path-map.cc index cb6d98d5a..d4234d92c 100644 --- a/src/libstore/derived-path-map.cc +++ b/src/libstore/derived-path-map.cc @@ -1,5 +1,5 @@ -#include "nix/derived-path-map.hh" -#include "nix/util.hh" +#include "nix/store/derived-path-map.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libstore/derived-path.cc b/src/libstore/derived-path.cc index c02d78115..6186f0582 100644 --- a/src/libstore/derived-path.cc +++ b/src/libstore/derived-path.cc @@ -1,7 +1,7 @@ -#include "nix/derived-path.hh" -#include "nix/derivations.hh" -#include "nix/store-api.hh" -#include "nix/comparator.hh" +#include "nix/store/derived-path.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/util/comparator.hh" #include diff --git a/src/libstore/downstream-placeholder.cc b/src/libstore/downstream-placeholder.cc index 52c46ddee..24ce2ad99 100644 --- a/src/libstore/downstream-placeholder.cc +++ b/src/libstore/downstream-placeholder.cc @@ -1,5 +1,5 @@ -#include "nix/downstream-placeholder.hh" -#include "nix/derivations.hh" +#include "nix/store/downstream-placeholder.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc index b922b30a6..7252e1d33 100644 --- a/src/libstore/dummy-store.cc +++ b/src/libstore/dummy-store.cc @@ -1,5 +1,5 @@ -#include "nix/store-api.hh" -#include "nix/callback.hh" +#include "nix/store/store-api.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc index efec2a409..5bbdd1e5c 100644 --- a/src/libstore/export-import.cc +++ b/src/libstore/export-import.cc @@ -1,8 +1,8 @@ -#include "nix/serialise.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/common-protocol.hh" -#include "nix/common-protocol-impl.hh" +#include "nix/util/serialise.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/store/common-protocol.hh" +#include "nix/store/common-protocol-impl.hh" #include diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 42c781ca2..bf58cb2b3 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -1,19 +1,19 @@ -#include "nix/filetransfer.hh" -#include "nix/globals.hh" -#include "nix/config-global.hh" -#include "nix/store-api.hh" -#include "nix/s3.hh" -#include "nix/compression.hh" -#include "nix/finally.hh" -#include "nix/callback.hh" -#include "nix/signals.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/globals.hh" +#include "nix/util/config-global.hh" +#include "nix/store/store-api.hh" +#include "nix/store/s3.hh" +#include "nix/util/compression.hh" +#include "nix/util/finally.hh" +#include "nix/util/callback.hh" +#include "nix/util/signals.hh" #if ENABLE_S3 #include #endif #if __linux__ -# include "nix/namespaces.hh" +# include "nix/util/namespaces.hh" #endif #include diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index d4349b7e1..5e56be7f3 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -1,16 +1,16 @@ -#include "nix/derivations.hh" -#include "nix/globals.hh" -#include "nix/local-store.hh" -#include "nix/finally.hh" -#include "nix/unix-domain-socket.hh" -#include "nix/signals.hh" -#include "nix/posix-fs-canonicalise.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" +#include "nix/store/local-store.hh" +#include "nix/util/finally.hh" +#include "nix/util/unix-domain-socket.hh" +#include "nix/util/signals.hh" +#include "nix/store/posix-fs-canonicalise.hh" #include "store-config-private.hh" #if !defined(__linux__) // For shelling out to lsof -# include "nix/processes.hh" +# include "nix/util/processes.hh" #endif #include diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 70feaf311..a3633b084 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -1,12 +1,11 @@ -#include "nix/globals.hh" -#include "nix/config-global.hh" -#include "nix/current-process.hh" -#include "nix/archive.hh" -#include "nix/args.hh" -#include "nix/abstract-setting-to-json.hh" -#include "nix/compute-levels.hh" -#include "nix/signals.hh" -#include "nix/strings.hh" +#include "nix/store/globals.hh" +#include "nix/util/config-global.hh" +#include "nix/util/current-process.hh" +#include "nix/util/archive.hh" +#include "nix/util/args.hh" +#include "nix/util/abstract-setting-to-json.hh" +#include "nix/util/compute-levels.hh" +#include "nix/util/signals.hh" #include #include @@ -27,10 +26,10 @@ #endif #if __APPLE__ -# include "nix/processes.hh" +# include "nix/util/processes.hh" #endif -#include "nix/config-impl.hh" +#include "nix/util/config-impl.hh" #ifdef __APPLE__ #include @@ -38,7 +37,6 @@ #include "store-config-private.hh" - namespace nix { diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc index a8d77f753..4c13d5c73 100644 --- a/src/libstore/http-binary-cache-store.cc +++ b/src/libstore/http-binary-cache-store.cc @@ -1,8 +1,8 @@ -#include "nix/http-binary-cache-store.hh" -#include "nix/filetransfer.hh" -#include "nix/globals.hh" -#include "nix/nar-info-disk-cache.hh" -#include "nix/callback.hh" +#include "nix/store/http-binary-cache-store.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/include/nix/binary-cache-store.hh b/src/libstore/include/nix/store/binary-cache-store.hh similarity index 97% rename from src/libstore/include/nix/binary-cache-store.hh rename to src/libstore/include/nix/store/binary-cache-store.hh index ec012cda8..da4906d3f 100644 --- a/src/libstore/include/nix/binary-cache-store.hh +++ b/src/libstore/include/nix/store/binary-cache-store.hh @@ -1,11 +1,11 @@ #pragma once ///@file -#include "nix/signature/local-keys.hh" -#include "nix/store-api.hh" -#include "nix/log-store.hh" +#include "nix/util/signature/local-keys.hh" +#include "nix/store/store-api.hh" +#include "nix/store/log-store.hh" -#include "nix/pool.hh" +#include "nix/util/pool.hh" #include diff --git a/src/libstore/include/nix/build-result.hh b/src/libstore/include/nix/store/build-result.hh similarity index 98% rename from src/libstore/include/nix/build-result.hh rename to src/libstore/include/nix/store/build-result.hh index 20d726346..edc77a523 100644 --- a/src/libstore/include/nix/build-result.hh +++ b/src/libstore/include/nix/store/build-result.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/realisation.hh" -#include "nix/derived-path.hh" +#include "nix/store/realisation.hh" +#include "nix/store/derived-path.hh" #include #include diff --git a/src/libstore/include/nix/build/derivation-goal.hh b/src/libstore/include/nix/store/build/derivation-goal.hh similarity index 96% rename from src/libstore/include/nix/build/derivation-goal.hh rename to src/libstore/include/nix/store/build/derivation-goal.hh index ec34fd3cf..3baf4babf 100644 --- a/src/libstore/include/nix/build/derivation-goal.hh +++ b/src/libstore/include/nix/store/build/derivation-goal.hh @@ -1,15 +1,15 @@ #pragma once ///@file -#include "nix/parsed-derivations.hh" -#include "nix/derivation-options.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/store/derivation-options.hh" #ifndef _WIN32 -# include "nix/user-lock.hh" +# include "nix/store/user-lock.hh" #endif -#include "nix/outputs-spec.hh" -#include "nix/store-api.hh" -#include "nix/pathlocks.hh" -#include "nix/build/goal.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/store-api.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/build/goal.hh" namespace nix { diff --git a/src/libstore/include/nix/build/drv-output-substitution-goal.hh b/src/libstore/include/nix/store/build/drv-output-substitution-goal.hh similarity index 88% rename from src/libstore/include/nix/build/drv-output-substitution-goal.hh rename to src/libstore/include/nix/store/build/drv-output-substitution-goal.hh index 37c860d5f..a00de41ad 100644 --- a/src/libstore/include/nix/build/drv-output-substitution-goal.hh +++ b/src/libstore/include/nix/store/build/drv-output-substitution-goal.hh @@ -4,10 +4,10 @@ #include #include -#include "nix/store-api.hh" -#include "nix/build/goal.hh" -#include "nix/realisation.hh" -#include "nix/muxable-pipe.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build/goal.hh" +#include "nix/store/realisation.hh" +#include "nix/util/muxable-pipe.hh" namespace nix { diff --git a/src/libstore/include/nix/build/goal.hh b/src/libstore/include/nix/store/build/goal.hh similarity index 99% rename from src/libstore/include/nix/build/goal.hh rename to src/libstore/include/nix/store/build/goal.hh index 61cba972f..9be27f6b3 100644 --- a/src/libstore/include/nix/build/goal.hh +++ b/src/libstore/include/nix/store/build/goal.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/store-api.hh" -#include "nix/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" #include diff --git a/src/libstore/include/nix/build/substitution-goal.hh b/src/libstore/include/nix/store/build/substitution-goal.hh similarity index 93% rename from src/libstore/include/nix/build/substitution-goal.hh rename to src/libstore/include/nix/store/build/substitution-goal.hh index c8139025c..7b68b0821 100644 --- a/src/libstore/include/nix/build/substitution-goal.hh +++ b/src/libstore/include/nix/store/build/substitution-goal.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/build/worker.hh" -#include "nix/store-api.hh" -#include "nix/build/goal.hh" -#include "nix/muxable-pipe.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build/goal.hh" +#include "nix/util/muxable-pipe.hh" #include #include #include diff --git a/src/libstore/include/nix/build/worker.hh b/src/libstore/include/nix/store/build/worker.hh similarity index 98% rename from src/libstore/include/nix/build/worker.hh rename to src/libstore/include/nix/store/build/worker.hh index 467e258df..7e03a0c2f 100644 --- a/src/libstore/include/nix/build/worker.hh +++ b/src/libstore/include/nix/store/build/worker.hh @@ -1,11 +1,11 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/store-api.hh" -#include "nix/build/goal.hh" -#include "nix/realisation.hh" -#include "nix/muxable-pipe.hh" +#include "nix/util/types.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build/goal.hh" +#include "nix/store/realisation.hh" +#include "nix/util/muxable-pipe.hh" #include #include diff --git a/src/libstore/include/nix/builtins.hh b/src/libstore/include/nix/store/builtins.hh similarity index 90% rename from src/libstore/include/nix/builtins.hh rename to src/libstore/include/nix/store/builtins.hh index 5943ae507..004e9ef64 100644 --- a/src/libstore/include/nix/builtins.hh +++ b/src/libstore/include/nix/store/builtins.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/derivations.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/include/nix/builtins/buildenv.hh b/src/libstore/include/nix/store/builtins/buildenv.hh similarity index 96% rename from src/libstore/include/nix/builtins/buildenv.hh rename to src/libstore/include/nix/store/builtins/buildenv.hh index 00fc3bf90..a0a262037 100644 --- a/src/libstore/include/nix/builtins/buildenv.hh +++ b/src/libstore/include/nix/store/builtins/buildenv.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/common-protocol-impl.hh b/src/libstore/include/nix/store/common-protocol-impl.hh similarity index 92% rename from src/libstore/include/nix/common-protocol-impl.hh rename to src/libstore/include/nix/store/common-protocol-impl.hh index 71d5fc015..171b4c6a5 100644 --- a/src/libstore/include/nix/common-protocol-impl.hh +++ b/src/libstore/include/nix/store/common-protocol-impl.hh @@ -8,8 +8,8 @@ * contributing guide. */ -#include "nix/common-protocol.hh" -#include "nix/length-prefixed-protocol-helper.hh" +#include "nix/store/common-protocol.hh" +#include "nix/store/length-prefixed-protocol-helper.hh" namespace nix { diff --git a/src/libstore/include/nix/common-protocol.hh b/src/libstore/include/nix/store/common-protocol.hh similarity index 98% rename from src/libstore/include/nix/common-protocol.hh rename to src/libstore/include/nix/store/common-protocol.hh index 260f19256..b464cda67 100644 --- a/src/libstore/include/nix/common-protocol.hh +++ b/src/libstore/include/nix/store/common-protocol.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/serialise.hh" +#include "nix/util/serialise.hh" namespace nix { diff --git a/src/libstore/include/nix/common-ssh-store-config.hh b/src/libstore/include/nix/store/common-ssh-store-config.hh similarity index 98% rename from src/libstore/include/nix/common-ssh-store-config.hh rename to src/libstore/include/nix/store/common-ssh-store-config.hh index 54aa8cb5e..f82124c66 100644 --- a/src/libstore/include/nix/common-ssh-store-config.hh +++ b/src/libstore/include/nix/store/common-ssh-store-config.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/content-address.hh b/src/libstore/include/nix/store/content-address.hh similarity index 98% rename from src/libstore/include/nix/content-address.hh rename to src/libstore/include/nix/store/content-address.hh index 6a2cbb1ef..8442fabb2 100644 --- a/src/libstore/include/nix/content-address.hh +++ b/src/libstore/include/nix/store/content-address.hh @@ -2,10 +2,10 @@ ///@file #include -#include "nix/hash.hh" -#include "nix/path.hh" -#include "nix/file-content-address.hh" -#include "nix/variant-wrapper.hh" +#include "nix/util/hash.hh" +#include "nix/store/path.hh" +#include "nix/util/file-content-address.hh" +#include "nix/util/variant-wrapper.hh" namespace nix { diff --git a/src/libstore/include/nix/daemon.hh b/src/libstore/include/nix/store/daemon.hh similarity index 79% rename from src/libstore/include/nix/daemon.hh rename to src/libstore/include/nix/store/daemon.hh index 38df57967..d14541df7 100644 --- a/src/libstore/include/nix/daemon.hh +++ b/src/libstore/include/nix/store/daemon.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/serialise.hh" -#include "nix/store-api.hh" +#include "nix/util/serialise.hh" +#include "nix/store/store-api.hh" namespace nix::daemon { diff --git a/src/libstore/include/nix/derivation-options.hh b/src/libstore/include/nix/store/derivation-options.hh similarity index 98% rename from src/libstore/include/nix/derivation-options.hh rename to src/libstore/include/nix/store/derivation-options.hh index 459b7de78..8f549b737 100644 --- a/src/libstore/include/nix/derivation-options.hh +++ b/src/libstore/include/nix/store/derivation-options.hh @@ -6,8 +6,8 @@ #include #include -#include "nix/types.hh" -#include "nix/json-impls.hh" +#include "nix/util/types.hh" +#include "nix/util/json-impls.hh" namespace nix { diff --git a/src/libstore/include/nix/derivations.hh b/src/libstore/include/nix/store/derivations.hh similarity index 98% rename from src/libstore/include/nix/derivations.hh rename to src/libstore/include/nix/store/derivations.hh index a01083332..01ff337f6 100644 --- a/src/libstore/include/nix/derivations.hh +++ b/src/libstore/include/nix/store/derivations.hh @@ -1,14 +1,14 @@ #pragma once ///@file -#include "nix/path.hh" -#include "nix/types.hh" -#include "nix/hash.hh" -#include "nix/content-address.hh" -#include "nix/repair-flag.hh" -#include "nix/derived-path-map.hh" -#include "nix/sync.hh" -#include "nix/variant-wrapper.hh" +#include "nix/store/path.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" +#include "nix/store/content-address.hh" +#include "nix/util/repair-flag.hh" +#include "nix/store/derived-path-map.hh" +#include "nix/util/sync.hh" +#include "nix/util/variant-wrapper.hh" #include #include diff --git a/src/libstore/include/nix/derived-path-map.hh b/src/libstore/include/nix/store/derived-path-map.hh similarity index 98% rename from src/libstore/include/nix/derived-path-map.hh rename to src/libstore/include/nix/store/derived-path-map.hh index 24c5ca3d7..956f8bb0b 100644 --- a/src/libstore/include/nix/derived-path-map.hh +++ b/src/libstore/include/nix/store/derived-path-map.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/derived-path.hh" +#include "nix/util/types.hh" +#include "nix/store/derived-path.hh" namespace nix { diff --git a/src/libstore/include/nix/derived-path.hh b/src/libstore/include/nix/store/derived-path.hh similarity index 98% rename from src/libstore/include/nix/derived-path.hh rename to src/libstore/include/nix/store/derived-path.hh index f50ca6e94..64189bd41 100644 --- a/src/libstore/include/nix/derived-path.hh +++ b/src/libstore/include/nix/store/derived-path.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/path.hh" -#include "nix/outputs-spec.hh" -#include "nix/config.hh" -#include "nix/ref.hh" +#include "nix/store/path.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/util/configuration.hh" +#include "nix/util/ref.hh" #include diff --git a/src/libstore/include/nix/downstream-placeholder.hh b/src/libstore/include/nix/store/downstream-placeholder.hh similarity index 97% rename from src/libstore/include/nix/downstream-placeholder.hh rename to src/libstore/include/nix/store/downstream-placeholder.hh index eb6662d3b..da03cd9a6 100644 --- a/src/libstore/include/nix/downstream-placeholder.hh +++ b/src/libstore/include/nix/store/downstream-placeholder.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/hash.hh" -#include "nix/path.hh" -#include "nix/derived-path.hh" +#include "nix/util/hash.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" namespace nix { diff --git a/src/libstore/include/nix/filetransfer.hh b/src/libstore/include/nix/store/filetransfer.hh similarity index 96% rename from src/libstore/include/nix/filetransfer.hh rename to src/libstore/include/nix/store/filetransfer.hh index 31ad1aabd..217c52d77 100644 --- a/src/libstore/include/nix/filetransfer.hh +++ b/src/libstore/include/nix/store/filetransfer.hh @@ -4,11 +4,11 @@ #include #include -#include "nix/logging.hh" -#include "nix/types.hh" -#include "nix/ref.hh" -#include "nix/config.hh" -#include "nix/serialise.hh" +#include "nix/util/logging.hh" +#include "nix/util/types.hh" +#include "nix/util/ref.hh" +#include "nix/util/configuration.hh" +#include "nix/util/serialise.hh" namespace nix { diff --git a/src/libstore/include/nix/gc-store.hh b/src/libstore/include/nix/store/gc-store.hh similarity index 99% rename from src/libstore/include/nix/gc-store.hh rename to src/libstore/include/nix/store/gc-store.hh index f5f685540..cef6e8776 100644 --- a/src/libstore/include/nix/gc-store.hh +++ b/src/libstore/include/nix/store/gc-store.hh @@ -3,7 +3,7 @@ #include -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/globals.hh b/src/libstore/include/nix/store/globals.hh similarity index 99% rename from src/libstore/include/nix/globals.hh rename to src/libstore/include/nix/store/globals.hh index 1630c0ae7..4c4395e05 100644 --- a/src/libstore/include/nix/globals.hh +++ b/src/libstore/include/nix/store/globals.hh @@ -6,13 +6,13 @@ #include -#include "nix/types.hh" -#include "nix/config.hh" -#include "nix/environment-variables.hh" -#include "nix/experimental-features.hh" -#include "nix/users.hh" +#include "nix/util/types.hh" +#include "nix/util/configuration.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/experimental-features.hh" +#include "nix/util/users.hh" -#include "nix/store-config.hh" +#include "nix/store/config.hh" namespace nix { diff --git a/src/libstore/include/nix/http-binary-cache-store.hh b/src/libstore/include/nix/store/http-binary-cache-store.hh similarity index 93% rename from src/libstore/include/nix/http-binary-cache-store.hh rename to src/libstore/include/nix/store/http-binary-cache-store.hh index 9dadda4d3..aaec3116d 100644 --- a/src/libstore/include/nix/http-binary-cache-store.hh +++ b/src/libstore/include/nix/store/http-binary-cache-store.hh @@ -1,4 +1,4 @@ -#include "nix/binary-cache-store.hh" +#include "nix/store/binary-cache-store.hh" namespace nix { diff --git a/src/libstore/include/nix/indirect-root-store.hh b/src/libstore/include/nix/store/indirect-root-store.hh similarity index 98% rename from src/libstore/include/nix/indirect-root-store.hh rename to src/libstore/include/nix/store/indirect-root-store.hh index de4de138b..bbdad83f3 100644 --- a/src/libstore/include/nix/indirect-root-store.hh +++ b/src/libstore/include/nix/store/indirect-root-store.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/local-fs-store.hh" +#include "nix/store/local-fs-store.hh" namespace nix { diff --git a/src/libstore/include/nix/keys.hh b/src/libstore/include/nix/store/keys.hh similarity index 64% rename from src/libstore/include/nix/keys.hh rename to src/libstore/include/nix/store/keys.hh index ae0fa8d02..77aec6bb2 100644 --- a/src/libstore/include/nix/keys.hh +++ b/src/libstore/include/nix/store/keys.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/signature/local-keys.hh" +#include "nix/util/signature/local-keys.hh" namespace nix { diff --git a/src/libstore/include/nix/legacy-ssh-store.hh b/src/libstore/include/nix/store/legacy-ssh-store.hh similarity index 96% rename from src/libstore/include/nix/legacy-ssh-store.hh rename to src/libstore/include/nix/store/legacy-ssh-store.hh index 9c4a9230d..a1fbf3f1e 100644 --- a/src/libstore/include/nix/legacy-ssh-store.hh +++ b/src/libstore/include/nix/store/legacy-ssh-store.hh @@ -1,12 +1,12 @@ #pragma once ///@file -#include "nix/common-ssh-store-config.hh" -#include "nix/store-api.hh" -#include "nix/ssh.hh" -#include "nix/callback.hh" -#include "nix/pool.hh" -#include "nix/serve-protocol.hh" +#include "nix/store/common-ssh-store-config.hh" +#include "nix/store/store-api.hh" +#include "nix/store/ssh.hh" +#include "nix/util/callback.hh" +#include "nix/util/pool.hh" +#include "nix/store/serve-protocol.hh" namespace nix { diff --git a/src/libstore/include/nix/length-prefixed-protocol-helper.hh b/src/libstore/include/nix/store/length-prefixed-protocol-helper.hh similarity index 99% rename from src/libstore/include/nix/length-prefixed-protocol-helper.hh rename to src/libstore/include/nix/store/length-prefixed-protocol-helper.hh index ad7b32793..664841aae 100644 --- a/src/libstore/include/nix/length-prefixed-protocol-helper.hh +++ b/src/libstore/include/nix/store/length-prefixed-protocol-helper.hh @@ -8,7 +8,7 @@ * Used by both the Worker and Serve protocols. */ -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/include/nix/local-binary-cache-store.hh b/src/libstore/include/nix/store/local-binary-cache-store.hh similarity index 91% rename from src/libstore/include/nix/local-binary-cache-store.hh rename to src/libstore/include/nix/store/local-binary-cache-store.hh index acff6621d..dde4701da 100644 --- a/src/libstore/include/nix/local-binary-cache-store.hh +++ b/src/libstore/include/nix/store/local-binary-cache-store.hh @@ -1,4 +1,4 @@ -#include "nix/binary-cache-store.hh" +#include "nix/store/binary-cache-store.hh" namespace nix { diff --git a/src/libstore/include/nix/local-fs-store.hh b/src/libstore/include/nix/store/local-fs-store.hh similarity index 96% rename from src/libstore/include/nix/local-fs-store.hh rename to src/libstore/include/nix/store/local-fs-store.hh index 2a5f6e3e7..6d5afcb08 100644 --- a/src/libstore/include/nix/local-fs-store.hh +++ b/src/libstore/include/nix/store/local-fs-store.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/store-api.hh" -#include "nix/gc-store.hh" -#include "nix/log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" namespace nix { diff --git a/src/libstore/include/nix/local-overlay-store.hh b/src/libstore/include/nix/store/local-overlay-store.hh similarity index 99% rename from src/libstore/include/nix/local-overlay-store.hh rename to src/libstore/include/nix/store/local-overlay-store.hh index 1cee3cc9f..825214cb6 100644 --- a/src/libstore/include/nix/local-overlay-store.hh +++ b/src/libstore/include/nix/store/local-overlay-store.hh @@ -1,4 +1,4 @@ -#include "nix/local-store.hh" +#include "nix/store/local-store.hh" namespace nix { diff --git a/src/libstore/include/nix/local-store.hh b/src/libstore/include/nix/store/local-store.hh similarity index 98% rename from src/libstore/include/nix/local-store.hh rename to src/libstore/include/nix/store/local-store.hh index 917c7ad21..a9109b43d 100644 --- a/src/libstore/include/nix/local-store.hh +++ b/src/libstore/include/nix/store/local-store.hh @@ -1,12 +1,12 @@ #pragma once ///@file -#include "nix/sqlite.hh" +#include "nix/store/sqlite.hh" -#include "nix/pathlocks.hh" -#include "nix/store-api.hh" -#include "nix/indirect-root-store.hh" -#include "nix/sync.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/store-api.hh" +#include "nix/store/indirect-root-store.hh" +#include "nix/util/sync.hh" #include #include diff --git a/src/libstore/include/nix/log-store.hh b/src/libstore/include/nix/store/log-store.hh similarity index 94% rename from src/libstore/include/nix/log-store.hh rename to src/libstore/include/nix/store/log-store.hh index 5cd8a9f88..fc12b0c47 100644 --- a/src/libstore/include/nix/log-store.hh +++ b/src/libstore/include/nix/store/log-store.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/machines.hh b/src/libstore/include/nix/store/machines.hh similarity index 97% rename from src/libstore/include/nix/machines.hh rename to src/libstore/include/nix/store/machines.hh index 6cd1853a5..f07d6b63b 100644 --- a/src/libstore/include/nix/machines.hh +++ b/src/libstore/include/nix/store/machines.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/ref.hh" -#include "nix/store-reference.hh" +#include "nix/util/ref.hh" +#include "nix/store/store-reference.hh" namespace nix { diff --git a/src/libstore/include/nix/make-content-addressed.hh b/src/libstore/include/nix/store/make-content-addressed.hh similarity index 93% rename from src/libstore/include/nix/make-content-addressed.hh rename to src/libstore/include/nix/store/make-content-addressed.hh index 75fe4462f..3881b6d40 100644 --- a/src/libstore/include/nix/make-content-addressed.hh +++ b/src/libstore/include/nix/store/make-content-addressed.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/meson.build b/src/libstore/include/nix/store/meson.build similarity index 96% rename from src/libstore/include/nix/meson.build rename to src/libstore/include/nix/store/meson.build index d67d0f63a..551031b32 100644 --- a/src/libstore/include/nix/meson.build +++ b/src/libstore/include/nix/store/meson.build @@ -1,12 +1,12 @@ # Public headers directory include_dirs = [ - include_directories('..'), + include_directories('../..'), ] config_pub_h = configure_file( configuration : configdata_pub, - output : 'store-config.hh', + output : 'config.hh', ) headers = [config_pub_h] + files( diff --git a/src/libstore/include/nix/names.hh b/src/libstore/include/nix/store/names.hh similarity index 95% rename from src/libstore/include/nix/names.hh rename to src/libstore/include/nix/store/names.hh index f11c22b1c..ab315de63 100644 --- a/src/libstore/include/nix/names.hh +++ b/src/libstore/include/nix/store/names.hh @@ -3,7 +3,7 @@ #include -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/include/nix/nar-accessor.hh b/src/libstore/include/nix/store/nar-accessor.hh similarity index 95% rename from src/libstore/include/nix/nar-accessor.hh rename to src/libstore/include/nix/store/nar-accessor.hh index b64330547..199d525cb 100644 --- a/src/libstore/include/nix/nar-accessor.hh +++ b/src/libstore/include/nix/store/nar-accessor.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/source-accessor.hh" +#include "nix/util/source-accessor.hh" #include diff --git a/src/libstore/include/nix/nar-info-disk-cache.hh b/src/libstore/include/nix/store/nar-info-disk-cache.hh similarity index 93% rename from src/libstore/include/nix/nar-info-disk-cache.hh rename to src/libstore/include/nix/store/nar-info-disk-cache.hh index 3a301f7e8..a7fde1fbf 100644 --- a/src/libstore/include/nix/nar-info-disk-cache.hh +++ b/src/libstore/include/nix/store/nar-info-disk-cache.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/ref.hh" -#include "nix/nar-info.hh" -#include "nix/realisation.hh" +#include "nix/util/ref.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/realisation.hh" namespace nix { diff --git a/src/libstore/include/nix/nar-info.hh b/src/libstore/include/nix/store/nar-info.hh similarity index 92% rename from src/libstore/include/nix/nar-info.hh rename to src/libstore/include/nix/store/nar-info.hh index 117be878f..d66b6e058 100644 --- a/src/libstore/include/nix/nar-info.hh +++ b/src/libstore/include/nix/store/nar-info.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/hash.hh" -#include "nix/path-info.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" +#include "nix/store/path-info.hh" namespace nix { diff --git a/src/libstore/include/nix/outputs-spec.hh b/src/libstore/include/nix/store/outputs-spec.hh similarity index 97% rename from src/libstore/include/nix/outputs-spec.hh rename to src/libstore/include/nix/store/outputs-spec.hh index 324d3a334..b89f425c2 100644 --- a/src/libstore/include/nix/outputs-spec.hh +++ b/src/libstore/include/nix/store/outputs-spec.hh @@ -6,8 +6,8 @@ #include #include -#include "nix/json-impls.hh" -#include "nix/variant-wrapper.hh" +#include "nix/util/json-impls.hh" +#include "nix/util/variant-wrapper.hh" namespace nix { diff --git a/src/libstore/include/nix/parsed-derivations.hh b/src/libstore/include/nix/store/parsed-derivations.hh similarity index 94% rename from src/libstore/include/nix/parsed-derivations.hh rename to src/libstore/include/nix/store/parsed-derivations.hh index 34e254e0d..d65db6133 100644 --- a/src/libstore/include/nix/parsed-derivations.hh +++ b/src/libstore/include/nix/store/parsed-derivations.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/derivations.hh" -#include "nix/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/include/nix/path-info.hh b/src/libstore/include/nix/store/path-info.hh similarity index 97% rename from src/libstore/include/nix/path-info.hh rename to src/libstore/include/nix/store/path-info.hh index 45c411ddd..9bd493422 100644 --- a/src/libstore/include/nix/path-info.hh +++ b/src/libstore/include/nix/store/path-info.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/signature/signer.hh" -#include "nix/path.hh" -#include "nix/hash.hh" -#include "nix/content-address.hh" +#include "nix/util/signature/signer.hh" +#include "nix/store/path.hh" +#include "nix/util/hash.hh" +#include "nix/store/content-address.hh" #include #include diff --git a/src/libstore/include/nix/path-references.hh b/src/libstore/include/nix/store/path-references.hh similarity index 89% rename from src/libstore/include/nix/path-references.hh rename to src/libstore/include/nix/store/path-references.hh index 0b5e42764..b8d0b4dd0 100644 --- a/src/libstore/include/nix/path-references.hh +++ b/src/libstore/include/nix/store/path-references.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/references.hh" -#include "nix/path.hh" +#include "nix/util/references.hh" +#include "nix/store/path.hh" namespace nix { diff --git a/src/libstore/include/nix/path-regex.hh b/src/libstore/include/nix/store/path-regex.hh similarity index 100% rename from src/libstore/include/nix/path-regex.hh rename to src/libstore/include/nix/store/path-regex.hh diff --git a/src/libstore/include/nix/path-with-outputs.hh b/src/libstore/include/nix/store/path-with-outputs.hh similarity index 95% rename from src/libstore/include/nix/path-with-outputs.hh rename to src/libstore/include/nix/store/path-with-outputs.hh index e2ff303f2..76c1f9f8f 100644 --- a/src/libstore/include/nix/path-with-outputs.hh +++ b/src/libstore/include/nix/store/path-with-outputs.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/path.hh" -#include "nix/derived-path.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" namespace nix { diff --git a/src/libstore/include/nix/path.hh b/src/libstore/include/nix/store/path.hh similarity index 98% rename from src/libstore/include/nix/path.hh rename to src/libstore/include/nix/store/path.hh index 56cd5aeb7..279e9dba4 100644 --- a/src/libstore/include/nix/path.hh +++ b/src/libstore/include/nix/store/path.hh @@ -3,7 +3,7 @@ #include -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/include/nix/pathlocks.hh b/src/libstore/include/nix/store/pathlocks.hh similarity index 96% rename from src/libstore/include/nix/pathlocks.hh rename to src/libstore/include/nix/store/pathlocks.hh index 68f5a0262..33cad7868 100644 --- a/src/libstore/include/nix/pathlocks.hh +++ b/src/libstore/include/nix/store/pathlocks.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/file-descriptor.hh" +#include "nix/util/file-descriptor.hh" namespace nix { diff --git a/src/libstore/include/nix/posix-fs-canonicalise.hh b/src/libstore/include/nix/store/posix-fs-canonicalise.hh similarity index 95% rename from src/libstore/include/nix/posix-fs-canonicalise.hh rename to src/libstore/include/nix/store/posix-fs-canonicalise.hh index 1309db098..1d6696023 100644 --- a/src/libstore/include/nix/posix-fs-canonicalise.hh +++ b/src/libstore/include/nix/store/posix-fs-canonicalise.hh @@ -4,8 +4,8 @@ #include #include -#include "nix/types.hh" -#include "nix/error.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libstore/include/nix/profiles.hh b/src/libstore/include/nix/store/profiles.hh similarity index 99% rename from src/libstore/include/nix/profiles.hh rename to src/libstore/include/nix/store/profiles.hh index 85f45cb73..804c6e2b7 100644 --- a/src/libstore/include/nix/profiles.hh +++ b/src/libstore/include/nix/store/profiles.hh @@ -7,8 +7,8 @@ * See the manual for additional information. */ -#include "nix/types.hh" -#include "nix/pathlocks.hh" +#include "nix/util/types.hh" +#include "nix/store/pathlocks.hh" #include #include diff --git a/src/libstore/include/nix/realisation.hh b/src/libstore/include/nix/store/realisation.hh similarity index 96% rename from src/libstore/include/nix/realisation.hh rename to src/libstore/include/nix/store/realisation.hh index 2d868980c..b93ae37b6 100644 --- a/src/libstore/include/nix/realisation.hh +++ b/src/libstore/include/nix/store/realisation.hh @@ -3,12 +3,12 @@ #include -#include "nix/hash.hh" -#include "nix/path.hh" -#include "nix/derived-path.hh" +#include "nix/util/hash.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" #include -#include "nix/comparator.hh" -#include "nix/signature/signer.hh" +#include "nix/util/comparator.hh" +#include "nix/util/signature/signer.hh" namespace nix { diff --git a/src/libstore/include/nix/remote-fs-accessor.hh b/src/libstore/include/nix/store/remote-fs-accessor.hh similarity index 90% rename from src/libstore/include/nix/remote-fs-accessor.hh rename to src/libstore/include/nix/store/remote-fs-accessor.hh index 5abb195ee..75a840fb0 100644 --- a/src/libstore/include/nix/remote-fs-accessor.hh +++ b/src/libstore/include/nix/store/remote-fs-accessor.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/source-accessor.hh" -#include "nix/ref.hh" -#include "nix/store-api.hh" +#include "nix/util/source-accessor.hh" +#include "nix/util/ref.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/remote-store-connection.hh b/src/libstore/include/nix/store/remote-store-connection.hh similarity index 90% rename from src/libstore/include/nix/remote-store-connection.hh rename to src/libstore/include/nix/store/remote-store-connection.hh index 5b11a04f7..33ec265c2 100644 --- a/src/libstore/include/nix/remote-store-connection.hh +++ b/src/libstore/include/nix/store/remote-store-connection.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/remote-store.hh" -#include "nix/worker-protocol.hh" -#include "nix/worker-protocol-connection.hh" -#include "nix/pool.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/worker-protocol-connection.hh" +#include "nix/util/pool.hh" namespace nix { diff --git a/src/libstore/include/nix/remote-store.hh b/src/libstore/include/nix/store/remote-store.hh similarity index 98% rename from src/libstore/include/nix/remote-store.hh rename to src/libstore/include/nix/store/remote-store.hh index ebc9b2a81..ecf18bd76 100644 --- a/src/libstore/include/nix/remote-store.hh +++ b/src/libstore/include/nix/store/remote-store.hh @@ -4,9 +4,9 @@ #include #include -#include "nix/store-api.hh" -#include "nix/gc-store.hh" -#include "nix/log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" namespace nix { diff --git a/src/libstore/include/nix/restricted-store.hh b/src/libstore/include/nix/store/restricted-store.hh similarity index 100% rename from src/libstore/include/nix/restricted-store.hh rename to src/libstore/include/nix/store/restricted-store.hh diff --git a/src/libstore/include/nix/s3-binary-cache-store.hh b/src/libstore/include/nix/store/s3-binary-cache-store.hh similarity index 98% rename from src/libstore/include/nix/s3-binary-cache-store.hh rename to src/libstore/include/nix/store/s3-binary-cache-store.hh index a0ca22bbb..eec2dc6ee 100644 --- a/src/libstore/include/nix/s3-binary-cache-store.hh +++ b/src/libstore/include/nix/store/s3-binary-cache-store.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/binary-cache-store.hh" +#include "nix/store/binary-cache-store.hh" #include diff --git a/src/libstore/include/nix/s3.hh b/src/libstore/include/nix/store/s3.hh similarity index 96% rename from src/libstore/include/nix/s3.hh rename to src/libstore/include/nix/store/s3.hh index 367c41d36..c49fa3fb8 100644 --- a/src/libstore/include/nix/s3.hh +++ b/src/libstore/include/nix/store/s3.hh @@ -3,7 +3,7 @@ #if ENABLE_S3 -#include "nix/ref.hh" +#include "nix/util/ref.hh" #include #include diff --git a/src/libstore/include/nix/serve-protocol-connection.hh b/src/libstore/include/nix/store/serve-protocol-connection.hh similarity index 97% rename from src/libstore/include/nix/serve-protocol-connection.hh rename to src/libstore/include/nix/store/serve-protocol-connection.hh index f1a9e1ede..5822b4990 100644 --- a/src/libstore/include/nix/serve-protocol-connection.hh +++ b/src/libstore/include/nix/store/serve-protocol-connection.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/serve-protocol.hh" -#include "nix/store-api.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/serve-protocol-impl.hh b/src/libstore/include/nix/store/serve-protocol-impl.hh similarity index 94% rename from src/libstore/include/nix/serve-protocol-impl.hh rename to src/libstore/include/nix/store/serve-protocol-impl.hh index 2621d3b42..769b9ae2b 100644 --- a/src/libstore/include/nix/serve-protocol-impl.hh +++ b/src/libstore/include/nix/store/serve-protocol-impl.hh @@ -8,8 +8,8 @@ * contributing guide. */ -#include "nix/serve-protocol.hh" -#include "nix/length-prefixed-protocol-helper.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/length-prefixed-protocol-helper.hh" namespace nix { diff --git a/src/libstore/include/nix/serve-protocol.hh b/src/libstore/include/nix/store/serve-protocol.hh similarity index 99% rename from src/libstore/include/nix/serve-protocol.hh rename to src/libstore/include/nix/store/serve-protocol.hh index a8587f618..76f0ecd49 100644 --- a/src/libstore/include/nix/serve-protocol.hh +++ b/src/libstore/include/nix/store/serve-protocol.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/common-protocol.hh" +#include "nix/store/common-protocol.hh" namespace nix { diff --git a/src/libstore/include/nix/sqlite.hh b/src/libstore/include/nix/store/sqlite.hh similarity index 99% rename from src/libstore/include/nix/sqlite.hh rename to src/libstore/include/nix/store/sqlite.hh index 4143fa8a4..266930d75 100644 --- a/src/libstore/include/nix/sqlite.hh +++ b/src/libstore/include/nix/store/sqlite.hh @@ -4,7 +4,7 @@ #include #include -#include "nix/error.hh" +#include "nix/util/error.hh" struct sqlite3; struct sqlite3_stmt; diff --git a/src/libstore/include/nix/ssh-store.hh b/src/libstore/include/nix/store/ssh-store.hh similarity index 89% rename from src/libstore/include/nix/ssh-store.hh rename to src/libstore/include/nix/store/ssh-store.hh index 34ec4f79e..76e8e33a4 100644 --- a/src/libstore/include/nix/ssh-store.hh +++ b/src/libstore/include/nix/store/ssh-store.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/common-ssh-store-config.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/remote-store.hh" +#include "nix/store/common-ssh-store-config.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/remote-store.hh" namespace nix { diff --git a/src/libstore/include/nix/ssh.hh b/src/libstore/include/nix/store/ssh.hh similarity index 95% rename from src/libstore/include/nix/ssh.hh rename to src/libstore/include/nix/store/ssh.hh index fa046d6de..40f2189d8 100644 --- a/src/libstore/include/nix/ssh.hh +++ b/src/libstore/include/nix/store/ssh.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/sync.hh" -#include "nix/processes.hh" -#include "nix/file-system.hh" +#include "nix/util/sync.hh" +#include "nix/util/processes.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libstore/include/nix/store-api.hh b/src/libstore/include/nix/store/store-api.hh similarity index 98% rename from src/libstore/include/nix/store-api.hh rename to src/libstore/include/nix/store/store-api.hh index c25329fd6..070abbe97 100644 --- a/src/libstore/include/nix/store-api.hh +++ b/src/libstore/include/nix/store/store-api.hh @@ -1,20 +1,20 @@ #pragma once ///@file -#include "nix/path.hh" -#include "nix/derived-path.hh" -#include "nix/hash.hh" -#include "nix/content-address.hh" -#include "nix/serialise.hh" -#include "nix/lru-cache.hh" -#include "nix/sync.hh" -#include "nix/globals.hh" -#include "nix/config.hh" -#include "nix/path-info.hh" -#include "nix/repair-flag.hh" -#include "nix/store-dir-config.hh" -#include "nix/store-reference.hh" -#include "nix/source-path.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" +#include "nix/util/hash.hh" +#include "nix/store/content-address.hh" +#include "nix/util/serialise.hh" +#include "nix/util/lru-cache.hh" +#include "nix/util/sync.hh" +#include "nix/store/globals.hh" +#include "nix/util/configuration.hh" +#include "nix/store/path-info.hh" +#include "nix/util/repair-flag.hh" +#include "nix/store/store-dir-config.hh" +#include "nix/store/store-reference.hh" +#include "nix/util/source-path.hh" #include #include diff --git a/src/libstore/include/nix/store-cast.hh b/src/libstore/include/nix/store/store-cast.hh similarity index 93% rename from src/libstore/include/nix/store-cast.hh rename to src/libstore/include/nix/store/store-cast.hh index 4e6691016..0bf61bb77 100644 --- a/src/libstore/include/nix/store-cast.hh +++ b/src/libstore/include/nix/store/store-cast.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/store-dir-config.hh b/src/libstore/include/nix/store/store-dir-config.hh similarity index 94% rename from src/libstore/include/nix/store-dir-config.hh rename to src/libstore/include/nix/store/store-dir-config.hh index 66e084a24..845a003f5 100644 --- a/src/libstore/include/nix/store-dir-config.hh +++ b/src/libstore/include/nix/store/store-dir-config.hh @@ -1,10 +1,10 @@ #pragma once -#include "nix/path.hh" -#include "nix/hash.hh" -#include "nix/content-address.hh" -#include "nix/globals.hh" -#include "nix/config.hh" +#include "nix/store/path.hh" +#include "nix/util/hash.hh" +#include "nix/store/content-address.hh" +#include "nix/store/globals.hh" +#include "nix/util/configuration.hh" #include #include diff --git a/src/libstore/include/nix/store-reference.hh b/src/libstore/include/nix/store/store-reference.hh similarity index 98% rename from src/libstore/include/nix/store-reference.hh rename to src/libstore/include/nix/store/store-reference.hh index 922640fe0..433a347aa 100644 --- a/src/libstore/include/nix/store-reference.hh +++ b/src/libstore/include/nix/store/store-reference.hh @@ -3,7 +3,7 @@ #include -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/include/nix/uds-remote-store.hh b/src/libstore/include/nix/store/uds-remote-store.hh similarity index 94% rename from src/libstore/include/nix/uds-remote-store.hh rename to src/libstore/include/nix/store/uds-remote-store.hh index 0a2e3fe9f..f7ef76058 100644 --- a/src/libstore/include/nix/uds-remote-store.hh +++ b/src/libstore/include/nix/store/uds-remote-store.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/remote-store.hh" -#include "nix/remote-store-connection.hh" -#include "nix/indirect-root-store.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/remote-store-connection.hh" +#include "nix/store/indirect-root-store.hh" namespace nix { diff --git a/src/libstore/include/nix/worker-protocol-connection.hh b/src/libstore/include/nix/store/worker-protocol-connection.hh similarity index 98% rename from src/libstore/include/nix/worker-protocol-connection.hh rename to src/libstore/include/nix/store/worker-protocol-connection.hh index a1a4668f2..df2fe0ec2 100644 --- a/src/libstore/include/nix/worker-protocol-connection.hh +++ b/src/libstore/include/nix/store/worker-protocol-connection.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/worker-protocol.hh" -#include "nix/store-api.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/include/nix/worker-protocol-impl.hh b/src/libstore/include/nix/store/worker-protocol-impl.hh similarity index 94% rename from src/libstore/include/nix/worker-protocol-impl.hh rename to src/libstore/include/nix/store/worker-protocol-impl.hh index 902d21542..337c245e2 100644 --- a/src/libstore/include/nix/worker-protocol-impl.hh +++ b/src/libstore/include/nix/store/worker-protocol-impl.hh @@ -8,8 +8,8 @@ * contributing guide. */ -#include "nix/worker-protocol.hh" -#include "nix/length-prefixed-protocol-helper.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/length-prefixed-protocol-helper.hh" namespace nix { diff --git a/src/libstore/include/nix/worker-protocol.hh b/src/libstore/include/nix/store/worker-protocol.hh similarity index 99% rename from src/libstore/include/nix/worker-protocol.hh rename to src/libstore/include/nix/store/worker-protocol.hh index 175ddf01f..3060681b8 100644 --- a/src/libstore/include/nix/worker-protocol.hh +++ b/src/libstore/include/nix/store/worker-protocol.hh @@ -3,7 +3,7 @@ #include -#include "nix/common-protocol.hh" +#include "nix/store/common-protocol.hh" namespace nix { diff --git a/src/libstore/indirect-root-store.cc b/src/libstore/indirect-root-store.cc index 1b51cbe15..e23c01e5d 100644 --- a/src/libstore/indirect-root-store.cc +++ b/src/libstore/indirect-root-store.cc @@ -1,4 +1,4 @@ -#include "nix/indirect-root-store.hh" +#include "nix/store/indirect-root-store.hh" namespace nix { diff --git a/src/libstore/keys.cc b/src/libstore/keys.cc index 1b2a612a2..9abea9520 100644 --- a/src/libstore/keys.cc +++ b/src/libstore/keys.cc @@ -1,6 +1,6 @@ -#include "nix/file-system.hh" -#include "nix/globals.hh" -#include "nix/keys.hh" +#include "nix/util/file-system.hh" +#include "nix/store/globals.hh" +#include "nix/store/keys.hh" namespace nix { diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index bc2794499..1512a7944 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -1,17 +1,17 @@ -#include "nix/legacy-ssh-store.hh" -#include "nix/common-ssh-store-config.hh" -#include "nix/archive.hh" -#include "nix/pool.hh" -#include "nix/remote-store.hh" -#include "nix/serve-protocol.hh" -#include "nix/serve-protocol-connection.hh" -#include "nix/serve-protocol-impl.hh" -#include "nix/build-result.hh" -#include "nix/store-api.hh" -#include "nix/path-with-outputs.hh" -#include "nix/ssh.hh" -#include "nix/derivations.hh" -#include "nix/callback.hh" +#include "nix/store/legacy-ssh-store.hh" +#include "nix/store/common-ssh-store-config.hh" +#include "nix/util/archive.hh" +#include "nix/util/pool.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/serve-protocol-connection.hh" +#include "nix/store/serve-protocol-impl.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/ssh.hh" +#include "nix/store/derivations.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/linux/include/nix/fchmodat2-compat.hh b/src/libstore/linux/include/nix/store/fchmodat2-compat.hh similarity index 100% rename from src/libstore/linux/include/nix/fchmodat2-compat.hh rename to src/libstore/linux/include/nix/store/fchmodat2-compat.hh diff --git a/src/libstore/linux/include/nix/meson.build b/src/libstore/linux/include/nix/store/meson.build similarity index 59% rename from src/libstore/linux/include/nix/meson.build rename to src/libstore/linux/include/nix/store/meson.build index f37370c6f..fd05fcaea 100644 --- a/src/libstore/linux/include/nix/meson.build +++ b/src/libstore/linux/include/nix/store/meson.build @@ -1,4 +1,4 @@ -include_dirs += include_directories('..') +include_dirs += include_directories('../..') headers += files( 'fchmodat2-compat.hh', diff --git a/src/libstore/linux/include/nix/personality.hh b/src/libstore/linux/include/nix/store/personality.hh similarity index 100% rename from src/libstore/linux/include/nix/personality.hh rename to src/libstore/linux/include/nix/store/personality.hh diff --git a/src/libstore/linux/meson.build b/src/libstore/linux/meson.build index b9a2aed21..6fc193cf8 100644 --- a/src/libstore/linux/meson.build +++ b/src/libstore/linux/meson.build @@ -2,4 +2,4 @@ sources += files( 'personality.cc', ) -subdir('include/nix') +subdir('include/nix/store') diff --git a/src/libstore/linux/personality.cc b/src/libstore/linux/personality.cc index 452bd3e4b..e87006d86 100644 --- a/src/libstore/linux/personality.cc +++ b/src/libstore/linux/personality.cc @@ -1,5 +1,5 @@ -#include "nix/personality.hh" -#include "nix/globals.hh" +#include "nix/store/personality.hh" +#include "nix/store/globals.hh" #include #include diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc index 90a770ab0..212eacc8c 100644 --- a/src/libstore/local-binary-cache-store.cc +++ b/src/libstore/local-binary-cache-store.cc @@ -1,7 +1,7 @@ -#include "nix/local-binary-cache-store.hh" -#include "nix/globals.hh" -#include "nix/nar-info-disk-cache.hh" -#include "nix/signals.hh" +#include "nix/store/local-binary-cache-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/util/signals.hh" #include diff --git a/src/libstore/local-fs-store.cc b/src/libstore/local-fs-store.cc index 2798899fa..599765ced 100644 --- a/src/libstore/local-fs-store.cc +++ b/src/libstore/local-fs-store.cc @@ -1,10 +1,10 @@ -#include "nix/archive.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/globals.hh" -#include "nix/compression.hh" -#include "nix/derivations.hh" +#include "nix/util/archive.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/globals.hh" +#include "nix/util/compression.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/local-overlay-store.cc b/src/libstore/local-overlay-store.cc index c2cc329b4..38fa634ca 100644 --- a/src/libstore/local-overlay-store.cc +++ b/src/libstore/local-overlay-store.cc @@ -1,8 +1,8 @@ -#include "nix/local-overlay-store.hh" -#include "nix/callback.hh" -#include "nix/realisation.hh" -#include "nix/processes.hh" -#include "nix/url.hh" +#include "nix/store/local-overlay-store.hh" +#include "nix/util/callback.hh" +#include "nix/store/realisation.hh" +#include "nix/util/processes.hh" +#include "nix/util/url.hh" #include namespace nix { diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index ce3f8f2cf..b26fdeed8 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1,22 +1,22 @@ -#include "nix/local-store.hh" -#include "nix/globals.hh" -#include "nix/git.hh" -#include "nix/archive.hh" -#include "nix/pathlocks.hh" -#include "nix/worker-protocol.hh" -#include "nix/derivations.hh" -#include "nix/realisation.hh" -#include "nix/nar-info.hh" -#include "nix/references.hh" -#include "nix/callback.hh" -#include "nix/topo-sort.hh" -#include "nix/finally.hh" -#include "nix/compression.hh" -#include "nix/signals.hh" -#include "nix/posix-fs-canonicalise.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/keys.hh" -#include "nix/users.hh" +#include "nix/store/local-store.hh" +#include "nix/store/globals.hh" +#include "nix/util/git.hh" +#include "nix/util/archive.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/derivations.hh" +#include "nix/store/realisation.hh" +#include "nix/store/nar-info.hh" +#include "nix/util/references.hh" +#include "nix/util/callback.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/finally.hh" +#include "nix/util/compression.hh" +#include "nix/util/signals.hh" +#include "nix/store/posix-fs-canonicalise.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/store/keys.hh" +#include "nix/util/users.hh" #include #include @@ -52,7 +52,7 @@ #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" #include "store-config-private.hh" diff --git a/src/libstore/log-store.cc b/src/libstore/log-store.cc index b2c2ff16a..2ef791e19 100644 --- a/src/libstore/log-store.cc +++ b/src/libstore/log-store.cc @@ -1,4 +1,4 @@ -#include "nix/log-store.hh" +#include "nix/store/log-store.hh" namespace nix { diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index 7710ae99b..7c077239d 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -1,6 +1,6 @@ -#include "nix/machines.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" +#include "nix/store/machines.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/make-content-addressed.cc b/src/libstore/make-content-addressed.cc index c7d44b1a9..606d72866 100644 --- a/src/libstore/make-content-addressed.cc +++ b/src/libstore/make-content-addressed.cc @@ -1,5 +1,5 @@ -#include "nix/make-content-addressed.hh" -#include "nix/references.hh" +#include "nix/store/make-content-addressed.hh" +#include "nix/util/references.hh" namespace nix { diff --git a/src/libstore/meson.build b/src/libstore/meson.build index 2553fa545..2f16bf66f 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -252,7 +252,7 @@ sources = files( 'worker-protocol.cc', ) -subdir('include/nix') +subdir('include/nix/store') if host_machine.system() == 'linux' subdir('linux') @@ -363,7 +363,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/store', preserve_path : true) libraries_private = [] diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc index ef08f4af7..0e2b62db5 100644 --- a/src/libstore/misc.cc +++ b/src/libstore/misc.cc @@ -1,17 +1,17 @@ #include -#include "nix/derivations.hh" -#include "nix/parsed-derivations.hh" -#include "nix/derivation-options.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" -#include "nix/thread-pool.hh" -#include "nix/realisation.hh" -#include "nix/topo-sort.hh" -#include "nix/callback.hh" -#include "nix/closure.hh" -#include "nix/filetransfer.hh" -#include "nix/strings.hh" +#include "nix/store/derivations.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/store/derivation-options.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/util/thread-pool.hh" +#include "nix/store/realisation.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/callback.hh" +#include "nix/util/closure.hh" +#include "nix/store/filetransfer.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libstore/names.cc b/src/libstore/names.cc index 2842bf3fb..998b9356a 100644 --- a/src/libstore/names.cc +++ b/src/libstore/names.cc @@ -1,5 +1,5 @@ -#include "nix/names.hh" -#include "nix/util.hh" +#include "nix/store/names.hh" +#include "nix/util/util.hh" #include diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc index 7fe2e7ecb..6aba68a36 100644 --- a/src/libstore/nar-accessor.cc +++ b/src/libstore/nar-accessor.cc @@ -1,5 +1,5 @@ -#include "nix/nar-accessor.hh" -#include "nix/archive.hh" +#include "nix/store/nar-accessor.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libstore/nar-info-disk-cache.cc b/src/libstore/nar-info-disk-cache.cc index acb7bd3bf..5d72ba8ae 100644 --- a/src/libstore/nar-info-disk-cache.cc +++ b/src/libstore/nar-info-disk-cache.cc @@ -1,13 +1,13 @@ -#include "nix/nar-info-disk-cache.hh" -#include "nix/users.hh" -#include "nix/sync.hh" -#include "nix/sqlite.hh" -#include "nix/globals.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/util/users.hh" +#include "nix/util/sync.hh" +#include "nix/store/sqlite.hh" +#include "nix/store/globals.hh" #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc index 176332a4a..ba80652d0 100644 --- a/src/libstore/nar-info.cc +++ b/src/libstore/nar-info.cc @@ -1,8 +1,8 @@ -#include "nix/globals.hh" -#include "nix/nar-info.hh" -#include "nix/store-api.hh" -#include "nix/strings.hh" -#include "nix/json-utils.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/store-api.hh" +#include "nix/util/strings.hh" +#include "nix/util/json-utils.hh" namespace nix { diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index c2cda58e7..17e13758b 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -1,8 +1,8 @@ -#include "nix/local-store.hh" -#include "nix/globals.hh" -#include "nix/signals.hh" -#include "nix/posix-fs-canonicalise.hh" -#include "nix/posix-source-accessor.hh" +#include "nix/store/local-store.hh" +#include "nix/store/globals.hh" +#include "nix/util/signals.hh" +#include "nix/store/posix-fs-canonicalise.hh" +#include "nix/util/posix-source-accessor.hh" #include #include diff --git a/src/libstore/outputs-spec.cc b/src/libstore/outputs-spec.cc index 7d56a7afd..28fe45de9 100644 --- a/src/libstore/outputs-spec.cc +++ b/src/libstore/outputs-spec.cc @@ -1,11 +1,11 @@ #include #include -#include "nix/util.hh" -#include "nix/regex-combinators.hh" -#include "nix/outputs-spec.hh" -#include "nix/path-regex.hh" -#include "nix/strings-inline.hh" +#include "nix/util/util.hh" +#include "nix/util/regex-combinators.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/path-regex.hh" +#include "nix/util/strings-inline.hh" namespace nix { diff --git a/src/libstore/package.nix b/src/libstore/package.nix index 553bc043e..775776139 100644 --- a/src/libstore/package.nix +++ b/src/libstore/package.nix @@ -43,11 +43,11 @@ mkMesonLibrary (finalAttrs: { ./.version ./meson.build ./meson.options - ./include/nix/meson.build + ./include/nix/store/meson.build ./linux/meson.build - ./linux/include/nix/meson.build + ./linux/include/nix/store/meson.build ./unix/meson.build - ./unix/include/nix/meson.build + ./unix/include/nix/store/meson.build ./windows/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) diff --git a/src/libstore/parsed-derivations.cc b/src/libstore/parsed-derivations.cc index 0e8f9ba95..cc7203c6b 100644 --- a/src/libstore/parsed-derivations.cc +++ b/src/libstore/parsed-derivations.cc @@ -1,4 +1,4 @@ -#include "nix/parsed-derivations.hh" +#include "nix/store/parsed-derivations.hh" #include #include diff --git a/src/libstore/path-info.cc b/src/libstore/path-info.cc index 574ada7ac..df20edb3b 100644 --- a/src/libstore/path-info.cc +++ b/src/libstore/path-info.cc @@ -1,10 +1,10 @@ #include -#include "nix/path-info.hh" -#include "nix/store-api.hh" -#include "nix/json-utils.hh" -#include "nix/comparator.hh" -#include "nix/strings.hh" +#include "nix/store/path-info.hh" +#include "nix/store/store-api.hh" +#include "nix/util/json-utils.hh" +#include "nix/util/comparator.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libstore/path-references.cc b/src/libstore/path-references.cc index a5aa8f48f..c06647eb1 100644 --- a/src/libstore/path-references.cc +++ b/src/libstore/path-references.cc @@ -1,6 +1,6 @@ -#include "nix/path-references.hh" -#include "nix/hash.hh" -#include "nix/archive.hh" +#include "nix/store/path-references.hh" +#include "nix/util/hash.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libstore/path-with-outputs.cc b/src/libstore/path-with-outputs.cc index 87f7c6a72..9fbbc8f46 100644 --- a/src/libstore/path-with-outputs.cc +++ b/src/libstore/path-with-outputs.cc @@ -1,8 +1,8 @@ #include -#include "nix/path-with-outputs.hh" -#include "nix/store-api.hh" -#include "nix/strings.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/store-api.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libstore/path.cc b/src/libstore/path.cc index d1eb02e70..5dd1a1699 100644 --- a/src/libstore/path.cc +++ b/src/libstore/path.cc @@ -1,4 +1,4 @@ -#include "nix/store-dir-config.hh" +#include "nix/store/store-dir-config.hh" namespace nix { diff --git a/src/libstore/pathlocks.cc b/src/libstore/pathlocks.cc index 36bee6741..34acfb02d 100644 --- a/src/libstore/pathlocks.cc +++ b/src/libstore/pathlocks.cc @@ -1,7 +1,7 @@ -#include "nix/pathlocks.hh" -#include "nix/util.hh" -#include "nix/sync.hh" -#include "nix/signals.hh" +#include "nix/store/pathlocks.hh" +#include "nix/util/util.hh" +#include "nix/util/sync.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libstore/posix-fs-canonicalise.cc b/src/libstore/posix-fs-canonicalise.cc index c1b451324..df51ba307 100644 --- a/src/libstore/posix-fs-canonicalise.cc +++ b/src/libstore/posix-fs-canonicalise.cc @@ -1,10 +1,9 @@ -#include "nix/posix-fs-canonicalise.hh" -#include "nix/file-system.hh" -#include "nix/signals.hh" -#include "nix/util.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" -#include "nix/store-config.hh" +#include "nix/store/posix-fs-canonicalise.hh" +#include "nix/util/file-system.hh" +#include "nix/util/signals.hh" +#include "nix/util/util.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" #include "store-config-private.hh" diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc index 19358f136..bd24332cb 100644 --- a/src/libstore/profiles.cc +++ b/src/libstore/profiles.cc @@ -1,8 +1,8 @@ -#include "nix/profiles.hh" -#include "nix/signals.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/users.hh" +#include "nix/store/profiles.hh" +#include "nix/util/signals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/util/users.hh" #include #include diff --git a/src/libstore/realisation.cc b/src/libstore/realisation.cc index 63b156b30..635fb6946 100644 --- a/src/libstore/realisation.cc +++ b/src/libstore/realisation.cc @@ -1,7 +1,7 @@ -#include "nix/realisation.hh" -#include "nix/store-api.hh" -#include "nix/closure.hh" -#include "nix/signature/local-keys.hh" +#include "nix/store/realisation.hh" +#include "nix/store/store-api.hh" +#include "nix/util/closure.hh" +#include "nix/util/signature/local-keys.hh" #include namespace nix { diff --git a/src/libstore/remote-fs-accessor.cc b/src/libstore/remote-fs-accessor.cc index 2b3f0675d..340e7ee2e 100644 --- a/src/libstore/remote-fs-accessor.cc +++ b/src/libstore/remote-fs-accessor.cc @@ -1,6 +1,6 @@ #include -#include "nix/remote-fs-accessor.hh" -#include "nix/nar-accessor.hh" +#include "nix/store/remote-fs-accessor.hh" +#include "nix/store/nar-accessor.hh" #include #include diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index b71d179b7..8f110ce7c 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -1,23 +1,23 @@ -#include "nix/serialise.hh" -#include "nix/util.hh" -#include "nix/path-with-outputs.hh" -#include "nix/gc-store.hh" -#include "nix/remote-fs-accessor.hh" -#include "nix/build-result.hh" -#include "nix/remote-store.hh" -#include "nix/remote-store-connection.hh" -#include "nix/worker-protocol.hh" -#include "nix/worker-protocol-impl.hh" -#include "nix/archive.hh" -#include "nix/globals.hh" -#include "nix/derivations.hh" -#include "nix/pool.hh" -#include "nix/finally.hh" -#include "nix/git.hh" -#include "nix/logging.hh" -#include "nix/callback.hh" -#include "nix/filetransfer.hh" -#include "nix/signals.hh" +#include "nix/util/serialise.hh" +#include "nix/util/util.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/remote-fs-accessor.hh" +#include "nix/store/build-result.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/remote-store-connection.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/worker-protocol-impl.hh" +#include "nix/util/archive.hh" +#include "nix/store/globals.hh" +#include "nix/store/derivations.hh" +#include "nix/util/pool.hh" +#include "nix/util/finally.hh" +#include "nix/util/git.hh" +#include "nix/util/logging.hh" +#include "nix/util/callback.hh" +#include "nix/store/filetransfer.hh" +#include "nix/util/signals.hh" #include diff --git a/src/libstore/restricted-store.cc b/src/libstore/restricted-store.cc index cb45838a5..3b4c45d3d 100644 --- a/src/libstore/restricted-store.cc +++ b/src/libstore/restricted-store.cc @@ -1,7 +1,7 @@ -#include "nix/restricted-store.hh" -#include "nix/build-result.hh" -#include "nix/callback.hh" -#include "nix/realisation.hh" +#include "nix/store/restricted-store.hh" +#include "nix/store/build-result.hh" +#include "nix/util/callback.hh" +#include "nix/store/realisation.hh" namespace nix { diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 69ebad75b..e76a508ba 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -2,14 +2,14 @@ #include -#include "nix/s3.hh" -#include "nix/s3-binary-cache-store.hh" -#include "nix/nar-info.hh" -#include "nix/nar-info-disk-cache.hh" -#include "nix/globals.hh" -#include "nix/compression.hh" -#include "nix/filetransfer.hh" -#include "nix/signals.hh" +#include "nix/store/s3.hh" +#include "nix/store/s3-binary-cache-store.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/store/globals.hh" +#include "nix/util/compression.hh" +#include "nix/store/filetransfer.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libstore/serve-protocol-connection.cc b/src/libstore/serve-protocol-connection.cc index 577297af8..276086f6f 100644 --- a/src/libstore/serve-protocol-connection.cc +++ b/src/libstore/serve-protocol-connection.cc @@ -1,7 +1,7 @@ -#include "nix/serve-protocol-connection.hh" -#include "nix/serve-protocol-impl.hh" -#include "nix/build-result.hh" -#include "nix/derivations.hh" +#include "nix/store/serve-protocol-connection.hh" +#include "nix/store/serve-protocol-impl.hh" +#include "nix/store/build-result.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/serve-protocol.cc b/src/libstore/serve-protocol.cc index 0e2a3bc9d..520c37951 100644 --- a/src/libstore/serve-protocol.cc +++ b/src/libstore/serve-protocol.cc @@ -1,11 +1,11 @@ -#include "nix/serialise.hh" -#include "nix/path-with-outputs.hh" -#include "nix/store-api.hh" -#include "nix/build-result.hh" -#include "nix/serve-protocol.hh" -#include "nix/serve-protocol-impl.hh" -#include "nix/archive.hh" -#include "nix/path-info.hh" +#include "nix/util/serialise.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/serve-protocol-impl.hh" +#include "nix/util/archive.hh" +#include "nix/store/path-info.hh" #include diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc index 1f9622255..55b967ed6 100644 --- a/src/libstore/sqlite.cc +++ b/src/libstore/sqlite.cc @@ -1,8 +1,8 @@ -#include "nix/sqlite.hh" -#include "nix/globals.hh" -#include "nix/util.hh" -#include "nix/url.hh" -#include "nix/signals.hh" +#include "nix/store/sqlite.hh" +#include "nix/store/globals.hh" +#include "nix/util/util.hh" +#include "nix/util/url.hh" +#include "nix/util/signals.hh" #include diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc index dc889cb39..45ea05ffc 100644 --- a/src/libstore/ssh-store.cc +++ b/src/libstore/ssh-store.cc @@ -1,12 +1,12 @@ -#include "nix/ssh-store.hh" -#include "nix/local-fs-store.hh" -#include "nix/remote-store-connection.hh" -#include "nix/source-accessor.hh" -#include "nix/archive.hh" -#include "nix/worker-protocol.hh" -#include "nix/worker-protocol-impl.hh" -#include "nix/pool.hh" -#include "nix/ssh.hh" +#include "nix/store/ssh-store.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/remote-store-connection.hh" +#include "nix/util/source-accessor.hh" +#include "nix/util/archive.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/worker-protocol-impl.hh" +#include "nix/util/pool.hh" +#include "nix/store/ssh.hh" namespace nix { diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index 86b6eda7c..97b75cba1 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -1,9 +1,9 @@ -#include "nix/ssh.hh" -#include "nix/finally.hh" -#include "nix/current-process.hh" -#include "nix/environment-variables.hh" -#include "nix/util.hh" -#include "nix/exec.hh" +#include "nix/store/ssh.hh" +#include "nix/util/finally.hh" +#include "nix/util/current-process.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/util.hh" +#include "nix/util/exec.hh" namespace nix { diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 29ac59168..6721a6f2d 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -1,28 +1,28 @@ -#include "nix/signature/local-keys.hh" -#include "nix/source-accessor.hh" -#include "nix/globals.hh" -#include "nix/derived-path.hh" -#include "nix/realisation.hh" -#include "nix/derivations.hh" -#include "nix/store-api.hh" -#include "nix/util.hh" -#include "nix/nar-info-disk-cache.hh" -#include "nix/thread-pool.hh" -#include "nix/references.hh" -#include "nix/archive.hh" -#include "nix/callback.hh" -#include "nix/git.hh" -#include "nix/posix-source-accessor.hh" +#include "nix/util/signature/local-keys.hh" +#include "nix/util/source-accessor.hh" +#include "nix/store/globals.hh" +#include "nix/store/derived-path.hh" +#include "nix/store/realisation.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/util/util.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/references.hh" +#include "nix/util/archive.hh" +#include "nix/util/callback.hh" +#include "nix/util/git.hh" +#include "nix/util/posix-source-accessor.hh" // FIXME this should not be here, see TODO below on // `addMultipleToStore`. -#include "nix/worker-protocol.hh" -#include "nix/signals.hh" -#include "nix/users.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/util/signals.hh" +#include "nix/util/users.hh" #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" using json = nlohmann::json; @@ -1305,8 +1305,8 @@ void Store::signRealisation(Realisation & realisation) } -#include "nix/local-store.hh" -#include "nix/uds-remote-store.hh" +#include "nix/store/local-store.hh" +#include "nix/store/uds-remote-store.hh" namespace nix { diff --git a/src/libstore/store-reference.cc b/src/libstore/store-reference.cc index 610e70f99..cb4e2cfb8 100644 --- a/src/libstore/store-reference.cc +++ b/src/libstore/store-reference.cc @@ -1,10 +1,10 @@ #include -#include "nix/error.hh" -#include "nix/url.hh" -#include "nix/store-reference.hh" -#include "nix/file-system.hh" -#include "nix/util.hh" +#include "nix/util/error.hh" +#include "nix/util/url.hh" +#include "nix/store/store-reference.hh" +#include "nix/util/file-system.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libstore/uds-remote-store.cc b/src/libstore/uds-remote-store.cc index b41eae39c..3c1657d15 100644 --- a/src/libstore/uds-remote-store.cc +++ b/src/libstore/uds-remote-store.cc @@ -1,6 +1,6 @@ -#include "nix/uds-remote-store.hh" -#include "nix/unix-domain-socket.hh" -#include "nix/worker-protocol.hh" +#include "nix/store/uds-remote-store.hh" +#include "nix/util/unix-domain-socket.hh" +#include "nix/store/worker-protocol.hh" #include #include diff --git a/src/libstore/unix/build/child.cc b/src/libstore/unix/build/child.cc index c19d1e646..a21fddf51 100644 --- a/src/libstore/unix/build/child.cc +++ b/src/libstore/unix/build/child.cc @@ -1,6 +1,6 @@ -#include "nix/build/child.hh" -#include "nix/current-process.hh" -#include "nix/logging.hh" +#include "nix/store/build/child.hh" +#include "nix/util/current-process.hh" +#include "nix/util/logging.hh" #include #include diff --git a/src/libstore/unix/build/hook-instance.cc b/src/libstore/unix/build/hook-instance.cc index 5407bef14..3713f7c86 100644 --- a/src/libstore/unix/build/hook-instance.cc +++ b/src/libstore/unix/build/hook-instance.cc @@ -1,10 +1,10 @@ -#include "nix/globals.hh" -#include "nix/config-global.hh" -#include "nix/build/hook-instance.hh" -#include "nix/file-system.hh" -#include "nix/build/child.hh" -#include "nix/strings.hh" -#include "nix/executable-path.hh" +#include "nix/store/globals.hh" +#include "nix/util/config-global.hh" +#include "nix/store/build/hook-instance.hh" +#include "nix/util/file-system.hh" +#include "nix/store/build/child.hh" +#include "nix/util/strings.hh" +#include "nix/util/executable-path.hh" namespace nix { diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc index 6a173485a..ea736d5ba 100644 --- a/src/libstore/unix/build/local-derivation-goal.cc +++ b/src/libstore/unix/build/local-derivation-goal.cc @@ -1,28 +1,28 @@ -#include "nix/build/local-derivation-goal.hh" -#include "nix/local-store.hh" -#include "nix/processes.hh" -#include "nix/indirect-root-store.hh" -#include "nix/build/hook-instance.hh" -#include "nix/build/worker.hh" -#include "nix/builtins.hh" -#include "nix/builtins/buildenv.hh" -#include "nix/path-references.hh" -#include "nix/finally.hh" -#include "nix/util.hh" -#include "nix/archive.hh" -#include "nix/git.hh" -#include "nix/compression.hh" -#include "nix/daemon.hh" -#include "nix/topo-sort.hh" -#include "nix/callback.hh" -#include "nix/json-utils.hh" -#include "nix/current-process.hh" -#include "nix/build/child.hh" -#include "nix/unix-domain-socket.hh" -#include "nix/posix-fs-canonicalise.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/restricted-store.hh" -#include "nix/store-config.hh" +#include "nix/store/build/local-derivation-goal.hh" +#include "nix/store/local-store.hh" +#include "nix/util/processes.hh" +#include "nix/store/indirect-root-store.hh" +#include "nix/store/build/hook-instance.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/builtins.hh" +#include "nix/store/builtins/buildenv.hh" +#include "nix/store/path-references.hh" +#include "nix/util/finally.hh" +#include "nix/util/util.hh" +#include "nix/util/archive.hh" +#include "nix/util/git.hh" +#include "nix/util/compression.hh" +#include "nix/store/daemon.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/callback.hh" +#include "nix/util/json-utils.hh" +#include "nix/util/current-process.hh" +#include "nix/store/build/child.hh" +#include "nix/util/unix-domain-socket.hh" +#include "nix/store/posix-fs-canonicalise.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/store/restricted-store.hh" +#include "nix/store/config.hh" #include #include @@ -43,7 +43,7 @@ /* Includes required for chroot support. */ #if __linux__ -# include "nix/fchmodat2-compat.hh" +# include "nix/store/fchmodat2-compat.hh" # include # include # include @@ -52,13 +52,13 @@ # include # include # include -# include "nix/namespaces.hh" +# include "nix/util/namespaces.hh" # if HAVE_SECCOMP # include # endif # define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root, put_old)) -# include "nix/cgroup.hh" -# include "nix/personality.hh" +# include "nix/util/cgroup.hh" +# include "nix/store/personality.hh" #endif #if __APPLE__ @@ -74,8 +74,8 @@ extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, #include #include -#include "nix/strings.hh" -#include "nix/signals.hh" +#include "nix/util/strings.hh" +#include "nix/util/signals.hh" namespace nix { diff --git a/src/libstore/unix/include/nix/build/child.hh b/src/libstore/unix/include/nix/store/build/child.hh similarity index 100% rename from src/libstore/unix/include/nix/build/child.hh rename to src/libstore/unix/include/nix/store/build/child.hh diff --git a/src/libstore/unix/include/nix/build/hook-instance.hh b/src/libstore/unix/include/nix/store/build/hook-instance.hh similarity index 83% rename from src/libstore/unix/include/nix/build/hook-instance.hh rename to src/libstore/unix/include/nix/store/build/hook-instance.hh index b82a51183..ff205ff76 100644 --- a/src/libstore/unix/include/nix/build/hook-instance.hh +++ b/src/libstore/unix/include/nix/store/build/hook-instance.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/logging.hh" -#include "nix/serialise.hh" -#include "nix/processes.hh" +#include "nix/util/logging.hh" +#include "nix/util/serialise.hh" +#include "nix/util/processes.hh" namespace nix { diff --git a/src/libstore/unix/include/nix/build/local-derivation-goal.hh b/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh similarity index 93% rename from src/libstore/unix/include/nix/build/local-derivation-goal.hh rename to src/libstore/unix/include/nix/store/build/local-derivation-goal.hh index a5c8d36c5..36aaa7857 100644 --- a/src/libstore/unix/include/nix/build/local-derivation-goal.hh +++ b/src/libstore/unix/include/nix/store/build/local-derivation-goal.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/build/derivation-goal.hh" +#include "nix/store/build/derivation-goal.hh" namespace nix { diff --git a/src/libstore/unix/include/nix/meson.build b/src/libstore/unix/include/nix/store/meson.build similarity index 73% rename from src/libstore/unix/include/nix/meson.build rename to src/libstore/unix/include/nix/store/meson.build index b07787c0a..9f12440cd 100644 --- a/src/libstore/unix/include/nix/meson.build +++ b/src/libstore/unix/include/nix/store/meson.build @@ -1,4 +1,4 @@ -include_dirs += include_directories('..') +include_dirs += include_directories('../..') headers += files( 'build/child.hh', diff --git a/src/libstore/unix/include/nix/user-lock.hh b/src/libstore/unix/include/nix/store/user-lock.hh similarity index 100% rename from src/libstore/unix/include/nix/user-lock.hh rename to src/libstore/unix/include/nix/store/user-lock.hh diff --git a/src/libstore/unix/meson.build b/src/libstore/unix/meson.build index 7c80aa1a1..f06c9aa95 100644 --- a/src/libstore/unix/meson.build +++ b/src/libstore/unix/meson.build @@ -6,4 +6,4 @@ sources += files( 'user-lock.cc', ) -subdir('include/nix') +subdir('include/nix/store') diff --git a/src/libstore/unix/pathlocks.cc b/src/libstore/unix/pathlocks.cc index 3cc24c859..58d047f4e 100644 --- a/src/libstore/unix/pathlocks.cc +++ b/src/libstore/unix/pathlocks.cc @@ -1,7 +1,7 @@ -#include "nix/pathlocks.hh" -#include "nix/util.hh" -#include "nix/sync.hh" -#include "nix/signals.hh" +#include "nix/store/pathlocks.hh" +#include "nix/util/util.hh" +#include "nix/util/sync.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libstore/unix/user-lock.cc b/src/libstore/unix/user-lock.cc index 4426f0768..770b00e2d 100644 --- a/src/libstore/unix/user-lock.cc +++ b/src/libstore/unix/user-lock.cc @@ -2,11 +2,11 @@ #include #include -#include "nix/user-lock.hh" -#include "nix/file-system.hh" -#include "nix/globals.hh" -#include "nix/pathlocks.hh" -#include "nix/users.hh" +#include "nix/store/user-lock.hh" +#include "nix/util/file-system.hh" +#include "nix/store/globals.hh" +#include "nix/store/pathlocks.hh" +#include "nix/util/users.hh" namespace nix { diff --git a/src/libstore/windows/pathlocks.cc b/src/libstore/windows/pathlocks.cc index 0161a8c32..0ba75853b 100644 --- a/src/libstore/windows/pathlocks.cc +++ b/src/libstore/windows/pathlocks.cc @@ -1,13 +1,13 @@ -#include "nix/logging.hh" -#include "nix/pathlocks.hh" -#include "nix/signals.hh" -#include "nix/util.hh" +#include "nix/util/logging.hh" +#include "nix/store/pathlocks.hh" +#include "nix/util/signals.hh" +#include "nix/util/util.hh" #ifdef _WIN32 # include # include # include -# include "nix/windows-error.hh" +# include "nix/util/windows-error.hh" namespace nix { diff --git a/src/libstore/worker-protocol-connection.cc b/src/libstore/worker-protocol-connection.cc index a30e808a7..d83be10e6 100644 --- a/src/libstore/worker-protocol-connection.cc +++ b/src/libstore/worker-protocol-connection.cc @@ -1,7 +1,7 @@ -#include "nix/worker-protocol-connection.hh" -#include "nix/worker-protocol-impl.hh" -#include "nix/build-result.hh" -#include "nix/derivations.hh" +#include "nix/store/worker-protocol-connection.hh" +#include "nix/store/worker-protocol-impl.hh" +#include "nix/store/build-result.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/worker-protocol.cc b/src/libstore/worker-protocol.cc index e99723652..21b21a347 100644 --- a/src/libstore/worker-protocol.cc +++ b/src/libstore/worker-protocol.cc @@ -1,11 +1,11 @@ -#include "nix/serialise.hh" -#include "nix/path-with-outputs.hh" -#include "nix/store-api.hh" -#include "nix/build-result.hh" -#include "nix/worker-protocol.hh" -#include "nix/worker-protocol-impl.hh" -#include "nix/archive.hh" -#include "nix/path-info.hh" +#include "nix/util/serialise.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/worker-protocol-impl.hh" +#include "nix/util/archive.hh" +#include "nix/store/path-info.hh" #include #include diff --git a/src/libutil-c/nix_api_util.cc b/src/libutil-c/nix_api_util.cc index 483c5484a..2254f18fa 100644 --- a/src/libutil-c/nix_api_util.cc +++ b/src/libutil-c/nix_api_util.cc @@ -1,8 +1,8 @@ #include "nix_api_util.h" -#include "nix/config-global.hh" -#include "nix/error.hh" +#include "nix/util/config-global.hh" +#include "nix/util/error.hh" #include "nix_api_util_internal.h" -#include "nix/util.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libutil-c/nix_api_util_internal.h b/src/libutil-c/nix_api_util_internal.h index 362d8c59a..8fbf3d91a 100644 --- a/src/libutil-c/nix_api_util_internal.h +++ b/src/libutil-c/nix_api_util_internal.h @@ -4,7 +4,7 @@ #include #include -#include "nix/error.hh" +#include "nix/util/error.hh" #include "nix_api_util.h" struct nix_c_context diff --git a/src/libutil-test-support/hash.cc b/src/libutil-test-support/hash.cc index 3614b42b3..d047f4073 100644 --- a/src/libutil-test-support/hash.cc +++ b/src/libutil-test-support/hash.cc @@ -2,9 +2,9 @@ #include -#include "nix/hash.hh" +#include "nix/util/hash.hh" -#include "nix/tests/hash.hh" +#include "nix/util/tests/hash.hh" namespace rc { using namespace nix; diff --git a/src/libutil-test-support/include/nix/meson.build b/src/libutil-test-support/include/nix/meson.build deleted file mode 100644 index 6490d19ac..000000000 --- a/src/libutil-test-support/include/nix/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -# Public headers directory - -include_dirs = [include_directories('..')] - -headers = files( - 'tests/characterization.hh', - 'tests/gtest-with-params.hh', - 'tests/hash.hh', - 'tests/nix_api_util.hh', - 'tests/string_callback.hh', -) diff --git a/src/libutil-test-support/include/nix/tests/characterization.hh b/src/libutil-test-support/include/nix/util/tests/characterization.hh similarity index 95% rename from src/libutil-test-support/include/nix/tests/characterization.hh rename to src/libutil-test-support/include/nix/util/tests/characterization.hh index f90793633..3e8effe8b 100644 --- a/src/libutil-test-support/include/nix/tests/characterization.hh +++ b/src/libutil-test-support/include/nix/util/tests/characterization.hh @@ -3,9 +3,9 @@ #include -#include "nix/types.hh" -#include "nix/environment-variables.hh" -#include "nix/file-system.hh" +#include "nix/util/types.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libutil-test-support/include/nix/tests/gtest-with-params.hh b/src/libutil-test-support/include/nix/util/tests/gtest-with-params.hh similarity index 100% rename from src/libutil-test-support/include/nix/tests/gtest-with-params.hh rename to src/libutil-test-support/include/nix/util/tests/gtest-with-params.hh diff --git a/src/libutil-test-support/include/nix/tests/hash.hh b/src/libutil-test-support/include/nix/util/tests/hash.hh similarity index 86% rename from src/libutil-test-support/include/nix/tests/hash.hh rename to src/libutil-test-support/include/nix/util/tests/hash.hh index b965ac1a2..de832c12f 100644 --- a/src/libutil-test-support/include/nix/tests/hash.hh +++ b/src/libutil-test-support/include/nix/util/tests/hash.hh @@ -3,7 +3,7 @@ #include -#include "nix/hash.hh" +#include "nix/util/hash.hh" namespace rc { using namespace nix; diff --git a/src/libutil-test-support/include/nix/util/tests/meson.build b/src/libutil-test-support/include/nix/util/tests/meson.build new file mode 100644 index 000000000..f77dedff7 --- /dev/null +++ b/src/libutil-test-support/include/nix/util/tests/meson.build @@ -0,0 +1,11 @@ +# Public headers directory + +include_dirs = [include_directories('../../..')] + +headers = files( + 'characterization.hh', + 'gtest-with-params.hh', + 'hash.hh', + 'nix_api_util.hh', + 'string_callback.hh', +) diff --git a/src/libutil-test-support/include/nix/tests/nix_api_util.hh b/src/libutil-test-support/include/nix/util/tests/nix_api_util.hh similarity index 100% rename from src/libutil-test-support/include/nix/tests/nix_api_util.hh rename to src/libutil-test-support/include/nix/util/tests/nix_api_util.hh diff --git a/src/libutil-test-support/include/nix/tests/string_callback.hh b/src/libutil-test-support/include/nix/util/tests/string_callback.hh similarity index 100% rename from src/libutil-test-support/include/nix/tests/string_callback.hh rename to src/libutil-test-support/include/nix/util/tests/string_callback.hh diff --git a/src/libutil-test-support/include/nix/tests/tracing-file-system-object-sink.hh b/src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh similarity index 97% rename from src/libutil-test-support/include/nix/tests/tracing-file-system-object-sink.hh rename to src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh index f5d38d0f8..d721c13af 100644 --- a/src/libutil-test-support/include/nix/tests/tracing-file-system-object-sink.hh +++ b/src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh @@ -1,5 +1,5 @@ #pragma once -#include "nix/fs-sink.hh" +#include "nix/util/fs-sink.hh" namespace nix::test { diff --git a/src/libutil-test-support/meson.build b/src/libutil-test-support/meson.build index 265bdc249..ec6bc15d9 100644 --- a/src/libutil-test-support/meson.build +++ b/src/libutil-test-support/meson.build @@ -32,7 +32,7 @@ sources = files( 'string_callback.cc', ) -subdir('include/nix') +subdir('include/nix/util/tests') subdir('nix-meson-build-support/export-all-symbols') subdir('nix-meson-build-support/windows-version') @@ -49,7 +49,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/util/tests', preserve_path : true) libraries_private = [] diff --git a/src/libutil-test-support/package.nix b/src/libutil-test-support/package.nix index 033758d7b..f8e92c271 100644 --- a/src/libutil-test-support/package.nix +++ b/src/libutil-test-support/package.nix @@ -28,7 +28,7 @@ mkMesonLibrary (finalAttrs: { ./.version ./meson.build # ./meson.options - ./include/nix/meson.build + ./include/nix/util/tests/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libutil-test-support/string_callback.cc b/src/libutil-test-support/string_callback.cc index 25781dc60..4f6a9cf40 100644 --- a/src/libutil-test-support/string_callback.cc +++ b/src/libutil-test-support/string_callback.cc @@ -1,4 +1,4 @@ -#include "nix/tests/string_callback.hh" +#include "nix/util/tests/string_callback.hh" namespace nix::testing { diff --git a/src/libutil-tests/args.cc b/src/libutil-tests/args.cc index abcc85641..2cc1a3438 100644 --- a/src/libutil-tests/args.cc +++ b/src/libutil-tests/args.cc @@ -1,5 +1,5 @@ -#include "nix/args.hh" -#include "nix/fs-sink.hh" +#include "nix/util/args.hh" +#include "nix/util/fs-sink.hh" #include #include diff --git a/src/libutil-tests/canon-path.cc b/src/libutil-tests/canon-path.cc index 6ef6d3c99..c6808bf66 100644 --- a/src/libutil-tests/canon-path.cc +++ b/src/libutil-tests/canon-path.cc @@ -1,4 +1,4 @@ -#include "nix/canon-path.hh" +#include "nix/util/canon-path.hh" #include diff --git a/src/libutil-tests/checked-arithmetic.cc b/src/libutil-tests/checked-arithmetic.cc index 4d98344fb..8056a430a 100644 --- a/src/libutil-tests/checked-arithmetic.cc +++ b/src/libutil-tests/checked-arithmetic.cc @@ -5,9 +5,9 @@ #include #include -#include "nix/checked-arithmetic.hh" +#include "nix/util/checked-arithmetic.hh" -#include "nix/tests/gtest-with-params.hh" +#include "nix/util/tests/gtest-with-params.hh" namespace rc { using namespace nix; diff --git a/src/libutil-tests/chunked-vector.cc b/src/libutil-tests/chunked-vector.cc index 16dedc63f..658581c2a 100644 --- a/src/libutil-tests/chunked-vector.cc +++ b/src/libutil-tests/chunked-vector.cc @@ -1,4 +1,4 @@ -#include "nix/chunked-vector.hh" +#include "nix/util/chunked-vector.hh" #include diff --git a/src/libutil-tests/closure.cc b/src/libutil-tests/closure.cc index b6b777bcc..6bbc128c2 100644 --- a/src/libutil-tests/closure.cc +++ b/src/libutil-tests/closure.cc @@ -1,4 +1,4 @@ -#include "nix/closure.hh" +#include "nix/util/closure.hh" #include namespace nix { diff --git a/src/libutil-tests/compression.cc b/src/libutil-tests/compression.cc index 7c7dfbd7b..de0c7cdb6 100644 --- a/src/libutil-tests/compression.cc +++ b/src/libutil-tests/compression.cc @@ -1,4 +1,4 @@ -#include "nix/compression.hh" +#include "nix/util/compression.hh" #include namespace nix { diff --git a/src/libutil-tests/config.cc b/src/libutil-tests/config.cc index aae410d2b..bc7db251b 100644 --- a/src/libutil-tests/config.cc +++ b/src/libutil-tests/config.cc @@ -1,5 +1,5 @@ -#include "nix/config.hh" -#include "nix/args.hh" +#include "nix/util/configuration.hh" +#include "nix/util/args.hh" #include #include diff --git a/src/libutil-tests/executable-path.cc b/src/libutil-tests/executable-path.cc index 041209882..7229b14e6 100644 --- a/src/libutil-tests/executable-path.cc +++ b/src/libutil-tests/executable-path.cc @@ -1,6 +1,6 @@ #include -#include "nix/executable-path.hh" +#include "nix/util/executable-path.hh" namespace nix { diff --git a/src/libutil-tests/file-content-address.cc b/src/libutil-tests/file-content-address.cc index 686114a9f..5cdf94edc 100644 --- a/src/libutil-tests/file-content-address.cc +++ b/src/libutil-tests/file-content-address.cc @@ -1,6 +1,6 @@ #include -#include "nix/file-content-address.hh" +#include "nix/util/file-content-address.hh" namespace nix { diff --git a/src/libutil-tests/file-system.cc b/src/libutil-tests/file-system.cc index 363f71b7a..9e4a27750 100644 --- a/src/libutil-tests/file-system.cc +++ b/src/libutil-tests/file-system.cc @@ -1,9 +1,9 @@ -#include "nix/util.hh" -#include "nix/types.hh" -#include "nix/file-system.hh" -#include "nix/processes.hh" -#include "nix/terminal.hh" -#include "nix/strings.hh" +#include "nix/util/util.hh" +#include "nix/util/types.hh" +#include "nix/util/file-system.hh" +#include "nix/util/processes.hh" +#include "nix/util/terminal.hh" +#include "nix/util/strings.hh" #include #include diff --git a/src/libutil-tests/git.cc b/src/libutil-tests/git.cc index b91d5019b..91432b76b 100644 --- a/src/libutil-tests/git.cc +++ b/src/libutil-tests/git.cc @@ -1,9 +1,9 @@ #include -#include "nix/git.hh" -#include "nix/memory-source-accessor.hh" +#include "nix/util/git.hh" +#include "nix/util/memory-source-accessor.hh" -#include "nix/tests/characterization.hh" +#include "nix/util/tests/characterization.hh" namespace nix { diff --git a/src/libutil-tests/hash.cc b/src/libutil-tests/hash.cc index 1ba69a573..3c71b0486 100644 --- a/src/libutil-tests/hash.cc +++ b/src/libutil-tests/hash.cc @@ -2,7 +2,7 @@ #include -#include "nix/hash.hh" +#include "nix/util/hash.hh" namespace nix { diff --git a/src/libutil-tests/hilite.cc b/src/libutil-tests/hilite.cc index e571a9bf6..98773afcf 100644 --- a/src/libutil-tests/hilite.cc +++ b/src/libutil-tests/hilite.cc @@ -1,4 +1,4 @@ -#include "nix/hilite.hh" +#include "nix/util/hilite.hh" #include diff --git a/src/libutil-tests/json-utils.cc b/src/libutil-tests/json-utils.cc index b8722bd30..051d86ec7 100644 --- a/src/libutil-tests/json-utils.cc +++ b/src/libutil-tests/json-utils.cc @@ -3,8 +3,8 @@ #include -#include "nix/error.hh" -#include "nix/json-utils.hh" +#include "nix/util/error.hh" +#include "nix/util/json-utils.hh" namespace nix { diff --git a/src/libutil-tests/logging.cc b/src/libutil-tests/logging.cc index ca89ee02f..494e9ce4c 100644 --- a/src/libutil-tests/logging.cc +++ b/src/libutil-tests/logging.cc @@ -1,7 +1,7 @@ #if 0 -#include "nix/logging.hh" -#include "nix/nixexpr.hh" +#include "nix/util/logging.hh" +#include "nix/expr/nixexpr.hh" #include #include diff --git a/src/libutil-tests/lru-cache.cc b/src/libutil-tests/lru-cache.cc index 98763588a..daa2a91fe 100644 --- a/src/libutil-tests/lru-cache.cc +++ b/src/libutil-tests/lru-cache.cc @@ -1,4 +1,4 @@ -#include "nix/lru-cache.hh" +#include "nix/util/lru-cache.hh" #include namespace nix { diff --git a/src/libutil-tests/nix_api_util.cc b/src/libutil-tests/nix_api_util.cc index f2d198aac..baaaa81fc 100644 --- a/src/libutil-tests/nix_api_util.cc +++ b/src/libutil-tests/nix_api_util.cc @@ -1,9 +1,9 @@ -#include "nix/config-global.hh" -#include "nix/args.hh" +#include "nix/util/config-global.hh" +#include "nix/util/args.hh" #include "nix_api_util.h" #include "nix_api_util_internal.h" -#include "nix/tests/nix_api_util.hh" -#include "nix/tests/string_callback.hh" +#include "nix/util/tests/nix_api_util.hh" +#include "nix/util/tests/string_callback.hh" #include diff --git a/src/libutil-tests/pool.cc b/src/libutil-tests/pool.cc index 8402768d3..c9f31f9a0 100644 --- a/src/libutil-tests/pool.cc +++ b/src/libutil-tests/pool.cc @@ -1,4 +1,4 @@ -#include "nix/pool.hh" +#include "nix/util/pool.hh" #include namespace nix { diff --git a/src/libutil-tests/position.cc b/src/libutil-tests/position.cc index 0726b89c0..fd65acd03 100644 --- a/src/libutil-tests/position.cc +++ b/src/libutil-tests/position.cc @@ -1,6 +1,6 @@ #include -#include "nix/position.hh" +#include "nix/util/position.hh" namespace nix { diff --git a/src/libutil-tests/processes.cc b/src/libutil-tests/processes.cc index 5d1435e3a..eb7561393 100644 --- a/src/libutil-tests/processes.cc +++ b/src/libutil-tests/processes.cc @@ -1,4 +1,4 @@ -#include "nix/processes.hh" +#include "nix/util/processes.hh" #include diff --git a/src/libutil-tests/references.cc b/src/libutil-tests/references.cc index 362629b55..622b3c35a 100644 --- a/src/libutil-tests/references.cc +++ b/src/libutil-tests/references.cc @@ -1,4 +1,4 @@ -#include "nix/references.hh" +#include "nix/util/references.hh" #include namespace nix { diff --git a/src/libutil-tests/spawn.cc b/src/libutil-tests/spawn.cc index 502d4e90b..594bced59 100644 --- a/src/libutil-tests/spawn.cc +++ b/src/libutil-tests/spawn.cc @@ -1,6 +1,6 @@ #include -#include "nix/processes.hh" +#include "nix/util/processes.hh" namespace nix { diff --git a/src/libutil-tests/strings.cc b/src/libutil-tests/strings.cc index 26b99263b..f5af4e0ff 100644 --- a/src/libutil-tests/strings.cc +++ b/src/libutil-tests/strings.cc @@ -1,8 +1,8 @@ #include #include -#include "nix/strings.hh" -#include "nix/error.hh" +#include "nix/util/strings.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil-tests/suggestions.cc b/src/libutil-tests/suggestions.cc index 36d0b7169..c58f033da 100644 --- a/src/libutil-tests/suggestions.cc +++ b/src/libutil-tests/suggestions.cc @@ -1,4 +1,4 @@ -#include "nix/suggestions.hh" +#include "nix/util/suggestions.hh" #include namespace nix { diff --git a/src/libutil-tests/terminal.cc b/src/libutil-tests/terminal.cc index 3d3296cc3..329c1a186 100644 --- a/src/libutil-tests/terminal.cc +++ b/src/libutil-tests/terminal.cc @@ -1,7 +1,7 @@ -#include "nix/util.hh" -#include "nix/types.hh" -#include "nix/terminal.hh" -#include "nix/strings.hh" +#include "nix/util/util.hh" +#include "nix/util/types.hh" +#include "nix/util/terminal.hh" +#include "nix/util/strings.hh" #include #include diff --git a/src/libutil-tests/url.cc b/src/libutil-tests/url.cc index 89a461c2c..4c089c106 100644 --- a/src/libutil-tests/url.cc +++ b/src/libutil-tests/url.cc @@ -1,4 +1,4 @@ -#include "nix/url.hh" +#include "nix/util/url.hh" #include namespace nix { diff --git a/src/libutil-tests/util.cc b/src/libutil-tests/util.cc index 53b7cd208..954867be8 100644 --- a/src/libutil-tests/util.cc +++ b/src/libutil-tests/util.cc @@ -1,8 +1,8 @@ -#include "nix/util.hh" -#include "nix/types.hh" -#include "nix/file-system.hh" -#include "nix/terminal.hh" -#include "nix/strings.hh" +#include "nix/util/util.hh" +#include "nix/util/types.hh" +#include "nix/util/file-system.hh" +#include "nix/util/terminal.hh" +#include "nix/util/strings.hh" #include #include diff --git a/src/libutil-tests/xml-writer.cc b/src/libutil-tests/xml-writer.cc index 7fc1f3154..000af700c 100644 --- a/src/libutil-tests/xml-writer.cc +++ b/src/libutil-tests/xml-writer.cc @@ -1,4 +1,4 @@ -#include "nix/xml-writer.hh" +#include "nix/util/xml-writer.hh" #include #include diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc index 2c7c91dd0..143d01085 100644 --- a/src/libutil/archive.cc +++ b/src/libutil/archive.cc @@ -5,12 +5,12 @@ #include // for strcasecmp -#include "nix/archive.hh" -#include "nix/config-global.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/source-path.hh" -#include "nix/file-system.hh" -#include "nix/signals.hh" +#include "nix/util/archive.hh" +#include "nix/util/config-global.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/util/source-path.hh" +#include "nix/util/file-system.hh" +#include "nix/util/signals.hh" namespace nix { diff --git a/src/libutil/args.cc b/src/libutil/args.cc index 184318cc4..b4177bf93 100644 --- a/src/libutil/args.cc +++ b/src/libutil/args.cc @@ -1,10 +1,10 @@ -#include "nix/args.hh" -#include "nix/args/root.hh" -#include "nix/hash.hh" -#include "nix/environment-variables.hh" -#include "nix/signals.hh" -#include "nix/users.hh" -#include "nix/json-utils.hh" +#include "nix/util/args.hh" +#include "nix/util/args/root.hh" +#include "nix/util/hash.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/signals.hh" +#include "nix/util/users.hh" +#include "nix/util/json-utils.hh" #include #include diff --git a/src/libutil/canon-path.cc b/src/libutil/canon-path.cc index c6f48ac32..33ac700f0 100644 --- a/src/libutil/canon-path.cc +++ b/src/libutil/canon-path.cc @@ -1,7 +1,7 @@ -#include "nix/canon-path.hh" -#include "nix/util.hh" -#include "nix/file-path-impl.hh" -#include "nix/strings-inline.hh" +#include "nix/util/canon-path.hh" +#include "nix/util/util.hh" +#include "nix/util/file-path-impl.hh" +#include "nix/util/strings-inline.hh" namespace nix { diff --git a/src/libutil/compression.cc b/src/libutil/compression.cc index 788ad7109..0e38620d4 100644 --- a/src/libutil/compression.cc +++ b/src/libutil/compression.cc @@ -1,8 +1,8 @@ -#include "nix/compression.hh" -#include "nix/signals.hh" -#include "nix/tarfile.hh" -#include "nix/finally.hh" -#include "nix/logging.hh" +#include "nix/util/compression.hh" +#include "nix/util/signals.hh" +#include "nix/util/tarfile.hh" +#include "nix/util/finally.hh" +#include "nix/util/logging.hh" #include #include diff --git a/src/libutil/compute-levels.cc b/src/libutil/compute-levels.cc index 732bbfbb8..dd221bd70 100644 --- a/src/libutil/compute-levels.cc +++ b/src/libutil/compute-levels.cc @@ -1,4 +1,4 @@ -#include "nix/types.hh" +#include "nix/util/types.hh" #include "util-config-private.hh" diff --git a/src/libutil/config-global.cc b/src/libutil/config-global.cc index b325d09e7..10d176c51 100644 --- a/src/libutil/config-global.cc +++ b/src/libutil/config-global.cc @@ -1,4 +1,4 @@ -#include "nix/config-global.hh" +#include "nix/util/config-global.hh" #include diff --git a/src/libutil/config.cc b/src/libutil/configuration.cc similarity index 97% rename from src/libutil/config.cc rename to src/libutil/configuration.cc index b108dd58a..0f5a6a432 100644 --- a/src/libutil/config.cc +++ b/src/libutil/configuration.cc @@ -1,16 +1,16 @@ -#include "nix/config.hh" -#include "nix/args.hh" -#include "nix/abstract-setting-to-json.hh" -#include "nix/environment-variables.hh" -#include "nix/experimental-features.hh" -#include "nix/util.hh" -#include "nix/file-system.hh" +#include "nix/util/configuration.hh" +#include "nix/util/args.hh" +#include "nix/util/abstract-setting-to-json.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/experimental-features.hh" +#include "nix/util/util.hh" +#include "nix/util/file-system.hh" -#include "nix/config-impl.hh" +#include "nix/util/config-impl.hh" #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libutil/current-process.cc b/src/libutil/current-process.cc index 11655c55c..4103c0515 100644 --- a/src/libutil/current-process.cc +++ b/src/libutil/current-process.cc @@ -1,12 +1,12 @@ #include #include -#include "nix/current-process.hh" -#include "nix/util.hh" -#include "nix/finally.hh" -#include "nix/file-system.hh" -#include "nix/processes.hh" -#include "nix/signals.hh" +#include "nix/util/current-process.hh" +#include "nix/util/util.hh" +#include "nix/util/finally.hh" +#include "nix/util/file-system.hh" +#include "nix/util/processes.hh" +#include "nix/util/signals.hh" #include #ifdef __APPLE__ @@ -15,8 +15,8 @@ #if __linux__ # include -# include "nix/cgroup.hh" -# include "nix/namespaces.hh" +# include "nix/util/cgroup.hh" +# include "nix/util/namespaces.hh" #endif namespace nix { diff --git a/src/libutil/english.cc b/src/libutil/english.cc index 9ccc7ed3b..e697b8c30 100644 --- a/src/libutil/english.cc +++ b/src/libutil/english.cc @@ -1,4 +1,4 @@ -#include "nix/english.hh" +#include "nix/util/english.hh" namespace nix { diff --git a/src/libutil/environment-variables.cc b/src/libutil/environment-variables.cc index f2948807a..0b668f125 100644 --- a/src/libutil/environment-variables.cc +++ b/src/libutil/environment-variables.cc @@ -1,5 +1,5 @@ -#include "nix/util.hh" -#include "nix/environment-variables.hh" +#include "nix/util/util.hh" +#include "nix/util/environment-variables.hh" extern char ** environ __attribute__((weak)); diff --git a/src/libutil/error.cc b/src/libutil/error.cc index bd0baaeff..0ceaa4e76 100644 --- a/src/libutil/error.cc +++ b/src/libutil/error.cc @@ -1,14 +1,14 @@ #include -#include "nix/error.hh" -#include "nix/environment-variables.hh" -#include "nix/signals.hh" -#include "nix/terminal.hh" -#include "nix/position.hh" +#include "nix/util/error.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/signals.hh" +#include "nix/util/terminal.hh" +#include "nix/util/position.hh" #include #include -#include "nix/serialise.hh" +#include "nix/util/serialise.hh" #include namespace nix { diff --git a/src/libutil/executable-path.cc b/src/libutil/executable-path.cc index 24e3484f2..ed1ac49ce 100644 --- a/src/libutil/executable-path.cc +++ b/src/libutil/executable-path.cc @@ -1,8 +1,8 @@ -#include "nix/environment-variables.hh" -#include "nix/executable-path.hh" -#include "nix/strings-inline.hh" -#include "nix/util.hh" -#include "nix/file-path-impl.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/executable-path.hh" +#include "nix/util/strings-inline.hh" +#include "nix/util/util.hh" +#include "nix/util/file-path-impl.hh" namespace nix { diff --git a/src/libutil/exit.cc b/src/libutil/exit.cc index e177cfa31..3c59e46af 100644 --- a/src/libutil/exit.cc +++ b/src/libutil/exit.cc @@ -1,4 +1,4 @@ -#include "nix/exit.hh" +#include "nix/util/exit.hh" namespace nix { diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index c05c3e9ec..348caa44e 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -1,6 +1,6 @@ -#include "nix/experimental-features.hh" -#include "nix/fmt.hh" -#include "nix/util.hh" +#include "nix/util/experimental-features.hh" +#include "nix/util/fmt.hh" +#include "nix/util/util.hh" #include diff --git a/src/libutil/file-content-address.cc b/src/libutil/file-content-address.cc index 71eb34611..673e1dff1 100644 --- a/src/libutil/file-content-address.cc +++ b/src/libutil/file-content-address.cc @@ -1,7 +1,7 @@ -#include "nix/file-content-address.hh" -#include "nix/archive.hh" -#include "nix/git.hh" -#include "nix/source-path.hh" +#include "nix/util/file-content-address.hh" +#include "nix/util/archive.hh" +#include "nix/util/git.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libutil/file-descriptor.cc b/src/libutil/file-descriptor.cc index 2af1364b1..042edbf55 100644 --- a/src/libutil/file-descriptor.cc +++ b/src/libutil/file-descriptor.cc @@ -1,12 +1,12 @@ -#include "nix/serialise.hh" -#include "nix/util.hh" +#include "nix/util/serialise.hh" +#include "nix/util/util.hh" #include #include #ifdef _WIN32 # include # include -# include "nix/windows-error.hh" +# include "nix/util/windows-error.hh" #endif namespace nix { diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc index 96a133aa2..f6aba45d4 100644 --- a/src/libutil/file-system.cc +++ b/src/libutil/file-system.cc @@ -1,11 +1,11 @@ -#include "nix/environment-variables.hh" -#include "nix/file-system.hh" -#include "nix/file-path.hh" -#include "nix/file-path-impl.hh" -#include "nix/signals.hh" -#include "nix/finally.hh" -#include "nix/serialise.hh" -#include "nix/util.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/file-system.hh" +#include "nix/util/file-path.hh" +#include "nix/util/file-path-impl.hh" +#include "nix/util/signals.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" +#include "nix/util/util.hh" #include #include @@ -25,7 +25,7 @@ # include #endif -#include "nix/strings-inline.hh" +#include "nix/util/strings-inline.hh" #include "util-config-private.hh" diff --git a/src/libutil/fs-sink.cc b/src/libutil/fs-sink.cc index 7b8ba1189..aa46b3cd2 100644 --- a/src/libutil/fs-sink.cc +++ b/src/libutil/fs-sink.cc @@ -1,13 +1,13 @@ #include -#include "nix/error.hh" -#include "nix/config-global.hh" -#include "nix/fs-sink.hh" +#include "nix/util/error.hh" +#include "nix/util/config-global.hh" +#include "nix/util/fs-sink.hh" #if _WIN32 # include -# include "nix/file-path.hh" -# include "nix/windows-error.hh" +# include "nix/util/file-path.hh" +# include "nix/util/windows-error.hh" #endif #include "util-config-private.hh" diff --git a/src/libutil/git.cc b/src/libutil/git.cc index c6466bdda..45cda1c2c 100644 --- a/src/libutil/git.cc +++ b/src/libutil/git.cc @@ -5,12 +5,12 @@ #include #include // for strcasecmp -#include "nix/signals.hh" -#include "nix/config.hh" -#include "nix/hash.hh" +#include "nix/util/signals.hh" +#include "nix/util/configuration.hh" +#include "nix/util/hash.hh" -#include "nix/git.hh" -#include "nix/serialise.hh" +#include "nix/util/git.hh" +#include "nix/util/serialise.hh" namespace nix::git { diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc index 22eca6014..0a654b914 100644 --- a/src/libutil/hash.cc +++ b/src/libutil/hash.cc @@ -6,11 +6,11 @@ #include #include -#include "nix/args.hh" -#include "nix/hash.hh" -#include "nix/archive.hh" -#include "nix/config.hh" -#include "nix/split.hh" +#include "nix/util/args.hh" +#include "nix/util/hash.hh" +#include "nix/util/archive.hh" +#include "nix/util/configuration.hh" +#include "nix/util/split.hh" #include #include diff --git a/src/libutil/hilite.cc b/src/libutil/hilite.cc index 6d843e091..cfadd6af9 100644 --- a/src/libutil/hilite.cc +++ b/src/libutil/hilite.cc @@ -1,4 +1,4 @@ -#include "nix/hilite.hh" +#include "nix/util/hilite.hh" namespace nix { diff --git a/src/libutil/include/nix/abstract-setting-to-json.hh b/src/libutil/include/nix/util/abstract-setting-to-json.hh similarity index 83% rename from src/libutil/include/nix/abstract-setting-to-json.hh rename to src/libutil/include/nix/util/abstract-setting-to-json.hh index 313b18faf..2848f8afe 100644 --- a/src/libutil/include/nix/abstract-setting-to-json.hh +++ b/src/libutil/include/nix/util/abstract-setting-to-json.hh @@ -2,8 +2,8 @@ ///@file #include -#include "nix/config.hh" -#include "nix/json-utils.hh" +#include "nix/util/configuration.hh" +#include "nix/util/json-utils.hh" namespace nix { template diff --git a/src/libutil/include/nix/ansicolor.hh b/src/libutil/include/nix/util/ansicolor.hh similarity index 100% rename from src/libutil/include/nix/ansicolor.hh rename to src/libutil/include/nix/util/ansicolor.hh diff --git a/src/libutil/include/nix/archive.hh b/src/libutil/include/nix/util/archive.hh similarity index 95% rename from src/libutil/include/nix/archive.hh rename to src/libutil/include/nix/util/archive.hh index 9131f49fa..ae3274fa6 100644 --- a/src/libutil/include/nix/archive.hh +++ b/src/libutil/include/nix/util/archive.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/serialise.hh" -#include "nix/fs-sink.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" +#include "nix/util/fs-sink.hh" namespace nix { diff --git a/src/libutil/include/nix/args.hh b/src/libutil/include/nix/util/args.hh similarity index 99% rename from src/libutil/include/nix/args.hh rename to src/libutil/include/nix/util/args.hh index 987d14f9e..77c4fb5b6 100644 --- a/src/libutil/include/nix/args.hh +++ b/src/libutil/include/nix/util/args.hh @@ -9,9 +9,9 @@ #include -#include "nix/types.hh" -#include "nix/experimental-features.hh" -#include "nix/ref.hh" +#include "nix/util/types.hh" +#include "nix/util/experimental-features.hh" +#include "nix/util/ref.hh" namespace nix { diff --git a/src/libutil/include/nix/args/root.hh b/src/libutil/include/nix/util/args/root.hh similarity index 98% rename from src/libutil/include/nix/args/root.hh rename to src/libutil/include/nix/util/args/root.hh index bb83b85a5..cdc9be613 100644 --- a/src/libutil/include/nix/args/root.hh +++ b/src/libutil/include/nix/util/args/root.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/args.hh" +#include "nix/util/args.hh" namespace nix { diff --git a/src/libutil/include/nix/callback.hh b/src/libutil/include/nix/util/callback.hh similarity index 100% rename from src/libutil/include/nix/callback.hh rename to src/libutil/include/nix/util/callback.hh diff --git a/src/libutil/include/nix/canon-path.hh b/src/libutil/include/nix/util/canon-path.hh similarity index 100% rename from src/libutil/include/nix/canon-path.hh rename to src/libutil/include/nix/util/canon-path.hh diff --git a/src/libutil/include/nix/checked-arithmetic.hh b/src/libutil/include/nix/util/checked-arithmetic.hh similarity index 100% rename from src/libutil/include/nix/checked-arithmetic.hh rename to src/libutil/include/nix/util/checked-arithmetic.hh diff --git a/src/libutil/include/nix/chunked-vector.hh b/src/libutil/include/nix/util/chunked-vector.hh similarity index 98% rename from src/libutil/include/nix/chunked-vector.hh rename to src/libutil/include/nix/util/chunked-vector.hh index 34d5bbb1d..96a717556 100644 --- a/src/libutil/include/nix/chunked-vector.hh +++ b/src/libutil/include/nix/util/chunked-vector.hh @@ -6,7 +6,7 @@ #include #include -#include "nix/error.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/include/nix/closure.hh b/src/libutil/include/nix/util/closure.hh similarity index 98% rename from src/libutil/include/nix/closure.hh rename to src/libutil/include/nix/util/closure.hh index c8fc7c9a4..54b18ab3d 100644 --- a/src/libutil/include/nix/closure.hh +++ b/src/libutil/include/nix/util/closure.hh @@ -3,7 +3,7 @@ #include #include -#include "nix/sync.hh" +#include "nix/util/sync.hh" using std::set; diff --git a/src/libutil/include/nix/comparator.hh b/src/libutil/include/nix/util/comparator.hh similarity index 100% rename from src/libutil/include/nix/comparator.hh rename to src/libutil/include/nix/util/comparator.hh diff --git a/src/libutil/include/nix/compression.hh b/src/libutil/include/nix/util/compression.hh similarity index 89% rename from src/libutil/include/nix/compression.hh rename to src/libutil/include/nix/util/compression.hh index 25f479e48..15d869e88 100644 --- a/src/libutil/include/nix/compression.hh +++ b/src/libutil/include/nix/util/compression.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/ref.hh" -#include "nix/types.hh" -#include "nix/serialise.hh" +#include "nix/util/ref.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" #include diff --git a/src/libutil/include/nix/compute-levels.hh b/src/libutil/include/nix/util/compute-levels.hh similarity index 71% rename from src/libutil/include/nix/compute-levels.hh rename to src/libutil/include/nix/util/compute-levels.hh index d77eece93..401547793 100644 --- a/src/libutil/include/nix/compute-levels.hh +++ b/src/libutil/include/nix/util/compute-levels.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/include/nix/config-global.hh b/src/libutil/include/nix/util/config-global.hh similarity index 94% rename from src/libutil/include/nix/config-global.hh rename to src/libutil/include/nix/util/config-global.hh index b0e8ad2ce..b47ee0ad1 100644 --- a/src/libutil/include/nix/config-global.hh +++ b/src/libutil/include/nix/util/config-global.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/config.hh" +#include "nix/util/configuration.hh" namespace nix { diff --git a/src/libutil/include/nix/config-impl.hh b/src/libutil/include/nix/util/config-impl.hh similarity index 98% rename from src/libutil/include/nix/config-impl.hh rename to src/libutil/include/nix/util/config-impl.hh index b02e27f50..15e0c9554 100644 --- a/src/libutil/include/nix/config-impl.hh +++ b/src/libutil/include/nix/util/config-impl.hh @@ -12,8 +12,8 @@ * instantiation. */ -#include "nix/config.hh" -#include "nix/args.hh" +#include "nix/util/configuration.hh" +#include "nix/util/args.hh" namespace nix { diff --git a/src/libutil/include/nix/config.hh b/src/libutil/include/nix/util/configuration.hh similarity index 99% rename from src/libutil/include/nix/config.hh rename to src/libutil/include/nix/util/configuration.hh index f4135af64..34cefd73b 100644 --- a/src/libutil/include/nix/config.hh +++ b/src/libutil/include/nix/util/configuration.hh @@ -7,8 +7,8 @@ #include -#include "nix/types.hh" -#include "nix/experimental-features.hh" +#include "nix/util/types.hh" +#include "nix/util/experimental-features.hh" namespace nix { diff --git a/src/libutil/include/nix/current-process.hh b/src/libutil/include/nix/util/current-process.hh similarity index 96% rename from src/libutil/include/nix/current-process.hh rename to src/libutil/include/nix/util/current-process.hh index d98f4e752..b2c92a34c 100644 --- a/src/libutil/include/nix/current-process.hh +++ b/src/libutil/include/nix/util/current-process.hh @@ -7,7 +7,7 @@ # include #endif -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/include/nix/english.hh b/src/libutil/include/nix/util/english.hh similarity index 100% rename from src/libutil/include/nix/english.hh rename to src/libutil/include/nix/util/english.hh diff --git a/src/libutil/include/nix/environment-variables.hh b/src/libutil/include/nix/util/environment-variables.hh similarity index 95% rename from src/libutil/include/nix/environment-variables.hh rename to src/libutil/include/nix/util/environment-variables.hh index 9a5f364a3..d6c7472fc 100644 --- a/src/libutil/include/nix/environment-variables.hh +++ b/src/libutil/include/nix/util/environment-variables.hh @@ -8,8 +8,8 @@ #include -#include "nix/types.hh" -#include "nix/file-path.hh" +#include "nix/util/types.hh" +#include "nix/util/file-path.hh" namespace nix { diff --git a/src/libutil/include/nix/error.hh b/src/libutil/include/nix/util/error.hh similarity index 98% rename from src/libutil/include/nix/error.hh rename to src/libutil/include/nix/util/error.hh index 6ac4497cb..fa60d4c61 100644 --- a/src/libutil/include/nix/error.hh +++ b/src/libutil/include/nix/util/error.hh @@ -15,8 +15,8 @@ * See libutil/tests/logging.cc for usage examples. */ -#include "nix/suggestions.hh" -#include "nix/fmt.hh" +#include "nix/util/suggestions.hh" +#include "nix/util/fmt.hh" #include #include @@ -51,7 +51,7 @@ struct LinesOfCode { }; /* NOTE: position.hh recursively depends on source-path.hh -> source-accessor.hh - -> hash.hh -> config.hh -> experimental-features.hh -> error.hh -> Pos. + -> hash.hh -> configuration.hh -> experimental-features.hh -> error.hh -> Pos. There are other such cycles. Thus, Pos has to be an incomplete type in this header. But since ErrorInfo/Trace have to refer to Pos, they have to use pointer indirection via std::shared_ptr diff --git a/src/libutil/include/nix/exec.hh b/src/libutil/include/nix/util/exec.hh similarity index 89% rename from src/libutil/include/nix/exec.hh rename to src/libutil/include/nix/util/exec.hh index dc14691e2..a362cef35 100644 --- a/src/libutil/include/nix/exec.hh +++ b/src/libutil/include/nix/util/exec.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/os-string.hh" +#include "nix/util/os-string.hh" namespace nix { diff --git a/src/libutil/include/nix/executable-path.hh b/src/libutil/include/nix/util/executable-path.hh similarity index 98% rename from src/libutil/include/nix/executable-path.hh rename to src/libutil/include/nix/util/executable-path.hh index 3af4a24cf..700d296d5 100644 --- a/src/libutil/include/nix/executable-path.hh +++ b/src/libutil/include/nix/util/executable-path.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/file-system.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libutil/include/nix/exit.hh b/src/libutil/include/nix/util/exit.hh similarity index 100% rename from src/libutil/include/nix/exit.hh rename to src/libutil/include/nix/util/exit.hh diff --git a/src/libutil/include/nix/experimental-features.hh b/src/libutil/include/nix/util/experimental-features.hh similarity index 97% rename from src/libutil/include/nix/experimental-features.hh rename to src/libutil/include/nix/util/experimental-features.hh index 946bb65b3..06dd7062b 100644 --- a/src/libutil/include/nix/experimental-features.hh +++ b/src/libutil/include/nix/util/experimental-features.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/error.hh" -#include "nix/types.hh" +#include "nix/util/error.hh" +#include "nix/util/types.hh" #include diff --git a/src/libutil/include/nix/file-content-address.hh b/src/libutil/include/nix/util/file-content-address.hh similarity index 99% rename from src/libutil/include/nix/file-content-address.hh rename to src/libutil/include/nix/util/file-content-address.hh index c56debd2b..0922604f8 100644 --- a/src/libutil/include/nix/file-content-address.hh +++ b/src/libutil/include/nix/util/file-content-address.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/source-accessor.hh" +#include "nix/util/source-accessor.hh" namespace nix { diff --git a/src/libutil/include/nix/file-descriptor.hh b/src/libutil/include/nix/util/file-descriptor.hh similarity index 98% rename from src/libutil/include/nix/file-descriptor.hh rename to src/libutil/include/nix/util/file-descriptor.hh index 785756a0f..2e8b4ce10 100644 --- a/src/libutil/include/nix/file-descriptor.hh +++ b/src/libutil/include/nix/util/file-descriptor.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/error.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN diff --git a/src/libutil/include/nix/file-path-impl.hh b/src/libutil/include/nix/util/file-path-impl.hh similarity index 100% rename from src/libutil/include/nix/file-path-impl.hh rename to src/libutil/include/nix/util/file-path-impl.hh diff --git a/src/libutil/include/nix/file-path.hh b/src/libutil/include/nix/util/file-path.hh similarity index 93% rename from src/libutil/include/nix/file-path.hh rename to src/libutil/include/nix/util/file-path.hh index 15bceac13..deff076f1 100644 --- a/src/libutil/include/nix/file-path.hh +++ b/src/libutil/include/nix/util/file-path.hh @@ -3,8 +3,8 @@ #include -#include "nix/types.hh" -#include "nix/os-string.hh" +#include "nix/util/types.hh" +#include "nix/util/os-string.hh" namespace nix { diff --git a/src/libutil/include/nix/file-system.hh b/src/libutil/include/nix/util/file-system.hh similarity index 98% rename from src/libutil/include/nix/file-system.hh rename to src/libutil/include/nix/util/file-system.hh index b29ab17cb..f40608e17 100644 --- a/src/libutil/include/nix/file-system.hh +++ b/src/libutil/include/nix/util/file-system.hh @@ -5,11 +5,11 @@ * Utilities for working with the file system and file paths. */ -#include "nix/types.hh" -#include "nix/error.hh" -#include "nix/logging.hh" -#include "nix/file-descriptor.hh" -#include "nix/file-path.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/logging.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/util/file-path.hh" #include #include diff --git a/src/libutil/include/nix/finally.hh b/src/libutil/include/nix/util/finally.hh similarity index 100% rename from src/libutil/include/nix/finally.hh rename to src/libutil/include/nix/util/finally.hh diff --git a/src/libutil/include/nix/fmt.hh b/src/libutil/include/nix/util/fmt.hh similarity index 99% rename from src/libutil/include/nix/fmt.hh rename to src/libutil/include/nix/util/fmt.hh index 45d9f43b7..5435a4ebf 100644 --- a/src/libutil/include/nix/fmt.hh +++ b/src/libutil/include/nix/util/fmt.hh @@ -3,7 +3,7 @@ #include #include -#include "nix/ansicolor.hh" +#include "nix/util/ansicolor.hh" namespace nix { diff --git a/src/libutil/include/nix/fs-sink.hh b/src/libutil/include/nix/util/fs-sink.hh similarity index 96% rename from src/libutil/include/nix/fs-sink.hh rename to src/libutil/include/nix/util/fs-sink.hh index 30803e63e..1c34fba93 100644 --- a/src/libutil/include/nix/fs-sink.hh +++ b/src/libutil/include/nix/util/fs-sink.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/serialise.hh" -#include "nix/source-accessor.hh" -#include "nix/file-system.hh" +#include "nix/util/serialise.hh" +#include "nix/util/source-accessor.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libutil/include/nix/git.hh b/src/libutil/include/nix/util/git.hh similarity index 97% rename from src/libutil/include/nix/git.hh rename to src/libutil/include/nix/util/git.hh index 2dc1bb796..9bdb30bb9 100644 --- a/src/libutil/include/nix/git.hh +++ b/src/libutil/include/nix/util/git.hh @@ -5,11 +5,11 @@ #include #include -#include "nix/types.hh" -#include "nix/serialise.hh" -#include "nix/hash.hh" -#include "nix/source-path.hh" -#include "nix/fs-sink.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" +#include "nix/util/hash.hh" +#include "nix/util/source-path.hh" +#include "nix/util/fs-sink.hh" namespace nix::git { diff --git a/src/libutil/include/nix/hash.hh b/src/libutil/include/nix/util/hash.hh similarity index 97% rename from src/libutil/include/nix/hash.hh rename to src/libutil/include/nix/util/hash.hh index 3c9adebac..f3cc4cc6c 100644 --- a/src/libutil/include/nix/hash.hh +++ b/src/libutil/include/nix/util/hash.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/config.hh" -#include "nix/types.hh" -#include "nix/serialise.hh" -#include "nix/file-system.hh" +#include "nix/util/configuration.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libutil/include/nix/hilite.hh b/src/libutil/include/nix/util/hilite.hh similarity index 100% rename from src/libutil/include/nix/hilite.hh rename to src/libutil/include/nix/util/hilite.hh diff --git a/src/libutil/include/nix/json-impls.hh b/src/libutil/include/nix/util/json-impls.hh similarity index 100% rename from src/libutil/include/nix/json-impls.hh rename to src/libutil/include/nix/util/json-impls.hh diff --git a/src/libutil/include/nix/json-utils.hh b/src/libutil/include/nix/util/json-utils.hh similarity index 99% rename from src/libutil/include/nix/json-utils.hh rename to src/libutil/include/nix/util/json-utils.hh index 96ffcd3c0..9308d4392 100644 --- a/src/libutil/include/nix/json-utils.hh +++ b/src/libutil/include/nix/util/json-utils.hh @@ -4,7 +4,7 @@ #include #include -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/include/nix/logging.hh b/src/libutil/include/nix/util/logging.hh similarity index 98% rename from src/libutil/include/nix/logging.hh rename to src/libutil/include/nix/util/logging.hh index c83ad2316..9210229bf 100644 --- a/src/libutil/include/nix/logging.hh +++ b/src/libutil/include/nix/util/logging.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "nix/error.hh" -#include "nix/config.hh" -#include "nix/file-descriptor.hh" -#include "nix/finally.hh" +#include "nix/util/error.hh" +#include "nix/util/configuration.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/util/finally.hh" #include diff --git a/src/libutil/include/nix/lru-cache.hh b/src/libutil/include/nix/util/lru-cache.hh similarity index 100% rename from src/libutil/include/nix/lru-cache.hh rename to src/libutil/include/nix/util/lru-cache.hh diff --git a/src/libutil/include/nix/memory-source-accessor.hh b/src/libutil/include/nix/util/memory-source-accessor.hh similarity index 97% rename from src/libutil/include/nix/memory-source-accessor.hh rename to src/libutil/include/nix/util/memory-source-accessor.hh index 08ab3f2d4..d09ba153d 100644 --- a/src/libutil/include/nix/memory-source-accessor.hh +++ b/src/libutil/include/nix/util/memory-source-accessor.hh @@ -1,6 +1,6 @@ -#include "nix/source-path.hh" -#include "nix/fs-sink.hh" -#include "nix/variant-wrapper.hh" +#include "nix/util/source-path.hh" +#include "nix/util/fs-sink.hh" +#include "nix/util/variant-wrapper.hh" namespace nix { diff --git a/src/libutil/include/nix/meson.build b/src/libutil/include/nix/util/meson.build similarity index 95% rename from src/libutil/include/nix/meson.build rename to src/libutil/include/nix/util/meson.build index 3da9837ed..e30b8dacd 100644 --- a/src/libutil/include/nix/meson.build +++ b/src/libutil/include/nix/util/meson.build @@ -1,6 +1,6 @@ # Public headers directory -include_dirs = [include_directories('..')] +include_dirs = [include_directories('../..')] headers = files( 'abstract-setting-to-json.hh', @@ -18,7 +18,7 @@ headers = files( 'compute-levels.hh', 'config-global.hh', 'config-impl.hh', - 'config.hh', + 'configuration.hh', 'current-process.hh', 'english.hh', 'environment-variables.hh', diff --git a/src/libutil/include/nix/muxable-pipe.hh b/src/libutil/include/nix/util/muxable-pipe.hh similarity index 93% rename from src/libutil/include/nix/muxable-pipe.hh rename to src/libutil/include/nix/util/muxable-pipe.hh index e4d6a74a3..d912627fb 100644 --- a/src/libutil/include/nix/muxable-pipe.hh +++ b/src/libutil/include/nix/util/muxable-pipe.hh @@ -1,16 +1,16 @@ #pragma once ///@file -#include "nix/file-descriptor.hh" +#include "nix/util/file-descriptor.hh" #ifdef _WIN32 -# include "nix/windows-async-pipe.hh" +# include "nix/util/windows-async-pipe.hh" #endif #ifndef _WIN32 # include #else # include -# include "nix/windows-error.hh" +# include "nix/util/windows-error.hh" #endif namespace nix { diff --git a/src/libutil/include/nix/os-string.hh b/src/libutil/include/nix/util/os-string.hh similarity index 100% rename from src/libutil/include/nix/os-string.hh rename to src/libutil/include/nix/util/os-string.hh diff --git a/src/libutil/include/nix/pool.hh b/src/libutil/include/nix/util/pool.hh similarity index 98% rename from src/libutil/include/nix/pool.hh rename to src/libutil/include/nix/util/pool.hh index 65b789ba0..a63db50de 100644 --- a/src/libutil/include/nix/pool.hh +++ b/src/libutil/include/nix/util/pool.hh @@ -7,8 +7,8 @@ #include #include -#include "nix/sync.hh" -#include "nix/ref.hh" +#include "nix/util/sync.hh" +#include "nix/util/ref.hh" namespace nix { diff --git a/src/libutil/include/nix/pos-idx.hh b/src/libutil/include/nix/util/pos-idx.hh similarity index 100% rename from src/libutil/include/nix/pos-idx.hh rename to src/libutil/include/nix/util/pos-idx.hh diff --git a/src/libutil/include/nix/pos-table.hh b/src/libutil/include/nix/util/pos-table.hh similarity index 96% rename from src/libutil/include/nix/pos-table.hh rename to src/libutil/include/nix/util/pos-table.hh index 9f4ff2e0b..ef170e0f1 100644 --- a/src/libutil/include/nix/pos-table.hh +++ b/src/libutil/include/nix/util/pos-table.hh @@ -4,9 +4,9 @@ #include #include -#include "nix/pos-idx.hh" -#include "nix/position.hh" -#include "nix/sync.hh" +#include "nix/util/pos-idx.hh" +#include "nix/util/position.hh" +#include "nix/util/sync.hh" namespace nix { diff --git a/src/libutil/include/nix/position.hh b/src/libutil/include/nix/util/position.hh similarity index 98% rename from src/libutil/include/nix/position.hh rename to src/libutil/include/nix/util/position.hh index 34457a824..f9c984976 100644 --- a/src/libutil/include/nix/position.hh +++ b/src/libutil/include/nix/util/position.hh @@ -9,7 +9,7 @@ #include #include -#include "nix/source-path.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libutil/include/nix/posix-source-accessor.hh b/src/libutil/include/nix/util/posix-source-accessor.hh similarity index 98% rename from src/libutil/include/nix/posix-source-accessor.hh rename to src/libutil/include/nix/util/posix-source-accessor.hh index d81e9246c..ea65b148f 100644 --- a/src/libutil/include/nix/posix-source-accessor.hh +++ b/src/libutil/include/nix/util/posix-source-accessor.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/source-accessor.hh" +#include "nix/util/source-accessor.hh" namespace nix { diff --git a/src/libutil/include/nix/processes.hh b/src/libutil/include/nix/util/processes.hh similarity index 94% rename from src/libutil/include/nix/processes.hh rename to src/libutil/include/nix/util/processes.hh index 80ea14223..ef7bddf2f 100644 --- a/src/libutil/include/nix/processes.hh +++ b/src/libutil/include/nix/util/processes.hh @@ -1,11 +1,11 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/error.hh" -#include "nix/file-descriptor.hh" -#include "nix/logging.hh" -#include "nix/ansicolor.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/util/logging.hh" +#include "nix/util/ansicolor.hh" #include #include diff --git a/src/libutil/include/nix/ref.hh b/src/libutil/include/nix/util/ref.hh similarity index 100% rename from src/libutil/include/nix/ref.hh rename to src/libutil/include/nix/util/ref.hh diff --git a/src/libutil/include/nix/references.hh b/src/libutil/include/nix/util/references.hh similarity index 97% rename from src/libutil/include/nix/references.hh rename to src/libutil/include/nix/util/references.hh index b608f7015..89a42e009 100644 --- a/src/libutil/include/nix/references.hh +++ b/src/libutil/include/nix/util/references.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/hash.hh" +#include "nix/util/hash.hh" namespace nix { diff --git a/src/libutil/include/nix/regex-combinators.hh b/src/libutil/include/nix/util/regex-combinators.hh similarity index 100% rename from src/libutil/include/nix/regex-combinators.hh rename to src/libutil/include/nix/util/regex-combinators.hh diff --git a/src/libutil/include/nix/repair-flag.hh b/src/libutil/include/nix/util/repair-flag.hh similarity index 100% rename from src/libutil/include/nix/repair-flag.hh rename to src/libutil/include/nix/util/repair-flag.hh diff --git a/src/libutil/include/nix/serialise.hh b/src/libutil/include/nix/util/serialise.hh similarity index 99% rename from src/libutil/include/nix/serialise.hh rename to src/libutil/include/nix/util/serialise.hh index ef49a43b6..d28c8e9a6 100644 --- a/src/libutil/include/nix/serialise.hh +++ b/src/libutil/include/nix/util/serialise.hh @@ -4,9 +4,9 @@ #include #include -#include "nix/types.hh" -#include "nix/util.hh" -#include "nix/file-descriptor.hh" +#include "nix/util/types.hh" +#include "nix/util/util.hh" +#include "nix/util/file-descriptor.hh" namespace boost::context { struct stack_context; } diff --git a/src/libutil/include/nix/signals.hh b/src/libutil/include/nix/util/signals.hh similarity index 89% rename from src/libutil/include/nix/signals.hh rename to src/libutil/include/nix/util/signals.hh index b4953525e..45130a90c 100644 --- a/src/libutil/include/nix/signals.hh +++ b/src/libutil/include/nix/util/signals.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/error.hh" -#include "nix/logging.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/logging.hh" #include @@ -62,4 +62,4 @@ struct ReceiveInterrupts; } -#include "nix/signals-impl.hh" +#include "nix/util/signals-impl.hh" diff --git a/src/libutil/include/nix/signature/local-keys.hh b/src/libutil/include/nix/util/signature/local-keys.hh similarity index 98% rename from src/libutil/include/nix/signature/local-keys.hh rename to src/libutil/include/nix/util/signature/local-keys.hh index 368976b11..85918f906 100644 --- a/src/libutil/include/nix/signature/local-keys.hh +++ b/src/libutil/include/nix/util/signature/local-keys.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" #include diff --git a/src/libutil/include/nix/signature/signer.hh b/src/libutil/include/nix/util/signature/signer.hh similarity index 94% rename from src/libutil/include/nix/signature/signer.hh rename to src/libutil/include/nix/util/signature/signer.hh index 3eeb75608..ca2905eef 100644 --- a/src/libutil/include/nix/signature/signer.hh +++ b/src/libutil/include/nix/util/signature/signer.hh @@ -1,7 +1,7 @@ #pragma once -#include "nix/types.hh" -#include "nix/signature/local-keys.hh" +#include "nix/util/types.hh" +#include "nix/util/signature/local-keys.hh" #include #include diff --git a/src/libutil/include/nix/source-accessor.hh b/src/libutil/include/nix/util/source-accessor.hh similarity index 98% rename from src/libutil/include/nix/source-accessor.hh rename to src/libutil/include/nix/util/source-accessor.hh index 5efc177fc..3a28b2c2b 100644 --- a/src/libutil/include/nix/source-accessor.hh +++ b/src/libutil/include/nix/util/source-accessor.hh @@ -2,9 +2,9 @@ #include -#include "nix/canon-path.hh" -#include "nix/hash.hh" -#include "nix/ref.hh" +#include "nix/util/canon-path.hh" +#include "nix/util/hash.hh" +#include "nix/util/ref.hh" namespace nix { diff --git a/src/libutil/include/nix/source-path.hh b/src/libutil/include/nix/util/source-path.hh similarity index 96% rename from src/libutil/include/nix/source-path.hh rename to src/libutil/include/nix/util/source-path.hh index 119a67016..c0cba0241 100644 --- a/src/libutil/include/nix/source-path.hh +++ b/src/libutil/include/nix/util/source-path.hh @@ -5,10 +5,10 @@ * @brief SourcePath */ -#include "nix/ref.hh" -#include "nix/canon-path.hh" -#include "nix/source-accessor.hh" -#include "nix/std-hash.hh" +#include "nix/util/ref.hh" +#include "nix/util/canon-path.hh" +#include "nix/util/source-accessor.hh" +#include "nix/util/std-hash.hh" namespace nix { diff --git a/src/libutil/include/nix/split.hh b/src/libutil/include/nix/util/split.hh similarity index 97% rename from src/libutil/include/nix/split.hh rename to src/libutil/include/nix/util/split.hh index 2d7c490b1..24a73fea8 100644 --- a/src/libutil/include/nix/split.hh +++ b/src/libutil/include/nix/util/split.hh @@ -4,7 +4,7 @@ #include #include -#include "nix/util.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/include/nix/std-hash.hh b/src/libutil/include/nix/util/std-hash.hh similarity index 100% rename from src/libutil/include/nix/std-hash.hh rename to src/libutil/include/nix/util/std-hash.hh diff --git a/src/libutil/include/nix/strings-inline.hh b/src/libutil/include/nix/util/strings-inline.hh similarity index 98% rename from src/libutil/include/nix/strings-inline.hh rename to src/libutil/include/nix/util/strings-inline.hh index 38cf285e0..d99b686fc 100644 --- a/src/libutil/include/nix/strings-inline.hh +++ b/src/libutil/include/nix/util/strings-inline.hh @@ -1,6 +1,6 @@ #pragma once -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libutil/include/nix/strings.hh b/src/libutil/include/nix/util/strings.hh similarity index 100% rename from src/libutil/include/nix/strings.hh rename to src/libutil/include/nix/util/strings.hh diff --git a/src/libutil/include/nix/suggestions.hh b/src/libutil/include/nix/util/suggestions.hh similarity index 98% rename from src/libutil/include/nix/suggestions.hh rename to src/libutil/include/nix/util/suggestions.hh index 5517c20a6..16496379c 100644 --- a/src/libutil/include/nix/suggestions.hh +++ b/src/libutil/include/nix/util/suggestions.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" #include namespace nix { diff --git a/src/libutil/include/nix/sync.hh b/src/libutil/include/nix/util/sync.hh similarity index 99% rename from src/libutil/include/nix/sync.hh rename to src/libutil/include/nix/util/sync.hh index 25c062ac8..0c3e1f528 100644 --- a/src/libutil/include/nix/sync.hh +++ b/src/libutil/include/nix/util/sync.hh @@ -7,7 +7,7 @@ #include #include -#include "nix/error.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/include/nix/tarfile.hh b/src/libutil/include/nix/util/tarfile.hh similarity index 95% rename from src/libutil/include/nix/tarfile.hh rename to src/libutil/include/nix/util/tarfile.hh index aea91f90e..2005d13ca 100644 --- a/src/libutil/include/nix/tarfile.hh +++ b/src/libutil/include/nix/util/tarfile.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/serialise.hh" -#include "nix/fs-sink.hh" +#include "nix/util/serialise.hh" +#include "nix/util/fs-sink.hh" #include namespace nix { diff --git a/src/libutil/include/nix/terminal.hh b/src/libutil/include/nix/util/terminal.hh similarity index 100% rename from src/libutil/include/nix/terminal.hh rename to src/libutil/include/nix/util/terminal.hh diff --git a/src/libutil/include/nix/thread-pool.hh b/src/libutil/include/nix/util/thread-pool.hh similarity index 98% rename from src/libutil/include/nix/thread-pool.hh rename to src/libutil/include/nix/util/thread-pool.hh index e3b2a29b9..92009e396 100644 --- a/src/libutil/include/nix/thread-pool.hh +++ b/src/libutil/include/nix/util/thread-pool.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/error.hh" -#include "nix/sync.hh" +#include "nix/util/error.hh" +#include "nix/util/sync.hh" #include #include diff --git a/src/libutil/include/nix/topo-sort.hh b/src/libutil/include/nix/util/topo-sort.hh similarity index 97% rename from src/libutil/include/nix/topo-sort.hh rename to src/libutil/include/nix/util/topo-sort.hh index ed37ca01e..77a9ce421 100644 --- a/src/libutil/include/nix/topo-sort.hh +++ b/src/libutil/include/nix/util/topo-sort.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/error.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/include/nix/types.hh b/src/libutil/include/nix/util/types.hh similarity index 100% rename from src/libutil/include/nix/types.hh rename to src/libutil/include/nix/util/types.hh diff --git a/src/libutil/include/nix/unix-domain-socket.hh b/src/libutil/include/nix/util/unix-domain-socket.hh similarity index 95% rename from src/libutil/include/nix/unix-domain-socket.hh rename to src/libutil/include/nix/util/unix-domain-socket.hh index 87508f9e4..704999ec1 100644 --- a/src/libutil/include/nix/unix-domain-socket.hh +++ b/src/libutil/include/nix/util/unix-domain-socket.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/file-descriptor.hh" +#include "nix/util/types.hh" +#include "nix/util/file-descriptor.hh" #ifdef _WIN32 # include diff --git a/src/libutil/include/nix/url-parts.hh b/src/libutil/include/nix/util/url-parts.hh similarity index 100% rename from src/libutil/include/nix/url-parts.hh rename to src/libutil/include/nix/util/url-parts.hh diff --git a/src/libutil/include/nix/url.hh b/src/libutil/include/nix/util/url.hh similarity index 98% rename from src/libutil/include/nix/url.hh rename to src/libutil/include/nix/util/url.hh index 071d5092f..ced846787 100644 --- a/src/libutil/include/nix/url.hh +++ b/src/libutil/include/nix/util/url.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/error.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/include/nix/users.hh b/src/libutil/include/nix/util/users.hh similarity index 97% rename from src/libutil/include/nix/users.hh rename to src/libutil/include/nix/util/users.hh index d48b8b9bf..1d467173c 100644 --- a/src/libutil/include/nix/users.hh +++ b/src/libutil/include/nix/util/users.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" #ifndef _WIN32 # include diff --git a/src/libutil/include/nix/util.hh b/src/libutil/include/nix/util/util.hh similarity index 98% rename from src/libutil/include/nix/util.hh rename to src/libutil/include/nix/util/util.hh index 7ece2bd7b..5a4530798 100644 --- a/src/libutil/include/nix/util.hh +++ b/src/libutil/include/nix/util/util.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "nix/types.hh" -#include "nix/error.hh" -#include "nix/logging.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/logging.hh" #include @@ -11,7 +11,7 @@ #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/libutil/include/nix/variant-wrapper.hh b/src/libutil/include/nix/util/variant-wrapper.hh similarity index 100% rename from src/libutil/include/nix/variant-wrapper.hh rename to src/libutil/include/nix/util/variant-wrapper.hh diff --git a/src/libutil/include/nix/xml-writer.hh b/src/libutil/include/nix/util/xml-writer.hh similarity index 100% rename from src/libutil/include/nix/xml-writer.hh rename to src/libutil/include/nix/util/xml-writer.hh diff --git a/src/libutil/json-utils.cc b/src/libutil/json-utils.cc index aff8abb9a..2c8edfce8 100644 --- a/src/libutil/json-utils.cc +++ b/src/libutil/json-utils.cc @@ -1,6 +1,6 @@ -#include "nix/json-utils.hh" -#include "nix/error.hh" -#include "nix/types.hh" +#include "nix/util/json-utils.hh" +#include "nix/util/error.hh" +#include "nix/util/types.hh" #include #include #include diff --git a/src/libutil/linux/cgroup.cc b/src/libutil/linux/cgroup.cc index 7b3c3fa3b..890797c91 100644 --- a/src/libutil/linux/cgroup.cc +++ b/src/libutil/linux/cgroup.cc @@ -1,8 +1,8 @@ -#include "nix/cgroup.hh" -#include "nix/signals.hh" -#include "nix/util.hh" -#include "nix/file-system.hh" -#include "nix/finally.hh" +#include "nix/util/cgroup.hh" +#include "nix/util/signals.hh" +#include "nix/util/util.hh" +#include "nix/util/file-system.hh" +#include "nix/util/finally.hh" #include #include diff --git a/src/libutil/linux/include/nix/cgroup.hh b/src/libutil/linux/include/nix/util/cgroup.hh similarity index 96% rename from src/libutil/linux/include/nix/cgroup.hh rename to src/libutil/linux/include/nix/util/cgroup.hh index 91c7de9d1..6a41c6b44 100644 --- a/src/libutil/linux/include/nix/cgroup.hh +++ b/src/libutil/linux/include/nix/util/cgroup.hh @@ -4,7 +4,7 @@ #include #include -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/linux/include/nix/meson.build b/src/libutil/linux/include/nix/util/meson.build similarity index 64% rename from src/libutil/linux/include/nix/meson.build rename to src/libutil/linux/include/nix/util/meson.build index 285c1489b..9587aa916 100644 --- a/src/libutil/linux/include/nix/meson.build +++ b/src/libutil/linux/include/nix/util/meson.build @@ -1,6 +1,6 @@ # Public headers directory -include_dirs += include_directories('..') +include_dirs += include_directories('../..') headers += files( 'cgroup.hh', diff --git a/src/libutil/linux/include/nix/namespaces.hh b/src/libutil/linux/include/nix/util/namespaces.hh similarity index 95% rename from src/libutil/linux/include/nix/namespaces.hh rename to src/libutil/linux/include/nix/util/namespaces.hh index 3eb5f6a14..59db745d3 100644 --- a/src/libutil/linux/include/nix/namespaces.hh +++ b/src/libutil/linux/include/nix/util/namespaces.hh @@ -3,7 +3,7 @@ #include -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/linux/meson.build b/src/libutil/linux/meson.build index 40907ed0d..bfda8b1a6 100644 --- a/src/libutil/linux/meson.build +++ b/src/libutil/linux/meson.build @@ -3,4 +3,4 @@ sources += files( 'namespaces.cc', ) -subdir('include/nix') +subdir('include/nix/util') diff --git a/src/libutil/linux/namespaces.cc b/src/libutil/linux/namespaces.cc index a53734a2f..405866c0b 100644 --- a/src/libutil/linux/namespaces.cc +++ b/src/libutil/linux/namespaces.cc @@ -1,13 +1,13 @@ -#include "nix/current-process.hh" -#include "nix/util.hh" -#include "nix/finally.hh" -#include "nix/file-system.hh" -#include "nix/processes.hh" -#include "nix/signals.hh" +#include "nix/util/current-process.hh" +#include "nix/util/util.hh" +#include "nix/util/finally.hh" +#include "nix/util/file-system.hh" +#include "nix/util/processes.hh" +#include "nix/util/signals.hh" #include #include -#include "nix/cgroup.hh" +#include "nix/util/cgroup.hh" #include diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc index 0411a039d..1d0d3fa2d 100644 --- a/src/libutil/logging.cc +++ b/src/libutil/logging.cc @@ -1,12 +1,12 @@ -#include "nix/logging.hh" -#include "nix/file-descriptor.hh" -#include "nix/environment-variables.hh" -#include "nix/terminal.hh" -#include "nix/util.hh" -#include "nix/config-global.hh" -#include "nix/source-path.hh" -#include "nix/position.hh" -#include "nix/sync.hh" +#include "nix/util/logging.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/terminal.hh" +#include "nix/util/util.hh" +#include "nix/util/config-global.hh" +#include "nix/util/source-path.hh" +#include "nix/util/position.hh" +#include "nix/util/sync.hh" #include #include diff --git a/src/libutil/memory-source-accessor.cc b/src/libutil/memory-source-accessor.cc index 7c8414fb0..7764ff946 100644 --- a/src/libutil/memory-source-accessor.cc +++ b/src/libutil/memory-source-accessor.cc @@ -1,4 +1,4 @@ -#include "nix/memory-source-accessor.hh" +#include "nix/util/memory-source-accessor.hh" namespace nix { diff --git a/src/libutil/meson.build b/src/libutil/meson.build index ecc9da25d..e9fb73d39 100644 --- a/src/libutil/meson.build +++ b/src/libutil/meson.build @@ -113,7 +113,7 @@ sources = [config_priv_h] + files( 'canon-path.cc', 'compression.cc', 'compute-levels.cc', - 'config.cc', + 'configuration.cc', 'config-global.cc', 'current-process.cc', 'english.cc', @@ -155,7 +155,7 @@ sources = [config_priv_h] + files( 'xml-writer.cc', ) -subdir('include/nix') +subdir('include/nix/util') if not cxx.has_header('widechar_width.h', required : false) # use vendored widechar_width.h @@ -185,7 +185,7 @@ this_library = library( install : true, ) -install_headers(headers, subdir : 'nix', preserve_path : true) +install_headers(headers, subdir : 'nix/util', preserve_path : true) libraries_private = [] if host_machine.system() == 'windows' diff --git a/src/libutil/mounted-source-accessor.cc b/src/libutil/mounted-source-accessor.cc index aa00cbd8e..b7de2afbf 100644 --- a/src/libutil/mounted-source-accessor.cc +++ b/src/libutil/mounted-source-accessor.cc @@ -1,4 +1,4 @@ -#include "nix/source-accessor.hh" +#include "nix/util/source-accessor.hh" namespace nix { diff --git a/src/libutil/package.nix b/src/libutil/package.nix index 0c410dfab..17c84ff18 100644 --- a/src/libutil/package.nix +++ b/src/libutil/package.nix @@ -34,13 +34,13 @@ mkMesonLibrary (finalAttrs: { ./widecharwidth ./meson.build ./meson.options - ./include/nix/meson.build + ./include/nix/util/meson.build ./linux/meson.build - ./linux/include/nix/meson.build + ./linux/include/nix/util/meson.build ./unix/meson.build - ./unix/include/nix/meson.build + ./unix/include/nix/util/meson.build ./windows/meson.build - ./windows/include/nix/meson.build + ./windows/include/nix/util/meson.build (fileset.fileFilter (file: file.hasExt "cc") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.) ]; diff --git a/src/libutil/pos-table.cc b/src/libutil/pos-table.cc index 59234e3fc..5a61ffbc5 100644 --- a/src/libutil/pos-table.cc +++ b/src/libutil/pos-table.cc @@ -1,4 +1,4 @@ -#include "nix/pos-table.hh" +#include "nix/util/pos-table.hh" #include diff --git a/src/libutil/position.cc b/src/libutil/position.cc index 515be245b..dfe0e2abb 100644 --- a/src/libutil/position.cc +++ b/src/libutil/position.cc @@ -1,4 +1,4 @@ -#include "nix/position.hh" +#include "nix/util/position.hh" namespace nix { diff --git a/src/libutil/posix-source-accessor.cc b/src/libutil/posix-source-accessor.cc index 5da9fa623..5c7b4654b 100644 --- a/src/libutil/posix-source-accessor.cc +++ b/src/libutil/posix-source-accessor.cc @@ -1,7 +1,7 @@ -#include "nix/posix-source-accessor.hh" -#include "nix/source-path.hh" -#include "nix/signals.hh" -#include "nix/sync.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/util/source-path.hh" +#include "nix/util/signals.hh" +#include "nix/util/sync.hh" #include diff --git a/src/libutil/references.cc b/src/libutil/references.cc index 46c22c09c..66ad9d37c 100644 --- a/src/libutil/references.cc +++ b/src/libutil/references.cc @@ -1,6 +1,6 @@ -#include "nix/references.hh" -#include "nix/hash.hh" -#include "nix/archive.hh" +#include "nix/util/references.hh" +#include "nix/util/hash.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc index 415ccf3a0..55397c6d4 100644 --- a/src/libutil/serialise.cc +++ b/src/libutil/serialise.cc @@ -1,6 +1,6 @@ -#include "nix/serialise.hh" -#include "nix/signals.hh" -#include "nix/util.hh" +#include "nix/util/serialise.hh" +#include "nix/util/signals.hh" +#include "nix/util/util.hh" #include #include @@ -11,7 +11,7 @@ #ifdef _WIN32 # include # include -# include "nix/windows-error.hh" +# include "nix/util/windows-error.hh" #else # include #endif diff --git a/src/libutil/signature/local-keys.cc b/src/libutil/signature/local-keys.cc index 86d3dfe3c..1f7f2c7de 100644 --- a/src/libutil/signature/local-keys.cc +++ b/src/libutil/signature/local-keys.cc @@ -1,7 +1,7 @@ -#include "nix/signature/local-keys.hh" +#include "nix/util/signature/local-keys.hh" -#include "nix/file-system.hh" -#include "nix/util.hh" +#include "nix/util/file-system.hh" +#include "nix/util/util.hh" #include namespace nix { diff --git a/src/libutil/signature/signer.cc b/src/libutil/signature/signer.cc index 4a61b67eb..46445e9e9 100644 --- a/src/libutil/signature/signer.cc +++ b/src/libutil/signature/signer.cc @@ -1,5 +1,5 @@ -#include "nix/signature/signer.hh" -#include "nix/error.hh" +#include "nix/util/signature/signer.hh" +#include "nix/util/error.hh" #include diff --git a/src/libutil/source-accessor.cc b/src/libutil/source-accessor.cc index 738d7f2f1..fc0d6cff1 100644 --- a/src/libutil/source-accessor.cc +++ b/src/libutil/source-accessor.cc @@ -1,5 +1,5 @@ -#include "nix/source-accessor.hh" -#include "nix/archive.hh" +#include "nix/util/source-accessor.hh" +#include "nix/util/archive.hh" namespace nix { diff --git a/src/libutil/source-path.cc b/src/libutil/source-path.cc index 12150c223..6d42fa95f 100644 --- a/src/libutil/source-path.cc +++ b/src/libutil/source-path.cc @@ -1,4 +1,4 @@ -#include "nix/source-path.hh" +#include "nix/util/source-path.hh" namespace nix { diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc index 43c9a0815..7ce37d73c 100644 --- a/src/libutil/strings.cc +++ b/src/libutil/strings.cc @@ -2,9 +2,9 @@ #include #include -#include "nix/strings-inline.hh" -#include "nix/os-string.hh" -#include "nix/error.hh" +#include "nix/util/strings-inline.hh" +#include "nix/util/os-string.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/suggestions.cc b/src/libutil/suggestions.cc index 0f593ada0..0105c30e7 100644 --- a/src/libutil/suggestions.cc +++ b/src/libutil/suggestions.cc @@ -1,6 +1,6 @@ -#include "nix/suggestions.hh" -#include "nix/ansicolor.hh" -#include "nix/terminal.hh" +#include "nix/util/suggestions.hh" +#include "nix/util/ansicolor.hh" +#include "nix/util/terminal.hh" #include #include diff --git a/src/libutil/tarfile.cc b/src/libutil/tarfile.cc index aec05e092..eb5cd8288 100644 --- a/src/libutil/tarfile.cc +++ b/src/libutil/tarfile.cc @@ -1,10 +1,10 @@ #include #include -#include "nix/finally.hh" -#include "nix/serialise.hh" -#include "nix/tarfile.hh" -#include "nix/file-system.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" +#include "nix/util/tarfile.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libutil/terminal.cc b/src/libutil/terminal.cc index 233edabb4..77766fae1 100644 --- a/src/libutil/terminal.cc +++ b/src/libutil/terminal.cc @@ -1,6 +1,6 @@ -#include "nix/terminal.hh" -#include "nix/environment-variables.hh" -#include "nix/sync.hh" +#include "nix/util/terminal.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/sync.hh" #if _WIN32 # include diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc index 6b7f2d017..8958bc550 100644 --- a/src/libutil/thread-pool.cc +++ b/src/libutil/thread-pool.cc @@ -1,6 +1,6 @@ -#include "nix/thread-pool.hh" -#include "nix/signals.hh" -#include "nix/util.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/signals.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/union-source-accessor.cc b/src/libutil/union-source-accessor.cc index e24d6f2bd..9950f6049 100644 --- a/src/libutil/union-source-accessor.cc +++ b/src/libutil/union-source-accessor.cc @@ -1,4 +1,4 @@ -#include "nix/source-accessor.hh" +#include "nix/util/source-accessor.hh" namespace nix { diff --git a/src/libutil/unix-domain-socket.cc b/src/libutil/unix-domain-socket.cc index 831dd666c..8722c8f05 100644 --- a/src/libutil/unix-domain-socket.cc +++ b/src/libutil/unix-domain-socket.cc @@ -1,6 +1,6 @@ -#include "nix/file-system.hh" -#include "nix/unix-domain-socket.hh" -#include "nix/util.hh" +#include "nix/util/file-system.hh" +#include "nix/util/unix-domain-socket.hh" +#include "nix/util/util.hh" #ifdef _WIN32 # include @@ -8,7 +8,7 @@ #else # include # include -# include "nix/processes.hh" +# include "nix/util/processes.hh" #endif #include diff --git a/src/libutil/unix/environment-variables.cc b/src/libutil/unix/environment-variables.cc index 9814cbcc2..0e1ed2794 100644 --- a/src/libutil/unix/environment-variables.cc +++ b/src/libutil/unix/environment-variables.cc @@ -1,6 +1,6 @@ #include -#include "nix/environment-variables.hh" +#include "nix/util/environment-variables.hh" namespace nix { diff --git a/src/libutil/unix/file-descriptor.cc b/src/libutil/unix/file-descriptor.cc index 2911df54f..6ce307252 100644 --- a/src/libutil/unix/file-descriptor.cc +++ b/src/libutil/unix/file-descriptor.cc @@ -1,7 +1,7 @@ -#include "nix/file-system.hh" -#include "nix/signals.hh" -#include "nix/finally.hh" -#include "nix/serialise.hh" +#include "nix/util/file-system.hh" +#include "nix/util/signals.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" #include #include diff --git a/src/libutil/unix/file-path.cc b/src/libutil/unix/file-path.cc index 3dd613972..0fb1f468c 100644 --- a/src/libutil/unix/file-path.cc +++ b/src/libutil/unix/file-path.cc @@ -3,8 +3,8 @@ #include #include -#include "nix/file-path.hh" -#include "nix/util.hh" +#include "nix/util/file-path.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/unix/file-system.cc b/src/libutil/unix/file-system.cc index d79f4c64c..e62b7d1c2 100644 --- a/src/libutil/unix/file-system.cc +++ b/src/libutil/unix/file-system.cc @@ -8,7 +8,7 @@ #include #include -#include "nix/file-system.hh" +#include "nix/util/file-system.hh" #include "util-unix-config-private.hh" diff --git a/src/libutil/unix/include/nix/meson.build b/src/libutil/unix/include/nix/util/meson.build similarity index 66% rename from src/libutil/unix/include/nix/meson.build rename to src/libutil/unix/include/nix/util/meson.build index 5f3095ab1..b6f1c40d3 100644 --- a/src/libutil/unix/include/nix/meson.build +++ b/src/libutil/unix/include/nix/util/meson.build @@ -1,6 +1,6 @@ # Public headers directory -include_dirs += include_directories('..') +include_dirs += include_directories('../..') headers += files( 'monitor-fd.hh', diff --git a/src/libutil/unix/include/nix/monitor-fd.hh b/src/libutil/unix/include/nix/util/monitor-fd.hh similarity index 99% rename from src/libutil/unix/include/nix/monitor-fd.hh rename to src/libutil/unix/include/nix/util/monitor-fd.hh index 720cbb937..c10ad96bd 100644 --- a/src/libutil/unix/include/nix/monitor-fd.hh +++ b/src/libutil/unix/include/nix/util/monitor-fd.hh @@ -10,7 +10,7 @@ #include #include -#include "nix/signals.hh" +#include "nix/util/signals.hh" namespace nix { diff --git a/src/libutil/unix/include/nix/signals-impl.hh b/src/libutil/unix/include/nix/util/signals-impl.hh similarity index 94% rename from src/libutil/unix/include/nix/signals-impl.hh rename to src/libutil/unix/include/nix/util/signals-impl.hh index a63e03725..ffa967344 100644 --- a/src/libutil/unix/include/nix/signals-impl.hh +++ b/src/libutil/unix/include/nix/util/signals-impl.hh @@ -10,11 +10,11 @@ * downstream code.) */ -#include "nix/types.hh" -#include "nix/error.hh" -#include "nix/logging.hh" -#include "nix/ansicolor.hh" -#include "nix/signals.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/logging.hh" +#include "nix/util/ansicolor.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libutil/unix/meson.build b/src/libutil/unix/meson.build index ee0c19aff..ea2391d05 100644 --- a/src/libutil/unix/meson.build +++ b/src/libutil/unix/meson.build @@ -60,4 +60,4 @@ sources += files( 'users.cc', ) -subdir('include/nix') +subdir('include/nix/util') diff --git a/src/libutil/unix/muxable-pipe.cc b/src/libutil/unix/muxable-pipe.cc index e81f47bc0..57bcdb0ad 100644 --- a/src/libutil/unix/muxable-pipe.cc +++ b/src/libutil/unix/muxable-pipe.cc @@ -1,8 +1,8 @@ #include -#include "nix/logging.hh" -#include "nix/util.hh" -#include "nix/muxable-pipe.hh" +#include "nix/util/logging.hh" +#include "nix/util/util.hh" +#include "nix/util/muxable-pipe.hh" namespace nix { diff --git a/src/libutil/unix/os-string.cc b/src/libutil/unix/os-string.cc index e97308a4a..1a2be1554 100644 --- a/src/libutil/unix/os-string.cc +++ b/src/libutil/unix/os-string.cc @@ -3,8 +3,8 @@ #include #include -#include "nix/file-path.hh" -#include "nix/util.hh" +#include "nix/util/file-path.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/unix/processes.cc b/src/libutil/unix/processes.cc index 06beacb87..c436076ee 100644 --- a/src/libutil/unix/processes.cc +++ b/src/libutil/unix/processes.cc @@ -1,10 +1,10 @@ -#include "nix/current-process.hh" -#include "nix/environment-variables.hh" -#include "nix/executable-path.hh" -#include "nix/signals.hh" -#include "nix/processes.hh" -#include "nix/finally.hh" -#include "nix/serialise.hh" +#include "nix/util/current-process.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/executable-path.hh" +#include "nix/util/signals.hh" +#include "nix/util/processes.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" #include #include diff --git a/src/libutil/unix/signals.cc b/src/libutil/unix/signals.cc index 168b33bfb..f1cb28527 100644 --- a/src/libutil/unix/signals.cc +++ b/src/libutil/unix/signals.cc @@ -1,8 +1,8 @@ -#include "nix/signals.hh" -#include "nix/util.hh" -#include "nix/error.hh" -#include "nix/sync.hh" -#include "nix/terminal.hh" +#include "nix/util/signals.hh" +#include "nix/util/util.hh" +#include "nix/util/error.hh" +#include "nix/util/sync.hh" +#include "nix/util/terminal.hh" #include diff --git a/src/libutil/unix/users.cc b/src/libutil/unix/users.cc index 1ba194d71..18df7fdf2 100644 --- a/src/libutil/unix/users.cc +++ b/src/libutil/unix/users.cc @@ -1,7 +1,7 @@ -#include "nix/util.hh" -#include "nix/users.hh" -#include "nix/environment-variables.hh" -#include "nix/file-system.hh" +#include "nix/util/util.hh" +#include "nix/util/users.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/file-system.hh" #include #include diff --git a/src/libutil/url.cc b/src/libutil/url.cc index f042d3b0f..eaa2b0682 100644 --- a/src/libutil/url.cc +++ b/src/libutil/url.cc @@ -1,8 +1,8 @@ -#include "nix/url.hh" -#include "nix/url-parts.hh" -#include "nix/util.hh" -#include "nix/split.hh" -#include "nix/canon-path.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" +#include "nix/util/util.hh" +#include "nix/util/split.hh" +#include "nix/util/canon-path.hh" namespace nix { diff --git a/src/libutil/users.cc b/src/libutil/users.cc index d4fb08ab5..5a5d740c6 100644 --- a/src/libutil/users.cc +++ b/src/libutil/users.cc @@ -1,7 +1,7 @@ -#include "nix/util.hh" -#include "nix/users.hh" -#include "nix/environment-variables.hh" -#include "nix/file-system.hh" +#include "nix/util/util.hh" +#include "nix/util/users.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/file-system.hh" namespace nix { diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 37f30d91f..ffd85ffbb 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -1,7 +1,7 @@ -#include "nix/util.hh" -#include "nix/fmt.hh" -#include "nix/file-path.hh" -#include "nix/signals.hh" +#include "nix/util/util.hh" +#include "nix/util/fmt.hh" +#include "nix/util/file-path.hh" +#include "nix/util/signals.hh" #include #include diff --git a/src/libutil/windows/environment-variables.cc b/src/libutil/windows/environment-variables.cc index e1f41f8d2..d7cc7b488 100644 --- a/src/libutil/windows/environment-variables.cc +++ b/src/libutil/windows/environment-variables.cc @@ -1,4 +1,4 @@ -#include "nix/environment-variables.hh" +#include "nix/util/environment-variables.hh" #ifdef _WIN32 # include "processenv.h" diff --git a/src/libutil/windows/file-descriptor.cc b/src/libutil/windows/file-descriptor.cc index 7f77cae89..f451bc0d3 100644 --- a/src/libutil/windows/file-descriptor.cc +++ b/src/libutil/windows/file-descriptor.cc @@ -1,9 +1,9 @@ -#include "nix/file-system.hh" -#include "nix/signals.hh" -#include "nix/finally.hh" -#include "nix/serialise.hh" -#include "nix/windows-error.hh" -#include "nix/file-path.hh" +#include "nix/util/file-system.hh" +#include "nix/util/signals.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" +#include "nix/util/windows-error.hh" +#include "nix/util/file-path.hh" #ifdef _WIN32 #include diff --git a/src/libutil/windows/file-path.cc b/src/libutil/windows/file-path.cc index 5079bcbcd..03cc5afe5 100644 --- a/src/libutil/windows/file-path.cc +++ b/src/libutil/windows/file-path.cc @@ -3,9 +3,9 @@ #include #include -#include "nix/file-path.hh" -#include "nix/file-path-impl.hh" -#include "nix/util.hh" +#include "nix/util/file-path.hh" +#include "nix/util/file-path-impl.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/windows/file-system.cc b/src/libutil/windows/file-system.cc index 3c2a57bcd..1dac7e754 100644 --- a/src/libutil/windows/file-system.cc +++ b/src/libutil/windows/file-system.cc @@ -1,4 +1,4 @@ -#include "nix/file-system.hh" +#include "nix/util/file-system.hh" #ifdef _WIN32 namespace nix { diff --git a/src/libutil/windows/include/nix/meson.build b/src/libutil/windows/include/nix/util/meson.build similarity index 72% rename from src/libutil/windows/include/nix/meson.build rename to src/libutil/windows/include/nix/util/meson.build index 898b7db89..1bd56c4bd 100644 --- a/src/libutil/windows/include/nix/meson.build +++ b/src/libutil/windows/include/nix/util/meson.build @@ -1,6 +1,6 @@ # Public headers directory -include_dirs += include_directories('..') +include_dirs += include_directories('../..') headers += files( 'signals-impl.hh', diff --git a/src/libutil/windows/include/nix/signals-impl.hh b/src/libutil/windows/include/nix/util/signals-impl.hh similarity index 94% rename from src/libutil/windows/include/nix/signals-impl.hh rename to src/libutil/windows/include/nix/util/signals-impl.hh index fcdf18276..043f39100 100644 --- a/src/libutil/windows/include/nix/signals-impl.hh +++ b/src/libutil/windows/include/nix/util/signals-impl.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/windows/include/nix/windows-async-pipe.hh b/src/libutil/windows/include/nix/util/windows-async-pipe.hh similarity index 92% rename from src/libutil/windows/include/nix/windows-async-pipe.hh rename to src/libutil/windows/include/nix/util/windows-async-pipe.hh index 55f6ea31d..5bb0c3518 100644 --- a/src/libutil/windows/include/nix/windows-async-pipe.hh +++ b/src/libutil/windows/include/nix/util/windows-async-pipe.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/file-descriptor.hh" +#include "nix/util/file-descriptor.hh" #ifdef _WIN32 namespace nix::windows { diff --git a/src/libutil/windows/include/nix/windows-error.hh b/src/libutil/windows/include/nix/util/windows-error.hh similarity index 97% rename from src/libutil/windows/include/nix/windows-error.hh rename to src/libutil/windows/include/nix/util/windows-error.hh index c07d61609..abf979c6b 100644 --- a/src/libutil/windows/include/nix/windows-error.hh +++ b/src/libutil/windows/include/nix/util/windows-error.hh @@ -4,7 +4,7 @@ #ifdef _WIN32 #include -#include "nix/error.hh" +#include "nix/util/error.hh" namespace nix::windows { diff --git a/src/libutil/windows/meson.build b/src/libutil/windows/meson.build index 2423c77ea..0c1cec49c 100644 --- a/src/libutil/windows/meson.build +++ b/src/libutil/windows/meson.build @@ -11,4 +11,4 @@ sources += files( 'windows-error.cc', ) -subdir('include/nix') +subdir('include/nix/util') diff --git a/src/libutil/windows/muxable-pipe.cc b/src/libutil/windows/muxable-pipe.cc index d9a3e2ca5..82ef40665 100644 --- a/src/libutil/windows/muxable-pipe.cc +++ b/src/libutil/windows/muxable-pipe.cc @@ -1,10 +1,10 @@ #ifdef _WIN32 # include -# include "nix/windows-error.hh" +# include "nix/util/windows-error.hh" -# include "nix/logging.hh" -# include "nix/util.hh" -# include "nix/muxable-pipe.hh" +# include "nix/util/logging.hh" +# include "nix/util/util.hh" +# include "nix/util/muxable-pipe.hh" namespace nix { diff --git a/src/libutil/windows/os-string.cc b/src/libutil/windows/os-string.cc index b9aff210b..8c8a27a9f 100644 --- a/src/libutil/windows/os-string.cc +++ b/src/libutil/windows/os-string.cc @@ -3,9 +3,9 @@ #include #include -#include "nix/file-path.hh" -#include "nix/file-path-impl.hh" -#include "nix/util.hh" +#include "nix/util/file-path.hh" +#include "nix/util/file-path-impl.hh" +#include "nix/util/util.hh" #ifdef _WIN32 diff --git a/src/libutil/windows/processes.cc b/src/libutil/windows/processes.cc index cdb659a79..099dff31b 100644 --- a/src/libutil/windows/processes.cc +++ b/src/libutil/windows/processes.cc @@ -1,16 +1,16 @@ -#include "nix/current-process.hh" -#include "nix/environment-variables.hh" -#include "nix/error.hh" -#include "nix/executable-path.hh" -#include "nix/file-descriptor.hh" -#include "nix/file-path.hh" -#include "nix/signals.hh" -#include "nix/processes.hh" -#include "nix/finally.hh" -#include "nix/serialise.hh" -#include "nix/file-system.hh" -#include "nix/util.hh" -#include "nix/windows-error.hh" +#include "nix/util/current-process.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/error.hh" +#include "nix/util/executable-path.hh" +#include "nix/util/file-descriptor.hh" +#include "nix/util/file-path.hh" +#include "nix/util/signals.hh" +#include "nix/util/processes.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" +#include "nix/util/file-system.hh" +#include "nix/util/util.hh" +#include "nix/util/windows-error.hh" #include #include diff --git a/src/libutil/windows/users.cc b/src/libutil/windows/users.cc index 1d49e667b..90da0281f 100644 --- a/src/libutil/windows/users.cc +++ b/src/libutil/windows/users.cc @@ -1,8 +1,8 @@ -#include "nix/util.hh" -#include "nix/users.hh" -#include "nix/environment-variables.hh" -#include "nix/file-system.hh" -#include "nix/windows-error.hh" +#include "nix/util/util.hh" +#include "nix/util/users.hh" +#include "nix/util/environment-variables.hh" +#include "nix/util/file-system.hh" +#include "nix/util/windows-error.hh" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/src/libutil/windows/windows-async-pipe.cc b/src/libutil/windows/windows-async-pipe.cc index 77ccd9e3f..d47930a1b 100644 --- a/src/libutil/windows/windows-async-pipe.cc +++ b/src/libutil/windows/windows-async-pipe.cc @@ -1,5 +1,5 @@ -#include "nix/windows-async-pipe.hh" -#include "nix/windows-error.hh" +#include "nix/util/windows-async-pipe.hh" +#include "nix/util/windows-error.hh" #ifdef _WIN32 diff --git a/src/libutil/windows/windows-error.cc b/src/libutil/windows/windows-error.cc index 8c523e403..1e7aff830 100644 --- a/src/libutil/windows/windows-error.cc +++ b/src/libutil/windows/windows-error.cc @@ -1,4 +1,4 @@ -#include "nix/windows-error.hh" +#include "nix/util/windows-error.hh" #ifdef _WIN32 #include diff --git a/src/libutil/xml-writer.cc b/src/libutil/xml-writer.cc index 78a40ef64..e460dd169 100644 --- a/src/libutil/xml-writer.cc +++ b/src/libutil/xml-writer.cc @@ -1,6 +1,6 @@ #include -#include "nix/xml-writer.hh" +#include "nix/util/xml-writer.hh" namespace nix { diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index 065a3b3e8..45f891808 100644 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -9,25 +9,25 @@ #include -#include "nix/current-process.hh" -#include "nix/parsed-derivations.hh" -#include "nix/derivation-options.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/globals.hh" -#include "nix/realisation.hh" -#include "nix/derivations.hh" -#include "nix/shared.hh" -#include "nix/path-with-outputs.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/get-drvs.hh" -#include "nix/common-eval-args.hh" -#include "nix/attr-path.hh" -#include "nix/legacy.hh" -#include "nix/users.hh" -#include "nix/network-proxy.hh" -#include "nix/compatibility-settings.hh" +#include "nix/util/current-process.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/store/derivation-options.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/realisation.hh" +#include "nix/store/derivations.hh" +#include "nix/main/shared.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/legacy.hh" +#include "nix/util/users.hh" +#include "nix/cmd/network-proxy.hh" +#include "nix/cmd/compatibility-settings.hh" #include "man-pages.hh" using namespace nix; diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 33efb8918..c0baa4aa2 100644 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -1,12 +1,12 @@ -#include "nix/profiles.hh" -#include "nix/shared.hh" -#include "nix/globals.hh" -#include "nix/filetransfer.hh" -#include "nix/store-api.hh" -#include "nix/legacy.hh" -#include "nix/eval-settings.hh" // for defexpr -#include "nix/users.hh" -#include "nix/tarball.hh" +#include "nix/store/profiles.hh" +#include "nix/main/shared.hh" +#include "nix/store/globals.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/store-api.hh" +#include "nix/cmd/legacy.hh" +#include "nix/expr/eval-settings.hh" // for defexpr +#include "nix/util/users.hh" +#include "nix/fetchers/tarball.hh" #include "self-exe.hh" #include "man-pages.hh" diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/src/nix-collect-garbage/nix-collect-garbage.cc index c6f996f20..3a84d97aa 100644 --- a/src/nix-collect-garbage/nix-collect-garbage.cc +++ b/src/nix-collect-garbage/nix-collect-garbage.cc @@ -1,12 +1,12 @@ -#include "nix/file-system.hh" -#include "nix/signals.hh" -#include "nix/store-api.hh" -#include "nix/store-cast.hh" -#include "nix/gc-store.hh" -#include "nix/profiles.hh" -#include "nix/shared.hh" -#include "nix/globals.hh" -#include "nix/legacy.hh" +#include "nix/util/file-system.hh" +#include "nix/util/signals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/profiles.hh" +#include "nix/main/shared.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/legacy.hh" #include "man-pages.hh" #include diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix-copy-closure/nix-copy-closure.cc index 8094925dc..6d0db1008 100644 --- a/src/nix-copy-closure/nix-copy-closure.cc +++ b/src/nix-copy-closure/nix-copy-closure.cc @@ -1,7 +1,7 @@ -#include "nix/shared.hh" -#include "nix/realisation.hh" -#include "nix/store-api.hh" -#include "nix/legacy.hh" +#include "nix/main/shared.hh" +#include "nix/store/realisation.hh" +#include "nix/store/store-api.hh" +#include "nix/cmd/legacy.hh" #include "man-pages.hh" using namespace nix; diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index c02c27d36..021619ada 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -1,22 +1,22 @@ -#include "nix/users.hh" -#include "nix/attr-path.hh" -#include "nix/common-eval-args.hh" -#include "nix/derivations.hh" -#include "nix/eval.hh" -#include "nix/get-drvs.hh" -#include "nix/globals.hh" -#include "nix/names.hh" -#include "nix/profiles.hh" -#include "nix/path-with-outputs.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" +#include "nix/util/users.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/store/derivations.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/store/globals.hh" +#include "nix/store/names.hh" +#include "nix/store/profiles.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "user-env.hh" -#include "nix/value-to-json.hh" -#include "nix/xml-writer.hh" -#include "nix/legacy.hh" -#include "nix/eval-settings.hh" // for defexpr -#include "nix/terminal.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/util/xml-writer.hh" +#include "nix/cmd/legacy.hh" +#include "nix/expr/eval-settings.hh" // for defexpr +#include "nix/util/terminal.hh" #include "man-pages.hh" #include diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 81abefc2f..e149b6aeb 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -1,14 +1,14 @@ #include "user-env.hh" -#include "nix/derivations.hh" -#include "nix/store-api.hh" -#include "nix/path-with-outputs.hh" -#include "nix/local-fs-store.hh" -#include "nix/globals.hh" -#include "nix/shared.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/profiles.hh" -#include "nix/print-ambiguous.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/globals.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/store/profiles.hh" +#include "nix/expr/print-ambiguous.hh" #include #include diff --git a/src/nix-env/user-env.hh b/src/nix-env/user-env.hh index 8ec124d07..0a19b8f32 100644 --- a/src/nix-env/user-env.hh +++ b/src/nix-env/user-env.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/get-drvs.hh" +#include "nix/expr/get-drvs.hh" namespace nix { diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index d4765952b..c1b6cc66a 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -1,17 +1,17 @@ -#include "nix/globals.hh" -#include "nix/print-ambiguous.hh" -#include "nix/shared.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/get-drvs.hh" -#include "nix/attr-path.hh" -#include "nix/signals.hh" -#include "nix/value-to-xml.hh" -#include "nix/value-to-json.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/common-eval-args.hh" -#include "nix/legacy.hh" +#include "nix/store/globals.hh" +#include "nix/expr/print-ambiguous.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/expr/attr-path.hh" +#include "nix/util/signals.hh" +#include "nix/expr/value-to-xml.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/cmd/legacy.hh" #include "man-pages.hh" #include diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc index 0cab46656..f8054b554 100644 --- a/src/nix-store/dotgraph.cc +++ b/src/nix-store/dotgraph.cc @@ -1,5 +1,5 @@ #include "dotgraph.hh" -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/nix-store/dotgraph.hh b/src/nix-store/dotgraph.hh index cb4041f8e..b8e0721ab 100644 --- a/src/nix-store/dotgraph.hh +++ b/src/nix-store/dotgraph.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/nix-store/graphml.cc b/src/nix-store/graphml.cc index 1eb2ccdf6..3b3188a41 100644 --- a/src/nix-store/graphml.cc +++ b/src/nix-store/graphml.cc @@ -1,6 +1,6 @@ #include "graphml.hh" -#include "nix/store-api.hh" -#include "nix/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" #include diff --git a/src/nix-store/graphml.hh b/src/nix-store/graphml.hh index 2989733d7..afcedb58e 100644 --- a/src/nix-store/graphml.hh +++ b/src/nix-store/graphml.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 7bdf3b1a3..fbbb57f43 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -1,23 +1,23 @@ -#include "nix/archive.hh" -#include "nix/derivations.hh" +#include "nix/util/archive.hh" +#include "nix/store/derivations.hh" #include "dotgraph.hh" -#include "nix/globals.hh" -#include "nix/store-cast.hh" -#include "nix/local-fs-store.hh" -#include "nix/log-store.hh" -#include "nix/serve-protocol.hh" -#include "nix/serve-protocol-connection.hh" -#include "nix/shared.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/log-store.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/serve-protocol-connection.hh" +#include "nix/main/shared.hh" #include "graphml.hh" -#include "nix/legacy.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/path-with-outputs.hh" +#include "nix/cmd/legacy.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/store/path-with-outputs.hh" #include "man-pages.hh" #ifndef _WIN32 // TODO implement on Windows or provide allowed-to-noop interface -# include "nix/local-store.hh" -# include "nix/monitor-fd.hh" -# include "nix/posix-fs-canonicalise.hh" +# include "nix/store/local-store.hh" +# include "nix/util/monitor-fd.hh" +# include "nix/store/posix-fs-canonicalise.hh" #endif #include @@ -27,9 +27,9 @@ #include #include -#include "nix/build-result.hh" -#include "nix/exit.hh" -#include "nix/serve-protocol-impl.hh" +#include "nix/store/build-result.hh" +#include "nix/util/exit.hh" +#include "nix/store/serve-protocol-impl.hh" namespace nix_store { diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index 6c71dc69f..9b7306fdd 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -1,10 +1,10 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/git.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/misc-store-flags.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/util/git.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/cmd/misc-store-flags.hh" using namespace nix; diff --git a/src/nix/app.cc b/src/nix/app.cc index 2b6c22269..75ef874ba 100644 --- a/src/nix/app.cc +++ b/src/nix/app.cc @@ -1,13 +1,13 @@ -#include "nix/installables.hh" -#include "nix/installable-derived-path.hh" -#include "nix/installable-value.hh" -#include "nix/store-api.hh" -#include "nix/eval-inline.hh" -#include "nix/eval-cache.hh" -#include "nix/names.hh" -#include "nix/command.hh" -#include "nix/derivations.hh" -#include "nix/downstream-placeholder.hh" +#include "nix/cmd/installables.hh" +#include "nix/cmd/installable-derived-path.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/store/store-api.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/store/names.hh" +#include "nix/cmd/command.hh" +#include "nix/store/derivations.hh" +#include "nix/store/downstream-placeholder.hh" namespace nix { diff --git a/src/nix/build.cc b/src/nix/build.cc index 80cf5ddad..d27be86f5 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -1,8 +1,8 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc index 613383939..30b3003e7 100644 --- a/src/nix/bundle.cc +++ b/src/nix/bundle.cc @@ -1,10 +1,10 @@ -#include "nix/installable-flake.hh" -#include "nix/command-installable-value.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/eval-inline.hh" +#include "nix/cmd/installable-flake.hh" +#include "nix/cmd/command-installable-value.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/expr/eval-inline.hh" namespace nix::fs { using namespace std::filesystem; } diff --git a/src/nix/cat.cc b/src/nix/cat.cc index 11de32b40..a790c0301 100644 --- a/src/nix/cat.cc +++ b/src/nix/cat.cc @@ -1,6 +1,6 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" -#include "nix/nar-accessor.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" +#include "nix/store/nar-accessor.hh" using namespace nix; diff --git a/src/nix/config-check.cc b/src/nix/config-check.cc index bc23fd7be..deac8e560 100644 --- a/src/nix/config-check.cc +++ b/src/nix/config-check.cc @@ -1,14 +1,14 @@ #include -#include "nix/command.hh" -#include "nix/exit.hh" -#include "nix/logging.hh" -#include "nix/serve-protocol.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" -#include "nix/worker-protocol.hh" -#include "nix/executable-path.hh" +#include "nix/cmd/command.hh" +#include "nix/util/exit.hh" +#include "nix/util/logging.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/util/executable-path.hh" namespace nix::fs { using namespace std::filesystem; } diff --git a/src/nix/config.cc b/src/nix/config.cc index 6a34faaec..cd82b08a6 100644 --- a/src/nix/config.cc +++ b/src/nix/config.cc @@ -1,8 +1,8 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/config-global.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/util/config-global.hh" #include diff --git a/src/nix/copy.cc b/src/nix/copy.cc index 0ed99df53..0702215fd 100644 --- a/src/nix/copy.cc +++ b/src/nix/copy.cc @@ -1,7 +1,7 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/local-fs-store.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" using namespace nix; diff --git a/src/nix/crash-handler.cc b/src/nix/crash-handler.cc index 65687f79e..17d346ecc 100644 --- a/src/nix/crash-handler.cc +++ b/src/nix/crash-handler.cc @@ -1,7 +1,7 @@ #include "crash-handler.hh" -#include "nix/fmt.hh" -#include "nix/logging.hh" +#include "nix/util/fmt.hh" +#include "nix/util/logging.hh" #include #include diff --git a/src/nix/derivation-add.cc b/src/nix/derivation-add.cc index da52ac14c..e99c44deb 100644 --- a/src/nix/derivation-add.cc +++ b/src/nix/derivation-add.cc @@ -1,10 +1,10 @@ // FIXME: rename to 'nix plan add' or 'nix derivation add'? -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/derivations.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/store/derivations.hh" #include using namespace nix; diff --git a/src/nix/derivation-show.cc b/src/nix/derivation-show.cc index 038fa5f96..7c0224673 100644 --- a/src/nix/derivation-show.cc +++ b/src/nix/derivation-show.cc @@ -1,11 +1,11 @@ // FIXME: integrate this with `nix path-info`? // FIXME: rename to 'nix store derivation show'? -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" -#include "nix/derivations.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" +#include "nix/store/derivations.hh" #include using namespace nix; diff --git a/src/nix/derivation.cc b/src/nix/derivation.cc index 6e0d28d9a..ee62ab4dc 100644 --- a/src/nix/derivation.cc +++ b/src/nix/derivation.cc @@ -1,4 +1,4 @@ -#include "nix/command.hh" +#include "nix/cmd/command.hh" using namespace nix; diff --git a/src/nix/develop.cc b/src/nix/develop.cc index c8bfc06fb..0d5491fdb 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -1,12 +1,12 @@ -#include "nix/config-global.hh" -#include "nix/eval.hh" -#include "nix/installable-flake.hh" -#include "nix/command-installable-value.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/outputs-spec.hh" -#include "nix/derivations.hh" +#include "nix/util/config-global.hh" +#include "nix/expr/eval.hh" +#include "nix/cmd/installable-flake.hh" +#include "nix/cmd/command-installable-value.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/derivations.hh" #ifndef _WIN32 // TODO re-enable on Windows # include "run.hh" @@ -18,7 +18,7 @@ #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix::fs { using namespace std::filesystem; } diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc index 042da8d3a..c4d21db6f 100644 --- a/src/nix/diff-closures.cc +++ b/src/nix/diff-closures.cc @@ -1,12 +1,12 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/common-args.hh" -#include "nix/names.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/main/common-args.hh" +#include "nix/store/names.hh" #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/nix/dump-path.cc b/src/nix/dump-path.cc index bf82de846..c883630b1 100644 --- a/src/nix/dump-path.cc +++ b/src/nix/dump-path.cc @@ -1,6 +1,6 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" -#include "nix/archive.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" +#include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/edit.cc b/src/nix/edit.cc index 770bbfc71..cfb9eb74a 100644 --- a/src/nix/edit.cc +++ b/src/nix/edit.cc @@ -1,9 +1,9 @@ -#include "nix/current-process.hh" -#include "nix/command-installable-value.hh" -#include "nix/shared.hh" -#include "nix/eval.hh" -#include "nix/attr-path.hh" -#include "nix/editor-for.hh" +#include "nix/util/current-process.hh" +#include "nix/cmd/command-installable-value.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/attr-path.hh" +#include "nix/cmd/editor-for.hh" #include diff --git a/src/nix/env.cc b/src/nix/env.cc index 982120252..4b00dbc7c 100644 --- a/src/nix/env.cc +++ b/src/nix/env.cc @@ -1,11 +1,11 @@ #include #include -#include "nix/command.hh" -#include "nix/eval.hh" +#include "nix/cmd/command.hh" +#include "nix/expr/eval.hh" #include "run.hh" -#include "nix/strings.hh" -#include "nix/executable-path.hh" +#include "nix/util/strings.hh" +#include "nix/util/executable-path.hh" using namespace nix; diff --git a/src/nix/eval.cc b/src/nix/eval.cc index 09623abc7..6a9bd2f16 100644 --- a/src/nix/eval.cc +++ b/src/nix/eval.cc @@ -1,10 +1,10 @@ -#include "nix/command-installable-value.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/value-to-json.hh" +#include "nix/cmd/command-installable-value.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/value-to-json.hh" #include diff --git a/src/nix/flake.cc b/src/nix/flake.cc index f263601d0..b54d1684a 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -1,30 +1,30 @@ -#include "nix/command.hh" -#include "nix/installable-flake.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/eval-settings.hh" +#include "nix/cmd/command.hh" +#include "nix/cmd/installable-flake.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-settings.hh" #include "nix/flake/flake.hh" -#include "nix/get-drvs.hh" -#include "nix/signals.hh" -#include "nix/store-api.hh" -#include "nix/derivations.hh" -#include "nix/outputs-spec.hh" -#include "nix/attr-path.hh" -#include "nix/fetchers.hh" -#include "nix/registry.hh" -#include "nix/eval-cache.hh" -#include "nix/markdown.hh" -#include "nix/users.hh" -#include "nix/fetch-to-store.hh" -#include "nix/local-fs-store.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/util/signals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/expr/attr-path.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/cmd/markdown.hh" +#include "nix/util/users.hh" +#include "nix/fetchers/fetch-to-store.hh" +#include "nix/store/local-fs-store.hh" #include #include #include -#include "nix/strings-inline.hh" +#include "nix/util/strings-inline.hh" namespace nix::fs { using namespace std::filesystem; } diff --git a/src/nix/fmt.cc b/src/nix/fmt.cc index e49f76084..dc270fb8c 100644 --- a/src/nix/fmt.cc +++ b/src/nix/fmt.cc @@ -1,6 +1,6 @@ -#include "nix/command.hh" -#include "nix/installable-value.hh" -#include "nix/eval.hh" +#include "nix/cmd/command.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/expr/eval.hh" #include "run.hh" using namespace nix; diff --git a/src/nix/hash.cc b/src/nix/hash.cc index db937283a..510cfa592 100644 --- a/src/nix/hash.cc +++ b/src/nix/hash.cc @@ -1,13 +1,13 @@ -#include "nix/command.hh" -#include "nix/hash.hh" -#include "nix/content-address.hh" -#include "nix/legacy.hh" -#include "nix/shared.hh" -#include "nix/references.hh" -#include "nix/archive.hh" -#include "nix/git.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/misc-store-flags.hh" +#include "nix/cmd/command.hh" +#include "nix/util/hash.hh" +#include "nix/store/content-address.hh" +#include "nix/cmd/legacy.hh" +#include "nix/main/shared.hh" +#include "nix/util/references.hh" +#include "nix/util/archive.hh" +#include "nix/util/git.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/cmd/misc-store-flags.hh" #include "man-pages.hh" using namespace nix; diff --git a/src/nix/log.cc b/src/nix/log.cc index ee37cd03c..e44f6d69b 100644 --- a/src/nix/log.cc +++ b/src/nix/log.cc @@ -1,8 +1,8 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/log-store.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/log-store.hh" using namespace nix; diff --git a/src/nix/ls.cc b/src/nix/ls.cc index c5a1c4504..1a90ed074 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -1,7 +1,7 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" -#include "nix/nar-accessor.hh" -#include "nix/common-args.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" +#include "nix/store/nar-accessor.hh" +#include "nix/main/common-args.hh" #include using namespace nix; diff --git a/src/nix/main.cc b/src/nix/main.cc index 330cafce6..6470213a2 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -1,25 +1,25 @@ -#include "nix/args/root.hh" -#include "nix/current-process.hh" -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/globals.hh" -#include "nix/legacy.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/filetransfer.hh" -#include "nix/finally.hh" -#include "nix/loggers.hh" -#include "nix/markdown.hh" -#include "nix/memory-source-accessor.hh" -#include "nix/terminal.hh" -#include "nix/users.hh" -#include "nix/network-proxy.hh" -#include "nix/eval-cache.hh" +#include "nix/util/args/root.hh" +#include "nix/util/current-process.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/legacy.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/filetransfer.hh" +#include "nix/util/finally.hh" +#include "nix/main/loggers.hh" +#include "nix/cmd/markdown.hh" +#include "nix/util/memory-source-accessor.hh" +#include "nix/util/terminal.hh" +#include "nix/util/users.hh" +#include "nix/cmd/network-proxy.hh" +#include "nix/expr/eval-cache.hh" #include "nix/flake/flake.hh" #include "nix/flake/settings.hh" -#include "nix/json-utils.hh" +#include "nix/util/json-utils.hh" #include "self-exe.hh" #include "crash-handler.hh" @@ -37,7 +37,7 @@ #endif #if __linux__ -# include "nix/namespaces.hh" +# include "nix/util/namespaces.hh" #endif #ifndef _WIN32 @@ -46,7 +46,7 @@ extern std::string chrootHelperName; void chrootHelper(int argc, char * * argv); #endif -#include "nix/strings.hh" +#include "nix/util/strings.hh" namespace nix { diff --git a/src/nix/make-content-addressed.cc b/src/nix/make-content-addressed.cc index 39218124d..292bf42fd 100644 --- a/src/nix/make-content-addressed.cc +++ b/src/nix/make-content-addressed.cc @@ -1,7 +1,7 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" -#include "nix/make-content-addressed.hh" -#include "nix/common-args.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" +#include "nix/store/make-content-addressed.hh" +#include "nix/main/common-args.hh" #include diff --git a/src/nix/man-pages.cc b/src/nix/man-pages.cc index 993ef28e1..8da439e7b 100644 --- a/src/nix/man-pages.cc +++ b/src/nix/man-pages.cc @@ -1,7 +1,7 @@ #include "man-pages.hh" -#include "nix/file-system.hh" -#include "nix/current-process.hh" -#include "nix/environment-variables.hh" +#include "nix/util/file-system.hh" +#include "nix/util/current-process.hh" +#include "nix/util/environment-variables.hh" namespace nix { diff --git a/src/nix/nar.cc b/src/nix/nar.cc index ba815551d..debb6b95e 100644 --- a/src/nix/nar.cc +++ b/src/nix/nar.cc @@ -1,4 +1,4 @@ -#include "nix/command.hh" +#include "nix/cmd/command.hh" using namespace nix; diff --git a/src/nix/optimise-store.cc b/src/nix/optimise-store.cc index ac1b03f60..e319f5c90 100644 --- a/src/nix/optimise-store.cc +++ b/src/nix/optimise-store.cc @@ -1,6 +1,6 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/nix/path-from-hash-part.cc b/src/nix/path-from-hash-part.cc index 060231d02..814b723f9 100644 --- a/src/nix/path-from-hash-part.cc +++ b/src/nix/path-from-hash-part.cc @@ -1,5 +1,5 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" using namespace nix; diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc index 31a8f0ad4..04af72646 100644 --- a/src/nix/path-info.cc +++ b/src/nix/path-info.cc @@ -1,15 +1,15 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/common-args.hh" -#include "nix/nar-info.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/main/common-args.hh" +#include "nix/store/nar-info.hh" #include #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" using namespace nix; using nlohmann::json; diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index 8ee9b5f72..35ea720de 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -1,17 +1,17 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/filetransfer.hh" -#include "nix/finally.hh" -#include "nix/loggers.hh" -#include "nix/tarfile.hh" -#include "nix/attr-path.hh" -#include "nix/eval-inline.hh" -#include "nix/legacy.hh" -#include "nix/posix-source-accessor.hh" -#include "nix/misc-store-flags.hh" -#include "nix/terminal.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/filetransfer.hh" +#include "nix/util/finally.hh" +#include "nix/main/loggers.hh" +#include "nix/util/tarfile.hh" +#include "nix/expr/attr-path.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/cmd/legacy.hh" +#include "nix/util/posix-source-accessor.hh" +#include "nix/cmd/misc-store-flags.hh" +#include "nix/util/terminal.hh" #include "man-pages.hh" diff --git a/src/nix/profile.cc b/src/nix/profile.cc index ef6957874..a0b6ee6c2 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -1,23 +1,23 @@ -#include "nix/command.hh" -#include "nix/installable-flake.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/derivations.hh" -#include "nix/archive.hh" -#include "nix/builtins/buildenv.hh" +#include "nix/cmd/command.hh" +#include "nix/cmd/installable-flake.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/util/archive.hh" +#include "nix/store/builtins/buildenv.hh" #include "nix/flake/flakeref.hh" #include "../nix-env/user-env.hh" -#include "nix/profiles.hh" -#include "nix/names.hh" -#include "nix/url.hh" +#include "nix/store/profiles.hh" +#include "nix/store/names.hh" +#include "nix/util/url.hh" #include "nix/flake/url-name.hh" #include #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" using namespace nix; diff --git a/src/nix/realisation.cc b/src/nix/realisation.cc index 4b63e4741..f21567639 100644 --- a/src/nix/realisation.cc +++ b/src/nix/realisation.cc @@ -1,5 +1,5 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" #include diff --git a/src/nix/registry.cc b/src/nix/registry.cc index f464ab02f..340d10ec4 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -1,11 +1,11 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/eval.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval.hh" #include "nix/flake/flake.hh" -#include "nix/store-api.hh" -#include "nix/fetchers.hh" -#include "nix/registry.hh" +#include "nix/store/store-api.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" using namespace nix; using namespace nix::flake; diff --git a/src/nix/repl.cc b/src/nix/repl.cc index fb8954455..fcce43b8f 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -1,11 +1,11 @@ -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/config-global.hh" -#include "nix/globals.hh" -#include "nix/command.hh" -#include "nix/installable-value.hh" -#include "nix/repl.hh" -#include "nix/processes.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/util/config-global.hh" +#include "nix/store/globals.hh" +#include "nix/cmd/command.hh" +#include "nix/cmd/installable-value.hh" +#include "nix/cmd/repl.hh" +#include "nix/util/processes.hh" #include "self-exe.hh" namespace nix { diff --git a/src/nix/run.cc b/src/nix/run.cc index 0345fab9a..64eab3ff3 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -1,20 +1,20 @@ -#include "nix/current-process.hh" +#include "nix/util/current-process.hh" #include "run.hh" -#include "nix/command-installable-value.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/signals.hh" -#include "nix/store-api.hh" -#include "nix/derivations.hh" -#include "nix/local-fs-store.hh" -#include "nix/finally.hh" -#include "nix/source-accessor.hh" -#include "nix/eval.hh" +#include "nix/cmd/command-installable-value.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/util/signals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/util/finally.hh" +#include "nix/util/source-accessor.hh" +#include "nix/expr/eval.hh" #include #if __linux__ # include -# include "nix/personality.hh" +# include "nix/store/personality.hh" #endif #include diff --git a/src/nix/run.hh b/src/nix/run.hh index eb670319c..9d95b8e7c 100644 --- a/src/nix/run.hh +++ b/src/nix/run.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "nix/store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/nix/search.cc b/src/nix/search.cc index ab46c2f51..306a80594 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -1,22 +1,22 @@ -#include "nix/command-installable-value.hh" -#include "nix/globals.hh" -#include "nix/eval.hh" -#include "nix/eval-inline.hh" -#include "nix/eval-settings.hh" -#include "nix/names.hh" -#include "nix/get-drvs.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/eval-cache.hh" -#include "nix/attr-path.hh" -#include "nix/hilite.hh" -#include "nix/strings-inline.hh" +#include "nix/cmd/command-installable-value.hh" +#include "nix/store/globals.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/store/names.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/expr/attr-path.hh" +#include "nix/util/hilite.hh" +#include "nix/util/strings-inline.hh" #include #include #include -#include "nix/strings.hh" +#include "nix/util/strings.hh" using namespace nix; using json = nlohmann::json; diff --git a/src/nix/self-exe.cc b/src/nix/self-exe.cc index f9439dfd9..5cc2326be 100644 --- a/src/nix/self-exe.cc +++ b/src/nix/self-exe.cc @@ -1,6 +1,6 @@ -#include "nix/current-process.hh" -#include "nix/file-system.hh" -#include "nix/globals.hh" +#include "nix/util/current-process.hh" +#include "nix/util/file-system.hh" +#include "nix/store/globals.hh" #include "self-exe.hh" #include "cli-config-private.hh" diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index bbdc33002..87d0e1edb 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -1,8 +1,8 @@ -#include "nix/signals.hh" -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/thread-pool.hh" +#include "nix/util/signals.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/util/thread-pool.hh" #include diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc index 7dde15dfa..599b40edc 100644 --- a/src/nix/store-copy-log.cc +++ b/src/nix/store-copy-log.cc @@ -1,10 +1,10 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/store-cast.hh" -#include "nix/log-store.hh" -#include "nix/sync.hh" -#include "nix/thread-pool.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/log-store.hh" +#include "nix/util/sync.hh" +#include "nix/util/thread-pool.hh" #include diff --git a/src/nix/store-delete.cc b/src/nix/store-delete.cc index 3d73b7b9a..f71a56bc7 100644 --- a/src/nix/store-delete.cc +++ b/src/nix/store-delete.cc @@ -1,9 +1,9 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/store-cast.hh" -#include "nix/gc-store.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" using namespace nix; diff --git a/src/nix/store-gc.cc b/src/nix/store-gc.cc index a8ea3f2fa..e6a303874 100644 --- a/src/nix/store-gc.cc +++ b/src/nix/store-gc.cc @@ -1,9 +1,9 @@ -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/store-cast.hh" -#include "nix/gc-store.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" using namespace nix; diff --git a/src/nix/store-info.cc b/src/nix/store-info.cc index bcb9d56aa..323dfeee4 100644 --- a/src/nix/store-info.cc +++ b/src/nix/store-info.cc @@ -1,7 +1,7 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/finally.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/util/finally.hh" #include diff --git a/src/nix/store-repair.cc b/src/nix/store-repair.cc index cd63a836a..edd699981 100644 --- a/src/nix/store-repair.cc +++ b/src/nix/store-repair.cc @@ -1,5 +1,5 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" using namespace nix; diff --git a/src/nix/store.cc b/src/nix/store.cc index ccf02c22e..b40b6d068 100644 --- a/src/nix/store.cc +++ b/src/nix/store.cc @@ -1,4 +1,4 @@ -#include "nix/command.hh" +#include "nix/cmd/command.hh" using namespace nix; diff --git a/src/nix/unix/daemon.cc b/src/nix/unix/daemon.cc index 5da068a70..4e60ba102 100644 --- a/src/nix/unix/daemon.cc +++ b/src/nix/unix/daemon.cc @@ -1,20 +1,20 @@ ///@file -#include "nix/signals.hh" -#include "nix/unix-domain-socket.hh" -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/local-store.hh" -#include "nix/remote-store.hh" -#include "nix/remote-store-connection.hh" -#include "nix/serialise.hh" -#include "nix/archive.hh" -#include "nix/globals.hh" -#include "nix/config-global.hh" -#include "nix/derivations.hh" -#include "nix/finally.hh" -#include "nix/legacy.hh" -#include "nix/daemon.hh" +#include "nix/util/signals.hh" +#include "nix/util/unix-domain-socket.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/local-store.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/remote-store-connection.hh" +#include "nix/util/serialise.hh" +#include "nix/util/archive.hh" +#include "nix/store/globals.hh" +#include "nix/util/config-global.hh" +#include "nix/store/derivations.hh" +#include "nix/util/finally.hh" +#include "nix/cmd/legacy.hh" +#include "nix/store/daemon.hh" #include "man-pages.hh" #include @@ -35,7 +35,7 @@ #include #if __linux__ -#include "nix/cgroup.hh" +#include "nix/util/cgroup.hh" #endif #if __APPLE__ || __FreeBSD__ diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc index 285285856..c0a6e6827 100644 --- a/src/nix/upgrade-nix.cc +++ b/src/nix/upgrade-nix.cc @@ -1,13 +1,13 @@ -#include "nix/processes.hh" -#include "nix/command.hh" -#include "nix/common-args.hh" -#include "nix/store-api.hh" -#include "nix/filetransfer.hh" -#include "nix/eval.hh" -#include "nix/eval-settings.hh" -#include "nix/attr-path.hh" -#include "nix/names.hh" -#include "nix/executable-path.hh" +#include "nix/util/processes.hh" +#include "nix/cmd/command.hh" +#include "nix/main/common-args.hh" +#include "nix/store/store-api.hh" +#include "nix/store/filetransfer.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-settings.hh" +#include "nix/expr/attr-path.hh" +#include "nix/store/names.hh" +#include "nix/util/executable-path.hh" #include "self-exe.hh" using namespace nix; diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 0adfec895..734387ee7 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -1,13 +1,13 @@ -#include "nix/command.hh" -#include "nix/shared.hh" -#include "nix/store-api.hh" -#include "nix/thread-pool.hh" -#include "nix/signals.hh" -#include "nix/keys.hh" +#include "nix/cmd/command.hh" +#include "nix/main/shared.hh" +#include "nix/store/store-api.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/signals.hh" +#include "nix/store/keys.hh" #include -#include "nix/exit.hh" +#include "nix/util/exit.hh" using namespace nix; diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc index fe8f3ecc3..8dfd8343f 100644 --- a/src/nix/why-depends.cc +++ b/src/nix/why-depends.cc @@ -1,7 +1,7 @@ -#include "nix/command.hh" -#include "nix/store-api.hh" -#include "nix/source-accessor.hh" -#include "nix/shared.hh" +#include "nix/cmd/command.hh" +#include "nix/store/store-api.hh" +#include "nix/util/source-accessor.hh" +#include "nix/main/shared.hh" #include diff --git a/src/perl/lib/Nix/Store.xs b/src/perl/lib/Nix/Store.xs index 49bf8bd79..34ed8b5f0 100644 --- a/src/perl/lib/Nix/Store.xs +++ b/src/perl/lib/Nix/Store.xs @@ -6,11 +6,11 @@ #undef do_open #undef do_close -#include "nix/derivations.hh" -#include "nix/realisation.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" -#include "nix/posix-source-accessor.hh" +#include "nix/store/derivations.hh" +#include "nix/store/realisation.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/util/posix-source-accessor.hh" #include #include diff --git a/tests/functional/plugins/plugintest.cc b/tests/functional/plugins/plugintest.cc index e3343bcbc..0b1a01a6e 100644 --- a/tests/functional/plugins/plugintest.cc +++ b/tests/functional/plugins/plugintest.cc @@ -1,5 +1,5 @@ -#include "nix/config-global.hh" -#include "nix/primops.hh" +#include "nix/util/config-global.hh" +#include "nix/expr/primops.hh" using namespace nix; diff --git a/tests/functional/test-libstoreconsumer/main.cc b/tests/functional/test-libstoreconsumer/main.cc index 7cb0da944..2c0402094 100644 --- a/tests/functional/test-libstoreconsumer/main.cc +++ b/tests/functional/test-libstoreconsumer/main.cc @@ -1,6 +1,6 @@ -#include "nix/globals.hh" -#include "nix/store-api.hh" -#include "nix/build-result.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" #include using namespace nix;