diff options
Diffstat (limited to 'third_party/nix/src/libstore')
55 files changed, 225 insertions, 221 deletions
diff --git a/third_party/nix/src/libstore/binary-cache-store.cc b/third_party/nix/src/libstore/binary-cache-store.cc index f631c9dee2..b862ea0058 100644 --- a/third_party/nix/src/libstore/binary-cache-store.cc +++ b/third_party/nix/src/libstore/binary-cache-store.cc @@ -1,4 +1,4 @@ -#include "binary-cache-store.hh" +#include "libstore/binary-cache-store.hh" #include <chrono> #include <future> @@ -7,19 +7,19 @@ #include <absl/strings/ascii.h> #include <absl/strings/numbers.h> #include <absl/strings/str_split.h> - -#include "archive.hh" -#include "compression.hh" -#include "derivations.hh" -#include "fs-accessor.hh" -#include "globals.hh" -#include "glog/logging.h" -#include "json.hh" -#include "nar-accessor.hh" -#include "nar-info-disk-cache.hh" -#include "nar-info.hh" -#include "remote-fs-accessor.hh" -#include "sync.hh" +#include <glog/logging.h> + +#include "libstore/derivations.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/globals.hh" +#include "libstore/nar-accessor.hh" +#include "libstore/nar-info-disk-cache.hh" +#include "libstore/nar-info.hh" +#include "libstore/remote-fs-accessor.hh" +#include "libutil/archive.hh" +#include "libutil/compression.hh" +#include "libutil/json.hh" +#include "libutil/sync.hh" namespace nix { diff --git a/third_party/nix/src/libstore/binary-cache-store.hh b/third_party/nix/src/libstore/binary-cache-store.hh index b8e1ccabf2..0b788152f0 100644 --- a/third_party/nix/src/libstore/binary-cache-store.hh +++ b/third_party/nix/src/libstore/binary-cache-store.hh @@ -2,9 +2,9 @@ #include <atomic> -#include "crypto.hh" -#include "pool.hh" -#include "store-api.hh" +#include "libstore/crypto.hh" +#include "libstore/store-api.hh" +#include "libutil/pool.hh" namespace nix { diff --git a/third_party/nix/src/libstore/build.cc b/third_party/nix/src/libstore/build.cc index a60f5ef173..0b4bce1820 100644 --- a/third_party/nix/src/libstore/build.cc +++ b/third_party/nix/src/libstore/build.cc @@ -17,6 +17,7 @@ #include <absl/strings/numbers.h> #include <absl/strings/str_split.h> #include <fcntl.h> +#include <glog/logging.h> #include <grp.h> #include <netdb.h> #include <pwd.h> @@ -31,22 +32,21 @@ #include <termios.h> #include <unistd.h> -#include "affinity.hh" -#include "archive.hh" -#include "builtins.hh" -#include "compression.hh" -#include "download.hh" -#include "finally.hh" -#include "globals.hh" -#include "glog/logging.h" -#include "json.hh" -#include "local-store.hh" -#include "machines.hh" -#include "nar-info.hh" -#include "parsed-derivations.hh" -#include "pathlocks.hh" -#include "references.hh" -#include "util.hh" +#include "libstore/builtins.hh" +#include "libstore/download.hh" +#include "libstore/globals.hh" +#include "libstore/local-store.hh" +#include "libstore/machines.hh" +#include "libstore/nar-info.hh" +#include "libstore/parsed-derivations.hh" +#include "libstore/pathlocks.hh" +#include "libstore/references.hh" +#include "libutil/affinity.hh" +#include "libutil/archive.hh" +#include "libutil/compression.hh" +#include "libutil/finally.hh" +#include "libutil/json.hh" +#include "libutil/util.hh" /* Includes required for chroot support. */ #if __linux__ diff --git a/third_party/nix/src/libstore/builtins.hh b/third_party/nix/src/libstore/builtins.hh index 07601be0f5..bc53e78ebc 100644 --- a/third_party/nix/src/libstore/builtins.hh +++ b/third_party/nix/src/libstore/builtins.hh @@ -1,6 +1,6 @@ #pragma once -#include "derivations.hh" +#include "libstore/derivations.hh" namespace nix { diff --git a/third_party/nix/src/libstore/builtins/buildenv.cc b/third_party/nix/src/libstore/builtins/buildenv.cc index db093663bf..95f915227b 100644 --- a/third_party/nix/src/libstore/builtins/buildenv.cc +++ b/third_party/nix/src/libstore/builtins/buildenv.cc @@ -7,7 +7,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include "builtins.hh" +#include "libstore/builtins.hh" namespace nix { diff --git a/third_party/nix/src/libstore/builtins/fetchurl.cc b/third_party/nix/src/libstore/builtins/fetchurl.cc index 90814f6d7f..867a120e8d 100644 --- a/third_party/nix/src/libstore/builtins/fetchurl.cc +++ b/third_party/nix/src/libstore/builtins/fetchurl.cc @@ -1,11 +1,11 @@ #include <absl/strings/match.h> #include <glog/logging.h> -#include "archive.hh" -#include "builtins.hh" -#include "compression.hh" -#include "download.hh" -#include "store-api.hh" +#include "libstore/builtins.hh" +#include "libstore/download.hh" +#include "libstore/store-api.hh" +#include "libutil/archive.hh" +#include "libutil/compression.hh" namespace nix { diff --git a/third_party/nix/src/libstore/crypto.cc b/third_party/nix/src/libstore/crypto.cc index eb5bb66707..62b3c05ff9 100644 --- a/third_party/nix/src/libstore/crypto.cc +++ b/third_party/nix/src/libstore/crypto.cc @@ -1,7 +1,7 @@ -#include "crypto.hh" +#include "libstore/crypto.hh" -#include "globals.hh" -#include "util.hh" +#include "libstore/globals.hh" +#include "libutil/util.hh" #if HAVE_SODIUM #include <sodium.h> diff --git a/third_party/nix/src/libstore/crypto.hh b/third_party/nix/src/libstore/crypto.hh index ef578db6d0..e282f4f8ef 100644 --- a/third_party/nix/src/libstore/crypto.hh +++ b/third_party/nix/src/libstore/crypto.hh @@ -2,7 +2,7 @@ #include <map> -#include "types.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/derivations.cc b/third_party/nix/src/libstore/derivations.cc index b2590f5e28..64d1c6a151 100644 --- a/third_party/nix/src/libstore/derivations.cc +++ b/third_party/nix/src/libstore/derivations.cc @@ -1,15 +1,15 @@ -#include "derivations.hh" +#include "libstore/derivations.hh" #include <absl/strings/match.h> #include <absl/strings/str_split.h> #include <absl/strings/string_view.h> -#include "fs-accessor.hh" -#include "globals.hh" -#include "istringstream_nocopy.hh" -#include "store-api.hh" -#include "util.hh" -#include "worker-protocol.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/globals.hh" +#include "libstore/store-api.hh" +#include "libstore/worker-protocol.hh" +#include "libutil/istringstream_nocopy.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/derivations.hh b/third_party/nix/src/libstore/derivations.hh index 170f09804d..7574aa90c2 100644 --- a/third_party/nix/src/libstore/derivations.hh +++ b/third_party/nix/src/libstore/derivations.hh @@ -2,9 +2,9 @@ #include <map> -#include "hash.hh" -#include "store-api.hh" -#include "types.hh" +#include "libstore/store-api.hh" +#include "libutil/hash.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/download.cc b/third_party/nix/src/libstore/download.cc index 92a6308728..f30642d69d 100644 --- a/third_party/nix/src/libstore/download.cc +++ b/third_party/nix/src/libstore/download.cc @@ -1,19 +1,19 @@ -#include "download.hh" +#include "libstore/download.hh" #include <absl/strings/ascii.h> #include <absl/strings/match.h> #include <absl/strings/numbers.h> #include <absl/strings/str_split.h> -#include "archive.hh" -#include "compression.hh" -#include "finally.hh" -#include "globals.hh" -#include "hash.hh" -#include "pathlocks.hh" -#include "s3.hh" -#include "store-api.hh" -#include "util.hh" +#include "libstore/globals.hh" +#include "libstore/pathlocks.hh" +#include "libstore/s3.hh" +#include "libstore/store-api.hh" +#include "libutil/archive.hh" +#include "libutil/compression.hh" +#include "libutil/finally.hh" +#include "libutil/hash.hh" +#include "libutil/util.hh" #ifdef ENABLE_S3 #include <aws/core/client/ClientConfiguration.h> diff --git a/third_party/nix/src/libstore/download.hh b/third_party/nix/src/libstore/download.hh index a988ec6826..cbfab5f40d 100644 --- a/third_party/nix/src/libstore/download.hh +++ b/third_party/nix/src/libstore/download.hh @@ -3,9 +3,9 @@ #include <future> #include <string> -#include "globals.hh" -#include "hash.hh" -#include "types.hh" +#include "libstore/globals.hh" +#include "libutil/hash.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/export-import.cc b/third_party/nix/src/libstore/export-import.cc index 077b0d5390..8e93144339 100644 --- a/third_party/nix/src/libstore/export-import.cc +++ b/third_party/nix/src/libstore/export-import.cc @@ -1,8 +1,8 @@ #include <algorithm> -#include "archive.hh" -#include "store-api.hh" -#include "worker-protocol.hh" +#include "libstore/store-api.hh" +#include "libstore/worker-protocol.hh" +#include "libutil/archive.hh" namespace nix { diff --git a/third_party/nix/src/libstore/fs-accessor.hh b/third_party/nix/src/libstore/fs-accessor.hh index ad0d7f0ed9..1bc1373dcb 100644 --- a/third_party/nix/src/libstore/fs-accessor.hh +++ b/third_party/nix/src/libstore/fs-accessor.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/gc.cc b/third_party/nix/src/libstore/gc.cc index 5c1ea3d58b..9a6d97eb73 100644 --- a/third_party/nix/src/libstore/gc.cc +++ b/third_party/nix/src/libstore/gc.cc @@ -9,16 +9,16 @@ #include <absl/strings/match.h> #include <absl/strings/str_split.h> #include <fcntl.h> +#include <glog/logging.h> #include <sys/stat.h> #include <sys/statvfs.h> #include <sys/types.h> #include <unistd.h> -#include "derivations.hh" -#include "finally.hh" -#include "globals.hh" -#include "glog/logging.h" -#include "local-store.hh" +#include "libstore/derivations.hh" +#include "libstore/globals.hh" +#include "libstore/local-store.hh" +#include "libutil/finally.hh" namespace nix { diff --git a/third_party/nix/src/libstore/globals.cc b/third_party/nix/src/libstore/globals.cc index f218534cc9..dccf8d9815 100644 --- a/third_party/nix/src/libstore/globals.cc +++ b/third_party/nix/src/libstore/globals.cc @@ -1,4 +1,4 @@ -#include "globals.hh" +#include "libstore/globals.hh" #include <algorithm> #include <map> @@ -9,9 +9,10 @@ #include <absl/strings/str_split.h> #include <dlfcn.h> -#include "archive.hh" -#include "args.hh" -#include "util.hh" +#include "libutil/archive.hh" +#include "libutil/args.hh" +#include "libutil/util.hh" +#include "nix_config.h" namespace nix { diff --git a/third_party/nix/src/libstore/globals.hh b/third_party/nix/src/libstore/globals.hh index feff548790..567ec6c42b 100644 --- a/third_party/nix/src/libstore/globals.hh +++ b/third_party/nix/src/libstore/globals.hh @@ -5,9 +5,10 @@ #include <sys/types.h> -#include "config.hh" -#include "types.hh" -#include "util.hh" +#include "libutil/config.hh" +#include "libutil/types.hh" +#include "libutil/util.hh" +#include "nix_config.h" namespace nix { diff --git a/third_party/nix/src/libstore/http-binary-cache-store.cc b/third_party/nix/src/libstore/http-binary-cache-store.cc index c75d5f2860..8ab07033b1 100644 --- a/third_party/nix/src/libstore/http-binary-cache-store.cc +++ b/third_party/nix/src/libstore/http-binary-cache-store.cc @@ -2,10 +2,10 @@ #include <glog/logging.h> -#include "binary-cache-store.hh" -#include "download.hh" -#include "globals.hh" -#include "nar-info-disk-cache.hh" +#include "libstore/binary-cache-store.hh" +#include "libstore/download.hh" +#include "libstore/globals.hh" +#include "libstore/nar-info-disk-cache.hh" namespace nix { diff --git a/third_party/nix/src/libstore/legacy-ssh-store.cc b/third_party/nix/src/libstore/legacy-ssh-store.cc index 9e6870f0da..332f6676b2 100644 --- a/third_party/nix/src/libstore/legacy-ssh-store.cc +++ b/third_party/nix/src/libstore/legacy-ssh-store.cc @@ -1,12 +1,13 @@ -#include "archive.hh" -#include "derivations.hh" -#include "glog/logging.h" -#include "pool.hh" -#include "remote-store.hh" -#include "serve-protocol.hh" -#include "ssh.hh" -#include "store-api.hh" -#include "worker-protocol.hh" +#include <glog/logging.h> + +#include "libstore/derivations.hh" +#include "libstore/remote-store.hh" +#include "libstore/serve-protocol.hh" +#include "libstore/ssh.hh" +#include "libstore/store-api.hh" +#include "libstore/worker-protocol.hh" +#include "libutil/archive.hh" +#include "libutil/pool.hh" namespace nix { diff --git a/third_party/nix/src/libstore/local-binary-cache-store.cc b/third_party/nix/src/libstore/local-binary-cache-store.cc index 88dd19a320..4555de5047 100644 --- a/third_party/nix/src/libstore/local-binary-cache-store.cc +++ b/third_party/nix/src/libstore/local-binary-cache-store.cc @@ -2,9 +2,9 @@ #include <absl/strings/match.h> -#include "binary-cache-store.hh" -#include "globals.hh" -#include "nar-info-disk-cache.hh" +#include "libstore/binary-cache-store.hh" +#include "libstore/globals.hh" +#include "libstore/nar-info-disk-cache.hh" namespace nix { diff --git a/third_party/nix/src/libstore/local-fs-store.cc b/third_party/nix/src/libstore/local-fs-store.cc index f11c84b182..2dd09093d5 100644 --- a/third_party/nix/src/libstore/local-fs-store.cc +++ b/third_party/nix/src/libstore/local-fs-store.cc @@ -1,9 +1,9 @@ -#include "archive.hh" -#include "compression.hh" -#include "derivations.hh" -#include "fs-accessor.hh" -#include "globals.hh" -#include "store-api.hh" +#include "libstore/derivations.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/globals.hh" +#include "libstore/store-api.hh" +#include "libutil/archive.hh" +#include "libutil/compression.hh" namespace nix { diff --git a/third_party/nix/src/libstore/local-store.cc b/third_party/nix/src/libstore/local-store.cc index ebc9129694..f9d03c520a 100644 --- a/third_party/nix/src/libstore/local-store.cc +++ b/third_party/nix/src/libstore/local-store.cc @@ -1,4 +1,4 @@ -#include "local-store.hh" +#include "libstore/local-store.hh" #include <algorithm> #include <cerrno> @@ -25,12 +25,13 @@ #include <unistd.h> #include <utime.h> -#include "archive.hh" -#include "derivations.hh" -#include "globals.hh" -#include "nar-info.hh" -#include "pathlocks.hh" -#include "worker-protocol.hh" +#include "generated/schema.sql.hh" +#include "libstore/derivations.hh" +#include "libstore/globals.hh" +#include "libstore/nar-info.hh" +#include "libstore/pathlocks.hh" +#include "libstore/worker-protocol.hh" +#include "libutil/archive.hh" namespace nix { diff --git a/third_party/nix/src/libstore/local-store.hh b/third_party/nix/src/libstore/local-store.hh index 178cadf92b..7ad9de3a8a 100644 --- a/third_party/nix/src/libstore/local-store.hh +++ b/third_party/nix/src/libstore/local-store.hh @@ -7,11 +7,11 @@ #include <absl/strings/str_split.h> -#include "pathlocks.hh" -#include "sqlite.hh" -#include "store-api.hh" -#include "sync.hh" -#include "util.hh" +#include "libstore/pathlocks.hh" +#include "libstore/sqlite.hh" +#include "libstore/store-api.hh" +#include "libutil/sync.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/machines.cc b/third_party/nix/src/libstore/machines.cc index 9ad20a25f8..e5d22c534c 100644 --- a/third_party/nix/src/libstore/machines.cc +++ b/third_party/nix/src/libstore/machines.cc @@ -1,4 +1,4 @@ -#include "machines.hh" +#include "libstore/machines.hh" #include <algorithm> @@ -8,8 +8,8 @@ #include <absl/strings/string_view.h> #include <glog/logging.h> -#include "globals.hh" -#include "util.hh" +#include "libstore/globals.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/machines.hh b/third_party/nix/src/libstore/machines.hh index 23712e6760..0e72697237 100644 --- a/third_party/nix/src/libstore/machines.hh +++ b/third_party/nix/src/libstore/machines.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/misc.cc b/third_party/nix/src/libstore/misc.cc index f95c4bec8b..8a05d55acc 100644 --- a/third_party/nix/src/libstore/misc.cc +++ b/third_party/nix/src/libstore/misc.cc @@ -1,11 +1,11 @@ #include <glog/logging.h> -#include "derivations.hh" -#include "globals.hh" -#include "local-store.hh" -#include "parsed-derivations.hh" -#include "store-api.hh" -#include "thread-pool.hh" +#include "libstore/derivations.hh" +#include "libstore/globals.hh" +#include "libstore/local-store.hh" +#include "libstore/parsed-derivations.hh" +#include "libstore/store-api.hh" +#include "libutil/thread-pool.hh" namespace nix { diff --git a/third_party/nix/src/libstore/nar-accessor.cc b/third_party/nix/src/libstore/nar-accessor.cc index 84bfb531ec..49fa1bd1d6 100644 --- a/third_party/nix/src/libstore/nar-accessor.cc +++ b/third_party/nix/src/libstore/nar-accessor.cc @@ -1,4 +1,4 @@ -#include "nar-accessor.hh" +#include "libstore/nar-accessor.hh" #include <algorithm> #include <map> @@ -6,8 +6,8 @@ #include <stack> #include <utility> -#include "archive.hh" -#include "json.hh" +#include "libutil/archive.hh" +#include "libutil/json.hh" namespace nix { diff --git a/third_party/nix/src/libstore/nar-accessor.hh b/third_party/nix/src/libstore/nar-accessor.hh index 8b18d4a36e..0906a4606e 100644 --- a/third_party/nix/src/libstore/nar-accessor.hh +++ b/third_party/nix/src/libstore/nar-accessor.hh @@ -2,7 +2,7 @@ #include <functional> -#include "fs-accessor.hh" +#include "libstore/fs-accessor.hh" namespace nix { diff --git a/third_party/nix/src/libstore/nar-info-disk-cache.cc b/third_party/nix/src/libstore/nar-info-disk-cache.cc index 0a7a0dc22c..c98882bff3 100644 --- a/third_party/nix/src/libstore/nar-info-disk-cache.cc +++ b/third_party/nix/src/libstore/nar-info-disk-cache.cc @@ -1,13 +1,13 @@ -#include "nar-info-disk-cache.hh" +#include "libstore/nar-info-disk-cache.hh" #include <absl/strings/str_cat.h> #include <absl/strings/str_split.h> #include <glog/logging.h> #include <sqlite3.h> -#include "globals.hh" -#include "sqlite.hh" -#include "sync.hh" +#include "libstore/globals.hh" +#include "libstore/sqlite.hh" +#include "libutil/sync.hh" namespace nix { diff --git a/third_party/nix/src/libstore/nar-info-disk-cache.hh b/third_party/nix/src/libstore/nar-info-disk-cache.hh index 65bb773c92..b4107721aa 100644 --- a/third_party/nix/src/libstore/nar-info-disk-cache.hh +++ b/third_party/nix/src/libstore/nar-info-disk-cache.hh @@ -1,7 +1,7 @@ #pragma once -#include "nar-info.hh" -#include "ref.hh" +#include "libstore/nar-info.hh" +#include "libutil/ref.hh" namespace nix { diff --git a/third_party/nix/src/libstore/nar-info.cc b/third_party/nix/src/libstore/nar-info.cc index 1dc0b54cf1..aa764f4a16 100644 --- a/third_party/nix/src/libstore/nar-info.cc +++ b/third_party/nix/src/libstore/nar-info.cc @@ -1,9 +1,9 @@ -#include "nar-info.hh" +#include "libstore/nar-info.hh" #include <absl/strings/numbers.h> #include <absl/strings/str_split.h> -#include "globals.hh" +#include "libstore/globals.hh" namespace nix { diff --git a/third_party/nix/src/libstore/nar-info.hh b/third_party/nix/src/libstore/nar-info.hh index ce362e703f..48eccf8302 100644 --- a/third_party/nix/src/libstore/nar-info.hh +++ b/third_party/nix/src/libstore/nar-info.hh @@ -1,8 +1,8 @@ #pragma once -#include "hash.hh" -#include "store-api.hh" -#include "types.hh" +#include "libstore/store-api.hh" +#include "libutil/hash.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/optimise-store.cc b/third_party/nix/src/libstore/optimise-store.cc index 7217d54ca9..eb24633c18 100644 --- a/third_party/nix/src/libstore/optimise-store.cc +++ b/third_party/nix/src/libstore/optimise-store.cc @@ -5,14 +5,14 @@ #include <regex> #include <utility> +#include <glog/logging.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -#include "globals.hh" -#include "glog/logging.h" -#include "local-store.hh" -#include "util.hh" +#include "libstore/globals.hh" +#include "libstore/local-store.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/parsed-derivations.cc b/third_party/nix/src/libstore/parsed-derivations.cc index 571f49ad59..9ee93b6a6d 100644 --- a/third_party/nix/src/libstore/parsed-derivations.cc +++ b/third_party/nix/src/libstore/parsed-derivations.cc @@ -1,4 +1,4 @@ -#include "parsed-derivations.hh" +#include "libstore/parsed-derivations.hh" #include <absl/strings/str_split.h> diff --git a/third_party/nix/src/libstore/parsed-derivations.hh b/third_party/nix/src/libstore/parsed-derivations.hh index 7b2da3b566..7cd3d36f67 100644 --- a/third_party/nix/src/libstore/parsed-derivations.hh +++ b/third_party/nix/src/libstore/parsed-derivations.hh @@ -1,6 +1,6 @@ #include <nlohmann/json.hpp> -#include "derivations.hh" +#include "libstore/derivations.hh" namespace nix { diff --git a/third_party/nix/src/libstore/pathlocks.cc b/third_party/nix/src/libstore/pathlocks.cc index 642e64a62b..4b153856d2 100644 --- a/third_party/nix/src/libstore/pathlocks.cc +++ b/third_party/nix/src/libstore/pathlocks.cc @@ -1,4 +1,4 @@ -#include "pathlocks.hh" +#include "libstore/pathlocks.hh" #include <cerrno> #include <cstdlib> @@ -9,8 +9,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include "sync.hh" -#include "util.hh" +#include "libutil/sync.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/pathlocks.hh b/third_party/nix/src/libstore/pathlocks.hh index 201e3f01b4..d515963e76 100644 --- a/third_party/nix/src/libstore/pathlocks.hh +++ b/third_party/nix/src/libstore/pathlocks.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/profiles.cc b/third_party/nix/src/libstore/profiles.cc index 53e6487995..0d44c60cc4 100644 --- a/third_party/nix/src/libstore/profiles.cc +++ b/third_party/nix/src/libstore/profiles.cc @@ -1,4 +1,4 @@ -#include "profiles.hh" +#include "libstore/profiles.hh" #include <cerrno> #include <cstdio> @@ -11,8 +11,8 @@ #include <sys/types.h> #include <unistd.h> -#include "store-api.hh" -#include "util.hh" +#include "libstore/store-api.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/profiles.hh b/third_party/nix/src/libstore/profiles.hh index 9f31083b32..ff63990409 100644 --- a/third_party/nix/src/libstore/profiles.hh +++ b/third_party/nix/src/libstore/profiles.hh @@ -2,8 +2,8 @@ #include <time.h> -#include "pathlocks.hh" -#include "types.hh" +#include "libstore/pathlocks.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/references.cc b/third_party/nix/src/libstore/references.cc index 6b9b7137c4..ea9ce44275 100644 --- a/third_party/nix/src/libstore/references.cc +++ b/third_party/nix/src/libstore/references.cc @@ -1,13 +1,13 @@ -#include "references.hh" +#include "libstore/references.hh" #include <cstdlib> #include <map> #include <glog/logging.h> -#include "archive.hh" -#include "hash.hh" -#include "util.hh" +#include "libutil/archive.hh" +#include "libutil/hash.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/references.hh b/third_party/nix/src/libstore/references.hh index 2229150e33..94ac5200bd 100644 --- a/third_party/nix/src/libstore/references.hh +++ b/third_party/nix/src/libstore/references.hh @@ -1,7 +1,7 @@ #pragma once -#include "hash.hh" -#include "types.hh" +#include "libutil/hash.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libstore/remote-fs-accessor.cc b/third_party/nix/src/libstore/remote-fs-accessor.cc index ca478c213f..2917f01f79 100644 --- a/third_party/nix/src/libstore/remote-fs-accessor.cc +++ b/third_party/nix/src/libstore/remote-fs-accessor.cc @@ -1,11 +1,11 @@ -#include "remote-fs-accessor.hh" +#include "libstore/remote-fs-accessor.hh" #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -#include "json.hh" -#include "nar-accessor.hh" +#include "libstore/nar-accessor.hh" +#include "libutil/json.hh" namespace nix { diff --git a/third_party/nix/src/libstore/remote-fs-accessor.hh b/third_party/nix/src/libstore/remote-fs-accessor.hh index 32c729f50d..c4f6e89c97 100644 --- a/third_party/nix/src/libstore/remote-fs-accessor.hh +++ b/third_party/nix/src/libstore/remote-fs-accessor.hh @@ -1,8 +1,8 @@ #pragma once -#include "fs-accessor.hh" -#include "ref.hh" -#include "store-api.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/store-api.hh" +#include "libutil/ref.hh" namespace nix { diff --git a/third_party/nix/src/libstore/remote-store.cc b/third_party/nix/src/libstore/remote-store.cc index c5d1dac6cb..5c5038dc41 100644 --- a/third_party/nix/src/libstore/remote-store.cc +++ b/third_party/nix/src/libstore/remote-store.cc @@ -1,4 +1,4 @@ -#include "remote-store.hh" +#include "libstore/remote-store.hh" #include <cerrno> #include <cstring> @@ -12,16 +12,16 @@ #include <sys/un.h> #include <unistd.h> -#include "affinity.hh" -#include "archive.hh" -#include "derivations.hh" -#include "finally.hh" -#include "globals.hh" -#include "pool.hh" -#include "prefork-compat.hh" -#include "serialise.hh" -#include "util.hh" -#include "worker-protocol.hh" +#include "libstore/derivations.hh" +#include "libstore/globals.hh" +#include "libstore/worker-protocol.hh" +#include "libutil/affinity.hh" +#include "libutil/archive.hh" +#include "libutil/finally.hh" +#include "libutil/pool.hh" +#include "libutil/prefork-compat.hh" +#include "libutil/serialise.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/remote-store.hh b/third_party/nix/src/libstore/remote-store.hh index e61e72892c..03fbbf000c 100644 --- a/third_party/nix/src/libstore/remote-store.hh +++ b/third_party/nix/src/libstore/remote-store.hh @@ -3,7 +3,7 @@ #include <limits> #include <string> -#include "store-api.hh" +#include "libstore/store-api.hh" namespace nix { diff --git a/third_party/nix/src/libstore/s3-binary-cache-store.cc b/third_party/nix/src/libstore/s3-binary-cache-store.cc index d713c5ce01..0c13039b52 100644 --- a/third_party/nix/src/libstore/s3-binary-cache-store.cc +++ b/third_party/nix/src/libstore/s3-binary-cache-store.cc @@ -1,6 +1,6 @@ #if ENABLE_S3 -#include "s3-binary-cache-store.hh" +#include "libstore/s3-binary-cache-store.hh" #include <absl/strings/ascii.h> #include <absl/strings/match.h> @@ -20,13 +20,13 @@ #include <aws/s3/model/PutObjectRequest.h> #include <aws/transfer/TransferManager.h> -#include "compression.hh" -#include "download.hh" -#include "globals.hh" -#include "istringstream_nocopy.hh" -#include "nar-info-disk-cache.hh" -#include "nar-info.hh" -#include "s3.hh" +#include "libstore/download.hh" +#include "libstore/globals.hh" +#include "libstore/nar-info-disk-cache.hh" +#include "libstore/nar-info.hh" +#include "libstore/s3.hh" +#include "libutil/compression.hh" +#include "libutil/istringstream_nocopy.hh" using namespace Aws::Transfer; diff --git a/third_party/nix/src/libstore/s3-binary-cache-store.hh b/third_party/nix/src/libstore/s3-binary-cache-store.hh index 24cb67721a..3d0d0b3c44 100644 --- a/third_party/nix/src/libstore/s3-binary-cache-store.hh +++ b/third_party/nix/src/libstore/s3-binary-cache-store.hh @@ -2,7 +2,7 @@ #include <atomic> -#include "binary-cache-store.hh" +#include "libstore/binary-cache-store.hh" namespace nix { diff --git a/third_party/nix/src/libstore/s3.hh b/third_party/nix/src/libstore/s3.hh index 09935fabed..4f1852dc3d 100644 --- a/third_party/nix/src/libstore/s3.hh +++ b/third_party/nix/src/libstore/s3.hh @@ -2,7 +2,7 @@ #if ENABLE_S3 -#include "ref.hh" +#include "libutil/ref.hh" namespace Aws { namespace Client { diff --git a/third_party/nix/src/libstore/sqlite.cc b/third_party/nix/src/libstore/sqlite.cc index dbdaa29d4f..b6ecfce924 100644 --- a/third_party/nix/src/libstore/sqlite.cc +++ b/third_party/nix/src/libstore/sqlite.cc @@ -1,11 +1,11 @@ -#include "sqlite.hh" +#include "libstore/sqlite.hh" #include <atomic> #include <glog/logging.h> #include <sqlite3.h> -#include "util.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/sqlite.hh b/third_party/nix/src/libstore/sqlite.hh index 298bb574ea..c0bc70bfc1 100644 --- a/third_party/nix/src/libstore/sqlite.hh +++ b/third_party/nix/src/libstore/sqlite.hh @@ -3,7 +3,7 @@ #include <functional> #include <string> -#include "types.hh" +#include "libutil/types.hh" class sqlite3; class sqlite3_stmt; diff --git a/third_party/nix/src/libstore/ssh-store.cc b/third_party/nix/src/libstore/ssh-store.cc index 9c49babcf2..eae8ee888b 100644 --- a/third_party/nix/src/libstore/ssh-store.cc +++ b/third_party/nix/src/libstore/ssh-store.cc @@ -1,10 +1,10 @@ -#include "archive.hh" -#include "pool.hh" -#include "remote-fs-accessor.hh" -#include "remote-store.hh" -#include "ssh.hh" -#include "store-api.hh" -#include "worker-protocol.hh" +#include "libstore/remote-fs-accessor.hh" +#include "libstore/remote-store.hh" +#include "libstore/ssh.hh" +#include "libstore/store-api.hh" +#include "libstore/worker-protocol.hh" +#include "libutil/archive.hh" +#include "libutil/pool.hh" namespace nix { diff --git a/third_party/nix/src/libstore/ssh.cc b/third_party/nix/src/libstore/ssh.cc index 1b09eb42c6..e84944c4c9 100644 --- a/third_party/nix/src/libstore/ssh.cc +++ b/third_party/nix/src/libstore/ssh.cc @@ -1,4 +1,4 @@ -#include "ssh.hh" +#include "libstore/ssh.hh" #include <utility> diff --git a/third_party/nix/src/libstore/ssh.hh b/third_party/nix/src/libstore/ssh.hh index 23952ccb12..9844f89d35 100644 --- a/third_party/nix/src/libstore/ssh.hh +++ b/third_party/nix/src/libstore/ssh.hh @@ -1,7 +1,7 @@ #pragma once -#include "sync.hh" -#include "util.hh" +#include "libutil/sync.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libstore/store-api.cc b/third_party/nix/src/libstore/store-api.cc index afdbc14e29..081cdea987 100644 --- a/third_party/nix/src/libstore/store-api.cc +++ b/third_party/nix/src/libstore/store-api.cc @@ -1,4 +1,4 @@ -#include "store-api.hh" +#include "libstore/store-api.hh" #include <future> #include <utility> @@ -8,13 +8,13 @@ #include <absl/strings/str_split.h> #include <glog/logging.h> -#include "crypto.hh" -#include "derivations.hh" -#include "globals.hh" -#include "json.hh" -#include "nar-info-disk-cache.hh" -#include "thread-pool.hh" -#include "util.hh" +#include "libstore/crypto.hh" +#include "libstore/derivations.hh" +#include "libstore/globals.hh" +#include "libstore/nar-info-disk-cache.hh" +#include "libutil/json.hh" +#include "libutil/thread-pool.hh" +#include "libutil/util.hh" namespace nix { @@ -844,8 +844,8 @@ void Store::addToStore(const ValidPathInfo& info, const ref<std::string>& nar, } // namespace nix -#include "local-store.hh" -#include "remote-store.hh" +#include "libstore/local-store.hh" +#include "libstore/remote-store.hh" namespace nix { diff --git a/third_party/nix/src/libstore/store-api.hh b/third_party/nix/src/libstore/store-api.hh index cf2520c6ca..c6f8d75b67 100644 --- a/third_party/nix/src/libstore/store-api.hh +++ b/third_party/nix/src/libstore/store-api.hh @@ -8,13 +8,13 @@ #include <unordered_map> #include <unordered_set> -#include "config.hh" -#include "crypto.hh" -#include "globals.hh" -#include "hash.hh" -#include "lru-cache.hh" -#include "serialise.hh" -#include "sync.hh" +#include "libstore/crypto.hh" +#include "libstore/globals.hh" +#include "libutil/config.hh" +#include "libutil/hash.hh" +#include "libutil/lru-cache.hh" +#include "libutil/serialise.hh" +#include "libutil/sync.hh" namespace nix { |