Expose the nix component in header include paths

For example, instead of doing

    #include "nix/store-config.hh"
    #include "nix/derived-path.hh"

Now do

    #include "nix/store/config.hh"
    #include "nix/store/derived-path.hh"

This was originally planned in the issue, and also recent requested by
Eelco.

Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.

Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!

Progress on #7876

src/libutil/archive.cc

@@ -5,12 +5,12 @@
 
 #include <strings.h> // 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 {
 

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 <fstream>
 #include <string>

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 {
 

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 <archive.h>
 #include <archive_entry.h>

src/libutil/compute-levels.cc

@@ -1,4 +1,4 @@
-#include "nix/types.hh"
+#include "nix/util/types.hh"
 
 #include "util-config-private.hh"
 

src/libutil/config-global.cc

@@ -1,4 +1,4 @@
-#include "nix/config-global.hh"
+#include "nix/util/config-global.hh"
 
 #include <nlohmann/json.hpp>
 

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 <nlohmann/json.hpp>
 
-#include "nix/strings.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

src/libutil/current-process.cc

@@ -1,12 +1,12 @@
 #include <algorithm>
 #include <cstring>
 
-#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 <math.h>
 
 #ifdef __APPLE__
@@ -15,8 +15,8 @@
 
 #if __linux__
 # include <mutex>
-# include "nix/cgroup.hh"
-# include "nix/namespaces.hh"
+# include "nix/util/cgroup.hh"
+# include "nix/util/namespaces.hh"
 #endif
 
 namespace nix {

src/libutil/english.cc

@@ -1,4 +1,4 @@
-#include "nix/english.hh"
+#include "nix/util/english.hh"
 
 namespace nix {
 

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));
 

src/libutil/error.cc

@@ -1,14 +1,14 @@
 #include <algorithm>
 
-#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 <iostream>
 #include <optional>
-#include "nix/serialise.hh"
+#include "nix/util/serialise.hh"
 #include <sstream>
 
 namespace nix {

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 {
 

src/libutil/exit.cc

@@ -1,4 +1,4 @@
-#include "nix/exit.hh"
+#include "nix/util/exit.hh"
 
 namespace nix {
 

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 <nlohmann/json.hpp>
 

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 {
 

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 <fcntl.h>
 #include <unistd.h>
 #ifdef _WIN32
 # include <winnt.h>
 # include <fileapi.h>
-# include "nix/windows-error.hh"
+# include "nix/util/windows-error.hh"
 #endif
 
 namespace nix {

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 <atomic>
 #include <cerrno>
@@ -25,7 +25,7 @@
 # include <io.h>
 #endif
 
-#include "nix/strings-inline.hh"
+#include "nix/util/strings-inline.hh"
 
 #include "util-config-private.hh"
 

src/libutil/fs-sink.cc

@@ -1,13 +1,13 @@
 #include <fcntl.h>
 
-#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 <fileapi.h>
-# 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"

src/libutil/git.cc

@@ -5,12 +5,12 @@
 #include <regex>
 #include <strings.h> // 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 {
 

src/libutil/hash.cc

@@ -6,11 +6,11 @@
 #include <openssl/md5.h>
 #include <openssl/sha.h>
 
-#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 <sys/types.h>
 #include <sys/stat.h>

src/libutil/hilite.cc

@@ -1,4 +1,4 @@
-#include "nix/hilite.hh"
+#include "nix/util/hilite.hh"
 
 namespace nix {
 

src/libutil/include/nix/util/abstract-setting-to-json.hh

@@ -2,8 +2,8 @@
 ///@file
 
 #include <nlohmann/json.hpp>
-#include "nix/config.hh"
-#include "nix/json-utils.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/json-utils.hh"
 
 namespace nix {
 template<typename T>

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 {

src/libutil/include/nix/util/args.hh

@@ -9,9 +9,9 @@
 
 #include <nlohmann/json_fwd.hpp>
 
-#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 {
 

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 {
 

src/libutil/include/nix/util/chunked-vector.hh

@@ -6,7 +6,7 @@
 #include <vector>
 #include <limits>
 
-#include "nix/error.hh"
+#include "nix/util/error.hh"
 
 namespace nix {
 

src/libutil/include/nix/util/closure.hh

@@ -3,7 +3,7 @@
 
 #include <set>
 #include <future>
-#include "nix/sync.hh"
+#include "nix/util/sync.hh"
 
 using std::set;
 

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 <string>
 

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 {
 

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 {
 

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 {
 

src/libutil/include/nix/util/configuration.hh

@@ -7,8 +7,8 @@
 
 #include <nlohmann/json_fwd.hpp>
 
-#include "nix/types.hh"
-#include "nix/experimental-features.hh"
+#include "nix/util/types.hh"
+#include "nix/util/experimental-features.hh"
 
 namespace nix {
 

src/libutil/include/nix/util/current-process.hh

@@ -7,7 +7,7 @@
 # include <sys/resource.h>
 #endif
 
-#include "nix/types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libutil/include/nix/util/environment-variables.hh

@@ -8,8 +8,8 @@
 
 #include <optional>
 
-#include "nix/types.hh"
-#include "nix/file-path.hh"
+#include "nix/util/types.hh"
+#include "nix/util/file-path.hh"
 
 namespace nix {
 

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 <cstring>
 #include <list>
@@ -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

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 {
 

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 {
 

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 <nlohmann/json_fwd.hpp>
 

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 {
 

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

src/libutil/include/nix/util/file-path.hh

@@ -3,8 +3,8 @@
 
 #include <filesystem>
 
-#include "nix/types.hh"
-#include "nix/os-string.hh"
+#include "nix/util/types.hh"
+#include "nix/util/os-string.hh"
 
 namespace nix {
 

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 <sys/types.h>
 #include <sys/stat.h>

src/libutil/include/nix/util/fmt.hh

@@ -3,7 +3,7 @@
 
 #include <boost/format.hpp>
 #include <string>
-#include "nix/ansicolor.hh"
+#include "nix/util/ansicolor.hh"
 
 
 namespace nix {

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 {
 

src/libutil/include/nix/util/git.hh

@@ -5,11 +5,11 @@
 #include <string_view>
 #include <optional>
 
-#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 {
 

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 {
 

src/libutil/include/nix/util/json-utils.hh

@@ -4,7 +4,7 @@
 #include <nlohmann/json.hpp>
 #include <list>
 
-#include "nix/types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

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 <nlohmann/json_fwd.hpp>
 

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 {
 

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',

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 <poll.h>
 #else
 #  include <ioapiset.h>
-#  include "nix/windows-error.hh"
+#  include "nix/util/windows-error.hh"
 #endif
 
 namespace nix {

src/libutil/include/nix/util/pool.hh

@@ -7,8 +7,8 @@
 #include <memory>
 #include <cassert>
 
-#include "nix/sync.hh"
-#include "nix/ref.hh"
+#include "nix/util/sync.hh"
+#include "nix/util/ref.hh"
 
 namespace nix {
 

src/libutil/include/nix/util/pos-table.hh

@@ -4,9 +4,9 @@
 #include <cstdint>
 #include <vector>
 
-#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 {
 

src/libutil/include/nix/util/position.hh

@@ -9,7 +9,7 @@
 #include <string>
 #include <variant>
 
-#include "nix/source-path.hh"
+#include "nix/util/source-path.hh"
 
 namespace nix {
 

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 {
 

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 <sys/types.h>
 #include <sys/stat.h>

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 {
 

src/libutil/include/nix/util/serialise.hh

@@ -4,9 +4,9 @@
 #include <memory>
 #include <type_traits>
 
-#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; }
 

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 <functional>
 
@@ -62,4 +62,4 @@ struct ReceiveInterrupts;
 
 }
 
-#include "nix/signals-impl.hh"
+#include "nix/util/signals-impl.hh"

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 <map>
 

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 <map>
 #include <optional>

src/libutil/include/nix/util/source-accessor.hh

@@ -2,9 +2,9 @@
 
 #include <filesystem>
 
-#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 {
 

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 {
 

src/libutil/include/nix/util/split.hh

@@ -4,7 +4,7 @@
 #include <optional>
 #include <string_view>
 
-#include "nix/util.hh"
+#include "nix/util/util.hh"
 
 namespace nix {
 

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 {
 

src/libutil/include/nix/util/suggestions.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/types.hh"
+#include "nix/util/types.hh"
 #include <set>
 
 namespace nix {

src/libutil/include/nix/util/sync.hh

@@ -7,7 +7,7 @@
 #include <condition_variable>
 #include <cassert>
 
-#include "nix/error.hh"
+#include "nix/util/error.hh"
 
 namespace nix {
 

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 <archive.h>
 
 namespace nix {

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 <queue>
 #include <functional>

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 {
 

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 <winsock2.h>

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 {
 

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 <sys/types.h>

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 <functional>
@@ -11,7 +11,7 @@
 #include <sstream>
 #include <optional>
 
-#include "nix/strings.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

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 <nlohmann/json_fwd.hpp>
 #include <iostream>
 #include <optional>

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 <chrono>
 #include <cmath>