Tagging release 2.28.0

-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfv9fITHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3ohrCAC1Uw/JJr3yEPlJ/jLc9t9HqEKMY08W
 W6SEjpYJHYixMXmoonexkqojncNWBaiytRa+vBY7JQq0xTOOBwj42TM2ZzMF4GXi
 vO4Ox0hEsRa/v7tSmK6GFz1sNEKEUOHDNbilg4kzkkBHPEGPUGMwdWkT0akO576Q
 SQ6ERwPPLsHDI2YtAeAD8R4p07CraiyA34ljDPz3rChTAXRPVKWxJUt1enwEWYTr
 cKk45RcR4S8rP1BVwf3wsNsrHjqjbaY45kPAo8GD79hFH0zkyJarS3Kgv8qsWLra
 9ph0DVVG0wiArlET7Y3uchqtAC0Z5LOnutAmOFYFw6DKfWp9yGfl/SVW
 =XRda
 -----END PGP SIGNATURE-----

Merge tag '2.28.0' into sync-2.28.0

Tagging release 2.28.0

src/libstore/binary-cache-store.cc

@@ -1,18 +1,18 @@
-#include "archive.hh"
-#include "binary-cache-store.hh"
-#include "compression.hh"
-#include "derivations.hh"
-#include "source-accessor.hh"
-#include "globals.hh"
-#include "nar-info.hh"
-#include "sync.hh"
-#include "remote-fs-accessor.hh"
-#include "nar-info-disk-cache.hh"
-#include "nar-accessor.hh"
-#include "thread-pool.hh"
-#include "callback.hh"
-#include "signals.hh"
-#include "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 <chrono>
 #include <future>

src/libstore/build-result.cc

@@ -1,4 +1,4 @@
-#include "build-result.hh"
+#include "nix/store/build-result.hh"
 
 #include <nlohmann/json.hpp>
 

src/libstore/build/derivation-goal.cc

@@ -1,22 +1,22 @@
-#include "derivation-goal.hh"
+#include "nix/store/build/derivation-goal.hh"
 #ifndef _WIN32 // TODO enable build hook on Windows
-#  include "hook-instance.hh"
+#  include "nix/store/build/hook-instance.hh"
 #endif
-#include "processes.hh"
-#include "config-global.hh"
-#include "worker.hh"
-#include "builtins.hh"
-#include "builtins/buildenv.hh"
-#include "references.hh"
-#include "finally.hh"
-#include "util.hh"
-#include "archive.hh"
-#include "compression.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "topo-sort.hh"
-#include "callback.hh"
-#include "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 <regex>
 #include <queue>
@@ -32,7 +32,7 @@
 
 #include <nlohmann/json.hpp>
 
-#include "strings.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

src/libstore/build/drv-output-substitution-goal.cc

@@ -1,8 +1,8 @@
-#include "drv-output-substitution-goal.hh"
-#include "finally.hh"
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "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 {
 

src/libstore/build/entry-points.cc

@@ -1,10 +1,10 @@
-#include "worker.hh"
-#include "substitution-goal.hh"
+#include "nix/store/build/worker.hh"
+#include "nix/store/build/substitution-goal.hh"
 #ifndef _WIN32 // TODO Enable building on Windows
-#  include "derivation-goal.hh"
+#  include "nix/store/build/derivation-goal.hh"
 #endif
-#include "local-store.hh"
-#include "strings.hh"
+#include "nix/store/local-store.hh"
+#include "nix/util/strings.hh"
 
 namespace nix {
 

src/libstore/build/goal.cc

@@ -1,5 +1,5 @@
-#include "goal.hh"
-#include "worker.hh"
+#include "nix/store/build/goal.hh"
+#include "nix/store/build/worker.hh"
 
 namespace nix {
 

src/libstore/build/substitution-goal.cc

@@ -1,8 +1,8 @@
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "nar-info.hh"
-#include "finally.hh"
-#include "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 <coroutine>
 

src/libstore/build/worker.cc

@@ -1,14 +1,14 @@
-#include "local-store.hh"
-#include "machines.hh"
-#include "worker.hh"
-#include "substitution-goal.hh"
-#include "drv-output-substitution-goal.hh"
-#include "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 "local-derivation-goal.hh"
-#  include "hook-instance.hh"
+#  include "nix/store/build/local-derivation-goal.hh"
+#  include "nix/store/build/hook-instance.hh"
 #endif
-#include "signals.hh"
+#include "nix/util/signals.hh"
 
 namespace nix {
 

src/libstore/builtins/buildenv.cc

@@ -1,6 +1,6 @@
-#include "buildenv.hh"
-#include "derivations.hh"
-#include "signals.hh"
+#include "nix/store/builtins/buildenv.hh"
+#include "nix/store/derivations.hh"
+#include "nix/util/signals.hh"
 
 #include <sys/stat.h>
 #include <sys/types.h>

src/libstore/builtins/fetchurl.cc

@@ -1,8 +1,8 @@
-#include "builtins.hh"
-#include "filetransfer.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "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 {
 

src/libstore/builtins/unpack-channel.cc

@@ -1,5 +1,5 @@
-#include "builtins.hh"
-#include "tarfile.hh"
+#include "nix/store/builtins.hh"
+#include "nix/util/tarfile.hh"
 
 namespace nix {
 
@@ -23,11 +23,7 @@ void builtinUnpackChannel(
         throw Error("channelName is not allowed to contain filesystem separators, got %1%", channelName);
     }
 
-    try {
-        fs::create_directories(out);
-    } catch (fs::filesystem_error &) {
-        throw SysError("creating directory '%1%'", out.string());
-    }
+    createDirs(out);
 
     unpackTarfile(src, out);
 

src/libstore/common-protocol.cc

@@ -1,11 +1,11 @@
-#include "serialise.hh"
-#include "path-with-outputs.hh"
-#include "store-api.hh"
-#include "build-result.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "archive.hh"
-#include "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 <nlohmann/json.hpp>
 

src/libstore/common-ssh-store-config.cc

@@ -1,7 +1,7 @@
 #include <regex>
 
-#include "common-ssh-store-config.hh"
-#include "ssh.hh"
+#include "nix/store/common-ssh-store-config.hh"
+#include "nix/store/ssh.hh"
 
 namespace nix {
 

src/libstore/content-address.cc

@@ -1,6 +1,6 @@
-#include "args.hh"
-#include "content-address.hh"
-#include "split.hh"
+#include "nix/util/args.hh"
+#include "nix/store/content-address.hh"
+#include "nix/util/split.hh"
 
 namespace nix {
 

src/libstore/daemon.cc

@@ -1,24 +1,24 @@
-#include "daemon.hh"
-#include "signals.hh"
-#include "worker-protocol.hh"
-#include "worker-protocol-connection.hh"
-#include "worker-protocol-impl.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "store-cast.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
-#include "indirect-root-store.hh"
-#include "path-with-outputs.hh"
-#include "finally.hh"
-#include "archive.hh"
-#include "derivations.hh"
-#include "args.hh"
-#include "git.hh"
-#include "logging.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"
+#include "nix/util/logging.hh"
 
 #ifndef _WIN32 // TODO need graceful async exit support on Windows?
-# include "monitor-fd.hh"
+# include "nix/util/monitor-fd.hh"
 #endif
 
 #include <sstream>
@@ -1026,6 +1026,7 @@ void processConnection(
 {
 #ifndef _WIN32 // TODO need graceful async exit support on Windows?
     auto monitor = !recursive ? std::make_unique<MonitorFdHup>(from.fd) : nullptr;
+    (void) monitor; // suppress warning
 #endif
 
     /* Exchange the greeting. */

src/libstore/derivation-options.cc

@@ -1,8 +1,8 @@
-#include "derivation-options.hh"
-#include "json-utils.hh"
-#include "parsed-derivations.hh"
-#include "types.hh"
-#include "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 <optional>
 #include <string>
 #include <variant>

src/libstore/derivations.cc

@@ -1,14 +1,14 @@
-#include "derivations.hh"
-#include "downstream-placeholder.hh"
-#include "store-api.hh"
-#include "globals.hh"
-#include "types.hh"
-#include "util.hh"
-#include "split.hh"
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "strings-inline.hh"
-#include "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 <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>

src/libstore/derived-path-map.cc

@@ -1,5 +1,5 @@
-#include "derived-path-map.hh"
-#include "util.hh"
+#include "nix/store/derived-path-map.hh"
+#include "nix/util/util.hh"
 
 namespace nix {
 

src/libstore/derived-path.cc

@@ -1,7 +1,7 @@
-#include "derived-path.hh"
-#include "derivations.hh"
-#include "store-api.hh"
-#include "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 <nlohmann/json.hpp>
 

src/libstore/downstream-placeholder.cc

@@ -1,5 +1,5 @@
-#include "downstream-placeholder.hh"
-#include "derivations.hh"
+#include "nix/store/downstream-placeholder.hh"
+#include "nix/store/derivations.hh"
 
 namespace nix {
 

src/libstore/dummy-store.cc

@@ -1,5 +1,5 @@
-#include "store-api.hh"
-#include "callback.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/callback.hh"
 
 namespace nix {
 

src/libstore/export-import.cc

@@ -1,8 +1,8 @@
-#include "serialise.hh"
-#include "store-api.hh"
-#include "archive.hh"
-#include "common-protocol.hh"
-#include "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 <algorithm>
 

src/libstore/filetransfer.cc

@@ -1,19 +1,19 @@
-#include "filetransfer.hh"
-#include "globals.hh"
-#include "config-global.hh"
-#include "store-api.hh"
-#include "s3.hh"
-#include "compression.hh"
-#include "finally.hh"
-#include "callback.hh"
-#include "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 <aws/core/client/ClientConfiguration.h>
 #endif
 
 #if __linux__
-# include "namespaces.hh"
+# include "nix/util/namespaces.hh"
 #endif
 
 #include <unistd.h>

src/libstore/gc.cc

@@ -1,14 +1,16 @@
-#include "derivations.hh"
-#include "globals.hh"
-#include "local-store.hh"
-#include "finally.hh"
-#include "unix-domain-socket.hh"
-#include "signals.hh"
-#include "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 "processes.hh"
+#  include "nix/util/processes.hh"
 #endif
 
 #include <functional>

src/libstore/globals.cc

@@ -1,11 +1,11 @@
-#include "globals.hh"
-#include "config-global.hh"
-#include "current-process.hh"
-#include "archive.hh"
-#include "args.hh"
-#include "abstract-setting-to-json.hh"
-#include "compute-levels.hh"
-#include "signals.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 <algorithm>
 #include <map>
@@ -26,16 +26,16 @@
 #endif
 
 #if __APPLE__
-# include "processes.hh"
+# include "nix/util/processes.hh"
 #endif
 
-#include "config-impl.hh"
+#include "nix/util/config-impl.hh"
 
 #ifdef __APPLE__
 #include <sys/sysctl.h>
 #endif
 
-#include "strings.hh"
+#include "store-config-private.hh"
 
 namespace nix {
 
@@ -202,7 +202,7 @@ StringSet Settings::getDefaultExtraPlatforms()
 {
     StringSet extraPlatforms;
 
-    if (std::string{SYSTEM} == "x86_64-linux" && !isWSL1())
+    if (std::string{NIX_LOCAL_SYSTEM} == "x86_64-linux" && !isWSL1())
         extraPlatforms.insert("i686-linux");
 
 #if __linux__
@@ -214,7 +214,7 @@ StringSet Settings::getDefaultExtraPlatforms()
     // machines. Note that we can’t force processes from executing
     // x86_64 in aarch64 environments or vice versa since they can
     // always exec with their own binary preferences.
-    if (std::string{SYSTEM} == "aarch64-darwin" &&
+    if (std::string{NIX_LOCAL_SYSTEM} == "aarch64-darwin" &&
         runProgram(RunOptions {.program = "arch", .args = {"-arch", "x86_64", "/usr/bin/true"}, .mergeStderrToStdout = true}).first == 0)
         extraPlatforms.insert("x86_64-darwin");
 #endif

src/libstore/http-binary-cache-store.cc

@@ -1,8 +1,8 @@
-#include "http-binary-cache-store.hh"
-#include "filetransfer.hh"
-#include "globals.hh"
-#include "nar-info-disk-cache.hh"
-#include "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 {
 

src/libstore/include/nix/store/binary-cache-store.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "signature/local-keys.hh"
-#include "store-api.hh"
-#include "log-store.hh"
+#include "nix/util/signature/local-keys.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/log-store.hh"
 
-#include "pool.hh"
+#include "nix/util/pool.hh"
 
 #include <atomic>
 

src/libstore/include/nix/store/build-result.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "realisation.hh"
-#include "derived-path.hh"
+#include "nix/store/realisation.hh"
+#include "nix/store/derived-path.hh"
 
 #include <string>
 #include <chrono>

src/libstore/include/nix/store/build/derivation-goal.hh

@@ -1,15 +1,15 @@
 #pragma once
 ///@file
 
-#include "parsed-derivations.hh"
-#include "derivation-options.hh"
+#include "nix/store/parsed-derivations.hh"
+#include "nix/store/derivation-options.hh"
 #ifndef _WIN32
-#  include "user-lock.hh"
+#  include "nix/store/user-lock.hh"
 #endif
-#include "outputs-spec.hh"
-#include "store-api.hh"
-#include "pathlocks.hh"
-#include "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 {
 

src/libstore/include/nix/store/build/drv-output-substitution-goal.hh

@@ -4,10 +4,10 @@
 #include <thread>
 #include <future>
 
-#include "store-api.hh"
-#include "goal.hh"
-#include "realisation.hh"
-#include "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 {
 

src/libstore/include/nix/store/build/goal.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
-#include "build-result.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/build-result.hh"
 
 #include <coroutine>
 

src/libstore/include/nix/store/build/substitution-goal.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "worker.hh"
-#include "store-api.hh"
-#include "goal.hh"
-#include "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 <coroutine>
 #include <future>
 #include <source_location>

src/libstore/include/nix/store/build/worker.hh

@@ -1,11 +1,11 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "store-api.hh"
-#include "goal.hh"
-#include "realisation.hh"
-#include "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 <future>
 #include <thread>

src/libstore/include/nix/store/builtins.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
+#include "nix/store/derivations.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/builtins/buildenv.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/common-protocol-impl.hh

@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "common-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "nix/store/common-protocol.hh"
+#include "nix/store/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/common-protocol.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
+#include "nix/util/serialise.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/common-ssh-store-config.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/content-address.hh

@@ -2,10 +2,10 @@
 ///@file
 
 #include <variant>
-#include "hash.hh"
-#include "path.hh"
-#include "file-content-address.hh"
-#include "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 {
 

src/libstore/include/nix/store/daemon.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
-#include "store-api.hh"
+#include "nix/util/serialise.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix::daemon {
 

src/libstore/include/nix/store/derivation-options.hh

@@ -6,8 +6,8 @@
 #include <optional>
 #include <variant>
 
-#include "types.hh"
-#include "json-impls.hh"
+#include "nix/util/types.hh"
+#include "nix/util/json-impls.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/derivations.hh

@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "types.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "repair-flag.hh"
-#include "derived-path-map.hh"
-#include "sync.hh"
-#include "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 <map>
 #include <variant>

src/libstore/include/nix/store/derived-path-map.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "derived-path.hh"
+#include "nix/util/types.hh"
+#include "nix/store/derived-path.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/derived-path.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "outputs-spec.hh"
-#include "config.hh"
-#include "ref.hh"
+#include "nix/store/path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/configuration.hh"
+#include "nix/util/ref.hh"
 
 #include <variant>
 

src/libstore/include/nix/store/downstream-placeholder.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "hash.hh"
-#include "path.hh"
-#include "derived-path.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/path.hh"
+#include "nix/store/derived-path.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/filetransfer.hh

@@ -4,11 +4,11 @@
 #include <string>
 #include <future>
 
-#include "logging.hh"
-#include "types.hh"
-#include "ref.hh"
-#include "config.hh"
-#include "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 {
 

src/libstore/include/nix/store/gc-store.hh

@@ -3,7 +3,7 @@
 
 #include <unordered_set>
 
-#include "store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/globals.hh

@@ -1,17 +1,19 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "config.hh"
-#include "environment-variables.hh"
-#include "experimental-features.hh"
-#include "users.hh"
-
 #include <map>
 #include <limits>
 
 #include <sys/types.h>
 
+#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"
+
 namespace nix {
 
 typedef enum { smEnabled, smRelaxed, smDisabled } SandboxMode;
@@ -181,7 +183,7 @@ public:
     bool readOnlyMode = false;
 
     Setting<std::string> thisSystem{
-        this, SYSTEM, "system",
+        this, NIX_LOCAL_SYSTEM, "system",
         R"(
           The system type of the current Nix installation.
           Nix will only build a given [store derivation](@docroot@/glossary.md#gloss-store-derivation) locally when its `system` attribute equals any of the values specified here or in [`extra-platforms`](#conf-extra-platforms).
@@ -1089,7 +1091,7 @@ public:
         )"};
 #endif
 
-#if HAVE_ACL_SUPPORT
+#if NIX_SUPPORT_ACL
     Setting<StringSet> ignoredAcls{
         this, {"security.selinux", "system.nfs4_acl", "security.csm"}, "ignored-acls",
         R"(

src/libstore/include/nix/store/http-binary-cache-store.hh

@@ -1,4 +1,4 @@
-#include "binary-cache-store.hh"
+#include "nix/store/binary-cache-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/indirect-root-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "local-fs-store.hh"
+#include "nix/store/local-fs-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/keys.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "signature/local-keys.hh"
+#include "nix/util/signature/local-keys.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/legacy-ssh-store.hh

@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "common-ssh-store-config.hh"
-#include "store-api.hh"
-#include "ssh.hh"
-#include "callback.hh"
-#include "pool.hh"
-#include "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 {
 

src/libstore/include/nix/store/length-prefixed-protocol-helper.hh

@@ -8,7 +8,7 @@
  * Used by both the Worker and Serve protocols.
  */
 
-#include "types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/local-binary-cache-store.hh

@@ -1,4 +1,4 @@
-#include "binary-cache-store.hh"
+#include "nix/store/binary-cache-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/local-fs-store.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/gc-store.hh"
+#include "nix/store/log-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/local-overlay-store.hh

@@ -1,4 +1,4 @@
-#include "local-store.hh"
+#include "nix/store/local-store.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/local-store.hh

@@ -1,12 +1,12 @@
 #pragma once
 ///@file
 
-#include "sqlite.hh"
+#include "nix/store/sqlite.hh"
 
-#include "pathlocks.hh"
-#include "store-api.hh"
-#include "indirect-root-store.hh"
-#include "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 <chrono>
 #include <future>

src/libstore/include/nix/store/log-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "nix/store/store-api.hh"
 
 
 namespace nix {

src/libstore/include/nix/store/machines.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
-#include "store-reference.hh"
+#include "nix/util/ref.hh"
+#include "nix/store/store-reference.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/make-content-addressed.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/meson.build

@@ -0,0 +1,81 @@
+# Public headers directory
+
+include_dirs = [
+  include_directories('../..'),
+]
+
+config_pub_h = configure_file(
+  configuration : configdata_pub,
+  output : 'config.hh',
+)
+
+headers = [config_pub_h] + files(
+  'binary-cache-store.hh',
+  'build-result.hh',
+  'build/derivation-goal.hh',
+  'build/drv-output-substitution-goal.hh',
+  'build/goal.hh',
+  'build/substitution-goal.hh',
+  'build/worker.hh',
+  'builtins.hh',
+  'builtins/buildenv.hh',
+  'common-protocol-impl.hh',
+  'common-protocol.hh',
+  'common-ssh-store-config.hh',
+  'content-address.hh',
+  'daemon.hh',
+  'derivations.hh',
+  'derivation-options.hh',
+  'derived-path-map.hh',
+  'derived-path.hh',
+  'downstream-placeholder.hh',
+  'filetransfer.hh',
+  'gc-store.hh',
+  'globals.hh',
+  'http-binary-cache-store.hh',
+  'indirect-root-store.hh',
+  'keys.hh',
+  'legacy-ssh-store.hh',
+  'length-prefixed-protocol-helper.hh',
+  'local-binary-cache-store.hh',
+  'local-fs-store.hh',
+  'local-overlay-store.hh',
+  'local-store.hh',
+  'log-store.hh',
+  'machines.hh',
+  'make-content-addressed.hh',
+  'names.hh',
+  'nar-accessor.hh',
+  'nar-info-disk-cache.hh',
+  'nar-info.hh',
+  'outputs-spec.hh',
+  'parsed-derivations.hh',
+  'path-info.hh',
+  'path-references.hh',
+  'path-regex.hh',
+  'path-with-outputs.hh',
+  'path.hh',
+  'pathlocks.hh',
+  'posix-fs-canonicalise.hh',
+  'profiles.hh',
+  'realisation.hh',
+  'remote-fs-accessor.hh',
+  'remote-store-connection.hh',
+  'remote-store.hh',
+  's3-binary-cache-store.hh',
+  's3.hh',
+  'ssh-store.hh',
+  'serve-protocol-connection.hh',
+  'serve-protocol-impl.hh',
+  'serve-protocol.hh',
+  'sqlite.hh',
+  'ssh.hh',
+  'store-api.hh',
+  'store-cast.hh',
+  'store-dir-config.hh',
+  'store-reference.hh',
+  'uds-remote-store.hh',
+  'worker-protocol-connection.hh',
+  'worker-protocol-impl.hh',
+  'worker-protocol.hh',
+)

src/libstore/include/nix/store/names.hh

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/nar-accessor.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "source-accessor.hh"
+#include "nix/util/source-accessor.hh"
 
 #include <functional>
 

src/libstore/include/nix/store/nar-info-disk-cache.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
-#include "nar-info.hh"
-#include "realisation.hh"
+#include "nix/util/ref.hh"
+#include "nix/store/nar-info.hh"
+#include "nix/store/realisation.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/nar-info.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "hash.hh"
-#include "path-info.hh"
+#include "nix/util/types.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/path-info.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/outputs-spec.hh

@@ -6,8 +6,8 @@
 #include <set>
 #include <variant>
 
-#include "json-impls.hh"
-#include "variant-wrapper.hh"
+#include "nix/util/json-impls.hh"
+#include "nix/util/variant-wrapper.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/parsed-derivations.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "derivations.hh"
-#include "store-api.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/store-api.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libstore/include/nix/store/path-info.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "signature/signer.hh"
-#include "path.hh"
-#include "hash.hh"
-#include "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 <string>
 #include <optional>

src/libstore/include/nix/store/path-references.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "references.hh"
-#include "path.hh"
+#include "nix/util/references.hh"
+#include "nix/store/path.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/path-with-outputs.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "derived-path.hh"
+#include "nix/store/path.hh"
+#include "nix/store/derived-path.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/path.hh

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

src/libstore/include/nix/store/pathlocks.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "file-descriptor.hh"
+#include "nix/util/file-descriptor.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/posix-fs-canonicalise.hh

@@ -4,8 +4,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include "types.hh"
-#include "error.hh"
+#include "nix/util/types.hh"
+#include "nix/util/error.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/profiles.hh

@@ -7,8 +7,8 @@
  * See the manual for additional information.
  */
 
-#include "types.hh"
-#include "pathlocks.hh"
+#include "nix/util/types.hh"
+#include "nix/store/pathlocks.hh"
 
 #include <optional>
 #include <time.h>

src/libstore/include/nix/store/realisation.hh

@@ -3,12 +3,12 @@
 
 #include <variant>
 
-#include "hash.hh"
-#include "path.hh"
-#include "derived-path.hh"
+#include "nix/util/hash.hh"
+#include "nix/store/path.hh"
+#include "nix/store/derived-path.hh"
 #include <nlohmann/json_fwd.hpp>
-#include "comparator.hh"
-#include "signature/signer.hh"
+#include "nix/util/comparator.hh"
+#include "nix/util/signature/signer.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/remote-fs-accessor.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "source-accessor.hh"
-#include "ref.hh"
-#include "store-api.hh"
+#include "nix/util/source-accessor.hh"
+#include "nix/util/ref.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/remote-store-connection.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "remote-store.hh"
-#include "worker-protocol.hh"
-#include "worker-protocol-connection.hh"
-#include "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 {
 

src/libstore/include/nix/store/remote-store.hh

@@ -4,9 +4,9 @@
 #include <limits>
 #include <string>
 
-#include "store-api.hh"
-#include "gc-store.hh"
-#include "log-store.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/gc-store.hh"
+#include "nix/store/log-store.hh"
 
 
 namespace nix {

src/libstore/include/nix/store/s3-binary-cache-store.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "binary-cache-store.hh"
+#include "nix/store/binary-cache-store.hh"
 
 #include <atomic>
 

src/libstore/include/nix/store/s3.hh

@@ -3,7 +3,7 @@
 
 #if ENABLE_S3
 
-#include "ref.hh"
+#include "nix/util/ref.hh"
 
 #include <optional>
 #include <string>

src/libstore/include/nix/store/serve-protocol-connection.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "serve-protocol.hh"
-#include "store-api.hh"
+#include "nix/store/serve-protocol.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/serve-protocol-impl.hh

@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "serve-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "nix/store/serve-protocol.hh"
+#include "nix/store/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/serve-protocol.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "common-protocol.hh"
+#include "nix/store/common-protocol.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/sqlite.hh

@@ -4,7 +4,7 @@
 #include <functional>
 #include <string>
 
-#include "error.hh"
+#include "nix/util/error.hh"
 
 struct sqlite3;
 struct sqlite3_stmt;

src/libstore/include/nix/store/ssh-store.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "common-ssh-store-config.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "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 {
 

src/libstore/include/nix/store/ssh.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "sync.hh"
-#include "processes.hh"
-#include "file-system.hh"
+#include "nix/util/sync.hh"
+#include "nix/util/processes.hh"
+#include "nix/util/file-system.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/store-api.hh

@@ -1,20 +1,20 @@
 #pragma once
 ///@file
 
-#include "path.hh"
-#include "derived-path.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "serialise.hh"
-#include "lru-cache.hh"
-#include "sync.hh"
-#include "globals.hh"
-#include "config.hh"
-#include "path-info.hh"
-#include "repair-flag.hh"
-#include "store-dir-config.hh"
-#include "store-reference.hh"
-#include "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 <nlohmann/json_fwd.hpp>
 #include <atomic>

src/libstore/include/nix/store/store-cast.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/store-dir-config.hh

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "path.hh"
-#include "hash.hh"
-#include "content-address.hh"
-#include "globals.hh"
-#include "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 <map>
 #include <string>

src/libstore/include/nix/store/store-reference.hh

@@ -3,7 +3,7 @@
 
 #include <variant>
 
-#include "types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/uds-remote-store.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "remote-store.hh"
-#include "remote-store-connection.hh"
-#include "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 {
 

src/libstore/include/nix/store/worker-protocol-connection.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "worker-protocol.hh"
-#include "store-api.hh"
+#include "nix/store/worker-protocol.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/worker-protocol-impl.hh

@@ -8,8 +8,8 @@
  * contributing guide.
  */
 
-#include "worker-protocol.hh"
-#include "length-prefixed-protocol-helper.hh"
+#include "nix/store/worker-protocol.hh"
+#include "nix/store/length-prefixed-protocol-helper.hh"
 
 namespace nix {
 

src/libstore/include/nix/store/worker-protocol.hh

@@ -3,7 +3,7 @@
 
 #include <chrono>
 
-#include "common-protocol.hh"
+#include "nix/store/common-protocol.hh"
 
 namespace nix {
 

src/libstore/indirect-root-store.cc

@@ -1,4 +1,4 @@
-#include "indirect-root-store.hh"
+#include "nix/store/indirect-root-store.hh"
 
 namespace nix {
 

src/libstore/keys.cc

@@ -1,6 +1,6 @@
-#include "file-system.hh"
-#include "globals.hh"
-#include "keys.hh"
+#include "nix/util/file-system.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/keys.hh"
 
 namespace nix {
 

src/libstore/legacy-ssh-store.cc

@@ -1,17 +1,17 @@
-#include "legacy-ssh-store.hh"
-#include "common-ssh-store-config.hh"
-#include "archive.hh"
-#include "pool.hh"
-#include "remote-store.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-connection.hh"
-#include "serve-protocol-impl.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "path-with-outputs.hh"
-#include "ssh.hh"
-#include "derivations.hh"
-#include "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 {
 

src/libstore/linux/include/nix/store/fchmodat2-compat.hh

@@ -1,3 +1,5 @@
+#include "store-config-private.hh"
+
 /*
  * Determine the syscall number for `fchmodat2`.
  *

src/libstore/linux/include/nix/store/meson.build

@@ -0,0 +1,6 @@
+include_dirs += include_directories('../..')
+
+headers += files(
+  'fchmodat2-compat.hh',
+  'personality.hh',
+)