diff options
Diffstat (limited to 'third_party/nix/src/nix')
28 files changed, 147 insertions, 147 deletions
diff --git a/third_party/nix/src/nix/add-to-store.cc b/third_party/nix/src/nix/add-to-store.cc index b7fda9c9d390..f99fa30be07f 100644 --- a/third_party/nix/src/nix/add-to-store.cc +++ b/third_party/nix/src/nix/add-to-store.cc @@ -1,7 +1,7 @@ -#include "archive.hh" -#include "command.hh" -#include "common-args.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libstore/store-api.hh" +#include "libutil/archive.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/build.cc b/third_party/nix/src/nix/build.cc index 9ab2d27e0fc9..d5bdb7a379a7 100644 --- a/third_party/nix/src/nix/build.cc +++ b/third_party/nix/src/nix/build.cc @@ -1,7 +1,7 @@ -#include "command.hh" -#include "common-args.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/cat.cc b/third_party/nix/src/nix/cat.cc index 2d662a453f54..49471100cfd0 100644 --- a/third_party/nix/src/nix/cat.cc +++ b/third_party/nix/src/nix/cat.cc @@ -1,7 +1,7 @@ -#include "command.hh" -#include "fs-accessor.hh" -#include "nar-accessor.hh" -#include "store-api.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/nar-accessor.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/command.cc b/third_party/nix/src/nix/command.cc index 34fcde80033e..f7f183ab0ab7 100644 --- a/third_party/nix/src/nix/command.cc +++ b/third_party/nix/src/nix/command.cc @@ -1,9 +1,9 @@ -#include "command.hh" +#include "nix/command.hh" #include <utility> -#include "derivations.hh" -#include "store-api.hh" +#include "libstore/derivations.hh" +#include "libstore/store-api.hh" namespace nix { diff --git a/third_party/nix/src/nix/command.hh b/third_party/nix/src/nix/command.hh index c297bfbd38dd..813fdb557d82 100644 --- a/third_party/nix/src/nix/command.hh +++ b/third_party/nix/src/nix/command.hh @@ -1,7 +1,7 @@ #pragma once -#include "args.hh" -#include "common-eval-args.hh" +#include "libexpr/common-eval-args.hh" +#include "libutil/args.hh" namespace nix { diff --git a/third_party/nix/src/nix/copy.cc b/third_party/nix/src/nix/copy.cc index 633fe399b48c..a527d40cfafd 100644 --- a/third_party/nix/src/nix/copy.cc +++ b/third_party/nix/src/nix/copy.cc @@ -1,10 +1,10 @@ #include <atomic> -#include "command.hh" -#include "shared.hh" -#include "store-api.hh" -#include "sync.hh" -#include "thread-pool.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "libutil/sync.hh" +#include "libutil/thread-pool.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/doctor.cc b/third_party/nix/src/nix/doctor.cc index c7d133fdacf3..3a5cd987a9d6 100644 --- a/third_party/nix/src/nix/doctor.cc +++ b/third_party/nix/src/nix/doctor.cc @@ -2,11 +2,11 @@ #include <absl/strings/str_cat.h> #include <absl/strings/str_split.h> -#include "command.hh" -#include "serve-protocol.hh" -#include "shared.hh" -#include "store-api.hh" -#include "worker-protocol.hh" +#include "libmain/shared.hh" +#include "libstore/serve-protocol.hh" +#include "libstore/store-api.hh" +#include "libstore/worker-protocol.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/dump-path.cc b/third_party/nix/src/nix/dump-path.cc index 5e93a3a44b83..d7e8bc69fd91 100644 --- a/third_party/nix/src/nix/dump-path.cc +++ b/third_party/nix/src/nix/dump-path.cc @@ -1,5 +1,5 @@ -#include "command.hh" -#include "store-api.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/edit.cc b/third_party/nix/src/nix/edit.cc index 4d5cb382bc48..55b193fb6b7e 100644 --- a/third_party/nix/src/nix/edit.cc +++ b/third_party/nix/src/nix/edit.cc @@ -2,10 +2,10 @@ #include <glog/logging.h> #include <unistd.h> -#include "attr-path.hh" -#include "command.hh" -#include "eval.hh" -#include "shared.hh" +#include "libexpr/attr-path.hh" +#include "libexpr/eval.hh" +#include "libmain/shared.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/eval.cc b/third_party/nix/src/nix/eval.cc index 661d587d7385..5f26aa14c096 100644 --- a/third_party/nix/src/nix/eval.cc +++ b/third_party/nix/src/nix/eval.cc @@ -1,11 +1,11 @@ -#include "eval.hh" - -#include "command.hh" -#include "common-args.hh" -#include "json.hh" -#include "shared.hh" -#include "store-api.hh" -#include "value-to-json.hh" +#include "libexpr/eval.hh" + +#include "libexpr/value-to-json.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "libutil/json.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/hash.cc b/third_party/nix/src/nix/hash.cc index c500dc4f3ca6..935faec9d598 100644 --- a/third_party/nix/src/nix/hash.cc +++ b/third_party/nix/src/nix/hash.cc @@ -1,8 +1,8 @@ -#include "hash.hh" +#include "libutil/hash.hh" -#include "command.hh" -#include "legacy.hh" -#include "shared.hh" +#include "libmain/shared.hh" +#include "nix/command.hh" +#include "nix/legacy.hh" using namespace nix; diff --git a/third_party/nix/src/nix/installables.cc b/third_party/nix/src/nix/installables.cc index 38a3f0c8ecf6..80c5ddb68b9c 100644 --- a/third_party/nix/src/nix/installables.cc +++ b/third_party/nix/src/nix/installables.cc @@ -1,15 +1,15 @@ #include <regex> #include <utility> -#include "attr-path.hh" -#include "command.hh" -#include "common-eval-args.hh" -#include "derivations.hh" -#include "eval-inline.hh" -#include "eval.hh" -#include "get-drvs.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libexpr/attr-path.hh" +#include "libexpr/common-eval-args.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/eval.hh" +#include "libexpr/get-drvs.hh" +#include "libmain/shared.hh" +#include "libstore/derivations.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" namespace nix { diff --git a/third_party/nix/src/nix/legacy.cc b/third_party/nix/src/nix/legacy.cc index b851392b4276..a0f9fc65b311 100644 --- a/third_party/nix/src/nix/legacy.cc +++ b/third_party/nix/src/nix/legacy.cc @@ -1,4 +1,4 @@ -#include "legacy.hh" +#include "nix/legacy.hh" namespace nix { diff --git a/third_party/nix/src/nix/log.cc b/third_party/nix/src/nix/log.cc index 63d3554cc2fb..b205851ecefc 100644 --- a/third_party/nix/src/nix/log.cc +++ b/third_party/nix/src/nix/log.cc @@ -1,9 +1,9 @@ #include <glog/logging.h> -#include "command.hh" -#include "common-args.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/ls.cc b/third_party/nix/src/nix/ls.cc index 5b052f8fcc7c..aa461675ad25 100644 --- a/third_party/nix/src/nix/ls.cc +++ b/third_party/nix/src/nix/ls.cc @@ -1,9 +1,9 @@ -#include "command.hh" -#include "common-args.hh" -#include "fs-accessor.hh" -#include "json.hh" -#include "nar-accessor.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/nar-accessor.hh" +#include "libstore/store-api.hh" +#include "libutil/json.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/main.cc b/third_party/nix/src/nix/main.cc index 59782388087a..a7b6e71bbe93 100644 --- a/third_party/nix/src/nix/main.cc +++ b/third_party/nix/src/nix/main.cc @@ -1,21 +1,21 @@ #include <algorithm> +#include <glog/logging.h> #include <ifaddrs.h> #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> #include <sys/types.h> -#include "command.hh" -#include "common-args.hh" -#include "download.hh" -#include "eval.hh" -#include "finally.hh" -#include "globals.hh" -#include "glog/logging.h" -#include "legacy.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libexpr/eval.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/download.hh" +#include "libstore/globals.hh" +#include "libstore/store-api.hh" +#include "libutil/finally.hh" +#include "nix/command.hh" +#include "nix/legacy.hh" extern std::string chrootHelperName; diff --git a/third_party/nix/src/nix/optimise-store.cc b/third_party/nix/src/nix/optimise-store.cc index 5fdcfb742465..594cc0e637a7 100644 --- a/third_party/nix/src/nix/optimise-store.cc +++ b/third_party/nix/src/nix/optimise-store.cc @@ -1,8 +1,8 @@ #include <atomic> -#include "command.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/path-info.cc b/third_party/nix/src/nix/path-info.cc index e94dcc962831..aa43ad5262e9 100644 --- a/third_party/nix/src/nix/path-info.cc +++ b/third_party/nix/src/nix/path-info.cc @@ -1,11 +1,11 @@ #include <algorithm> #include <array> -#include "command.hh" -#include "common-args.hh" -#include "json.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "libutil/json.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/ping-store.cc b/third_party/nix/src/nix/ping-store.cc index 9e9ee15c8966..0857733c4258 100644 --- a/third_party/nix/src/nix/ping-store.cc +++ b/third_party/nix/src/nix/ping-store.cc @@ -1,6 +1,6 @@ -#include "command.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/repl.cc b/third_party/nix/src/nix/repl.cc index f6261cfeccc7..65a22382b248 100644 --- a/third_party/nix/src/nix/repl.cc +++ b/third_party/nix/src/nix/repl.cc @@ -24,17 +24,17 @@ extern "C" { } #endif -#include "affinity.hh" -#include "command.hh" -#include "common-eval-args.hh" -#include "derivations.hh" -#include "eval-inline.hh" -#include "eval.hh" -#include "finally.hh" -#include "get-drvs.hh" -#include "globals.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libexpr/common-eval-args.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/eval.hh" +#include "libexpr/get-drvs.hh" +#include "libmain/shared.hh" +#include "libstore/derivations.hh" +#include "libstore/globals.hh" +#include "libstore/store-api.hh" +#include "libutil/affinity.hh" +#include "libutil/finally.hh" +#include "nix/command.hh" namespace nix { diff --git a/third_party/nix/src/nix/run.cc b/third_party/nix/src/nix/run.cc index 47103e8db3cd..b1ca56d7516c 100644 --- a/third_party/nix/src/nix/run.cc +++ b/third_party/nix/src/nix/run.cc @@ -3,15 +3,15 @@ #include <absl/strings/str_split.h> #include <sys/mount.h> -#include "affinity.hh" -#include "command.hh" -#include "common-args.hh" -#include "derivations.hh" -#include "finally.hh" -#include "fs-accessor.hh" -#include "local-store.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/derivations.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/local-store.hh" +#include "libstore/store-api.hh" +#include "libutil/affinity.hh" +#include "libutil/finally.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/search.cc b/third_party/nix/src/nix/search.cc index 9f03fc6f3202..350863cf811c 100644 --- a/third_party/nix/src/nix/search.cc +++ b/third_party/nix/src/nix/search.cc @@ -3,16 +3,16 @@ #include <glog/logging.h> -#include "command.hh" -#include "common-args.hh" -#include "eval-inline.hh" -#include "eval.hh" -#include "get-drvs.hh" -#include "globals.hh" -#include "json-to-value.hh" -#include "json.hh" -#include "names.hh" -#include "shared.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/eval.hh" +#include "libexpr/get-drvs.hh" +#include "libexpr/json-to-value.hh" +#include "libexpr/names.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/globals.hh" +#include "libutil/json.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/show-config.cc b/third_party/nix/src/nix/show-config.cc index 51f02ed61bbe..8e27fd168f64 100644 --- a/third_party/nix/src/nix/show-config.cc +++ b/third_party/nix/src/nix/show-config.cc @@ -1,8 +1,8 @@ -#include "command.hh" -#include "common-args.hh" -#include "json.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "libutil/json.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/show-derivation.cc b/third_party/nix/src/nix/show-derivation.cc index b821a9ee1205..2a6252f931c6 100644 --- a/third_party/nix/src/nix/show-derivation.cc +++ b/third_party/nix/src/nix/show-derivation.cc @@ -1,11 +1,11 @@ // FIXME: integrate this with nix path-info? -#include "archive.hh" -#include "command.hh" -#include "common-args.hh" -#include "derivations.hh" -#include "json.hh" -#include "store-api.hh" +#include "libmain/common-args.hh" +#include "libstore/derivations.hh" +#include "libstore/store-api.hh" +#include "libutil/archive.hh" +#include "libutil/json.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/sigs.cc b/third_party/nix/src/nix/sigs.cc index 420296a8023f..8df1beef2b5c 100644 --- a/third_party/nix/src/nix/sigs.cc +++ b/third_party/nix/src/nix/sigs.cc @@ -2,10 +2,10 @@ #include <glog/logging.h> -#include "command.hh" -#include "shared.hh" -#include "store-api.hh" -#include "thread-pool.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "libutil/thread-pool.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/upgrade-nix.cc b/third_party/nix/src/nix/upgrade-nix.cc index 174cc1f1fc6d..1d85af03c16a 100644 --- a/third_party/nix/src/nix/upgrade-nix.cc +++ b/third_party/nix/src/nix/upgrade-nix.cc @@ -3,13 +3,13 @@ #include <absl/strings/str_split.h> #include <glog/logging.h> -#include "attr-path.hh" -#include "command.hh" -#include "common-args.hh" -#include "download.hh" -#include "eval.hh" -#include "names.hh" -#include "store-api.hh" +#include "libexpr/attr-path.hh" +#include "libexpr/eval.hh" +#include "libexpr/names.hh" +#include "libmain/common-args.hh" +#include "libstore/download.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/verify.cc b/third_party/nix/src/nix/verify.cc index a773b3a2c8de..f5f222915eb9 100644 --- a/third_party/nix/src/nix/verify.cc +++ b/third_party/nix/src/nix/verify.cc @@ -2,11 +2,11 @@ #include <glog/logging.h> -#include "command.hh" -#include "shared.hh" -#include "store-api.hh" -#include "sync.hh" -#include "thread-pool.hh" +#include "libmain/shared.hh" +#include "libstore/store-api.hh" +#include "libutil/sync.hh" +#include "libutil/thread-pool.hh" +#include "nix/command.hh" using namespace nix; diff --git a/third_party/nix/src/nix/why-depends.cc b/third_party/nix/src/nix/why-depends.cc index 9c5eaf737c03..4fb91c9d9192 100644 --- a/third_party/nix/src/nix/why-depends.cc +++ b/third_party/nix/src/nix/why-depends.cc @@ -2,10 +2,10 @@ #include <glog/logging.h> -#include "command.hh" -#include "fs-accessor.hh" -#include "shared.hh" -#include "store-api.hh" +#include "libmain/shared.hh" +#include "libstore/fs-accessor.hh" +#include "libstore/store-api.hh" +#include "nix/command.hh" using namespace nix; |