refactor(3p/nix): Anchor local includes at src/

Previously all includes were anchored in one global mess of header
files. This moves the includes into filesystem "namespaces" (if you
will) for each sub-package of Nix.

Note: This commit does not introduce the relevant build system changes.
This commit is contained in:
Vincent Ambo 2020-05-27 21:56:34 +01:00
parent 86a35d963d
commit 3652326ed2
159 changed files with 659 additions and 654 deletions

View file

@ -11,15 +11,15 @@
#include <absl/strings/str_cat.h>
#include <glog/logging.h>
#include "derivations.hh"
#include "globals.hh"
#include "legacy.hh"
#include "local-store.hh"
#include "machines.hh"
#include "pathlocks.hh"
#include "serialise.hh"
#include "shared.hh"
#include "store-api.hh"
#include "libmain/shared.hh"
#include "libstore/derivations.hh"
#include "libstore/globals.hh"
#include "libstore/local-store.hh"
#include "libstore/machines.hh"
#include "libstore/pathlocks.hh"
#include "libstore/store-api.hh"
#include "libutil/serialise.hh"
#include "nix/legacy.hh"
using namespace nix;
using std::cin;

View file

@ -1,9 +1,9 @@
#include "attr-path.hh"
#include "libexpr/attr-path.hh"
#include <absl/strings/numbers.h>
#include "eval-inline.hh"
#include "util.hh"
#include "libexpr/eval-inline.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -3,7 +3,7 @@
#include <map>
#include <string>
#include "eval.hh"
#include "libexpr/eval.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "attr-set.hh"
#include "libexpr/attr-set.hh"
#include <new>
@ -6,7 +6,7 @@
#include <gc/gc_cpp.h>
#include <glog/logging.h>
#include "eval-inline.hh"
#include "libexpr/eval-inline.hh"
namespace nix {

View file

@ -4,9 +4,9 @@
#include <absl/container/btree_map.h>
#include <gc/gc_allocator.h>
#include "nixexpr.hh"
#include "symbol-table.hh"
#include "types.hh"
#include "libexpr/nixexpr.hh"
#include "libexpr/symbol-table.hh"
#include "libutil/types.hh"
namespace nix { // TODO(tazjin): ::expr

View file

@ -1,9 +1,9 @@
#include "common-eval-args.hh"
#include "libexpr/common-eval-args.hh"
#include "download.hh"
#include "eval.hh"
#include "shared.hh"
#include "util.hh"
#include "libexpr/eval.hh"
#include "libmain/shared.hh"
#include "libstore/download.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -1,6 +1,6 @@
#pragma once
#include "args.hh"
#include "libutil/args.hh"
namespace nix {

View file

@ -1,6 +1,6 @@
#pragma once
#include "eval.hh"
#include "libexpr/eval.hh"
#define LocalNoInline(f) \
static f __attribute__((noinline)); \

View file

@ -1,4 +1,4 @@
#include "eval.hh"
#include "libexpr/eval.hh"
#include <algorithm>
#include <chrono>
@ -15,15 +15,15 @@
#include <sys/time.h>
#include <unistd.h>
#include "derivations.hh"
#include "download.hh"
#include "eval-inline.hh"
#include "function-trace.hh"
#include "globals.hh"
#include "hash.hh"
#include "json.hh"
#include "store-api.hh"
#include "util.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/function-trace.hh"
#include "libstore/derivations.hh"
#include "libstore/download.hh"
#include "libstore/globals.hh"
#include "libstore/store-api.hh"
#include "libutil/hash.hh"
#include "libutil/json.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -4,12 +4,12 @@
#include <optional>
#include <unordered_map>
#include "attr-set.hh"
#include "config.hh"
#include "hash.hh"
#include "nixexpr.hh"
#include "symbol-table.hh"
#include "value.hh"
#include "libexpr/attr-set.hh"
#include "libexpr/nixexpr.hh"
#include "libexpr/symbol-table.hh"
#include "libexpr/value.hh"
#include "libutil/config.hh"
#include "libutil/hash.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "function-trace.hh"
#include "libexpr/function-trace.hh"
#include <glog/logging.h>

View file

@ -2,7 +2,7 @@
#include <chrono>
#include "eval.hh"
#include "libexpr/eval.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "get-drvs.hh"
#include "libexpr/get-drvs.hh"
#include <cstring>
#include <regex>
@ -7,9 +7,9 @@
#include <absl/strings/numbers.h>
#include <glog/logging.h>
#include "derivations.hh"
#include "eval-inline.hh"
#include "util.hh"
#include "libexpr/eval-inline.hh"
#include "libstore/derivations.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -3,7 +3,7 @@
#include <map>
#include <string>
#include "eval.hh"
#include "libexpr/eval.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "json-to-value.hh"
#include "libexpr/json-to-value.hh"
#include <cstring>

View file

@ -2,7 +2,7 @@
#include <string>
#include "eval.hh"
#include "libexpr/eval.hh"
namespace nix {

View file

@ -14,8 +14,8 @@
%{
#include <boost/lexical_cast.hpp>
#include "nixexpr.hh"
#include "parser-tab.hh"
#include "libexpr/nixexpr.hh"
#include "generated/parser-tab.hh"
using namespace nix;

View file

@ -1,10 +1,10 @@
#include "names.hh"
#include "libexpr/names.hh"
#include <memory>
#include <absl/strings/numbers.h>
#include "util.hh"
#include "libutil/util.hh"
namespace nix {

View file

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

View file

@ -1,9 +1,9 @@
#include "nixexpr.hh"
#include "libexpr/nixexpr.hh"
#include <cstdlib>
#include "derivations.hh"
#include "util.hh"
#include "libstore/derivations.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -2,9 +2,9 @@
#include <map>
#include "symbol-table.hh"
#include "types.hh" // TODO(tazjin): audit this include
#include "value.hh"
#include "libexpr/symbol-table.hh"
#include "libexpr/value.hh"
#include "libutil/types.hh" // TODO(tazjin): audit this include
namespace nix {

View file

@ -16,9 +16,9 @@
#ifndef BISON_HEADER
#define BISON_HEADER
#include "util.hh"
#include "nixexpr.hh"
#include "eval.hh"
#include "libutil/util.hh"
#include "libexpr/nixexpr.hh"
#include "libexpr/eval.hh"
#include <glog/logging.h>
namespace nix {
@ -50,8 +50,8 @@ namespace nix {
%{
#include "parser-tab.hh"
#include "lexer-tab.hh"
#include "generated/parser-tab.hh"
#include "generated/lexer-tab.hh"
YY_DECL;
@ -539,9 +539,9 @@ formal
#include <fcntl.h>
#include <unistd.h>
#include "eval.hh"
#include "download.hh"
#include "store-api.hh"
#include "libexpr/eval.hh"
#include "libstore/download.hh"
#include "libstore/store-api.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "primops.hh"
#include "libexpr/primops.hh"
#include <algorithm>
#include <cstring>
@ -11,19 +11,19 @@
#include <sys/types.h>
#include <unistd.h>
#include "archive.hh"
#include "derivations.hh"
#include "download.hh"
#include "eval-inline.hh"
#include "eval.hh"
#include "globals.hh"
#include "json-to-value.hh"
#include "json.hh"
#include "names.hh"
#include "store-api.hh"
#include "util.hh"
#include "value-to-json.hh"
#include "value-to-xml.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/eval.hh"
#include "libexpr/json-to-value.hh"
#include "libexpr/names.hh"
#include "libexpr/value-to-json.hh"
#include "libexpr/value-to-xml.hh"
#include "libstore/derivations.hh"
#include "libstore/download.hh"
#include "libstore/globals.hh"
#include "libstore/store-api.hh"
#include "libutil/archive.hh"
#include "libutil/json.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -1,7 +1,7 @@
#include <tuple>
#include <vector>
#include "eval.hh"
#include "libexpr/eval.hh"
namespace nix {

View file

@ -1,6 +1,6 @@
#include "derivations.hh"
#include "eval-inline.hh"
#include "primops.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/primops.hh"
#include "libstore/derivations.hh"
namespace nix {

View file

@ -7,12 +7,12 @@
#include <glog/logging.h>
#include <sys/time.h>
#include "download.hh"
#include "eval-inline.hh"
#include "hash.hh"
#include "pathlocks.hh"
#include "primops.hh"
#include "store-api.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/primops.hh"
#include "libstore/download.hh"
#include "libstore/pathlocks.hh"
#include "libstore/store-api.hh"
#include "libutil/hash.hh"
using namespace std::string_literals;

View file

@ -7,11 +7,11 @@
#include <glog/logging.h>
#include <sys/time.h>
#include "download.hh"
#include "eval-inline.hh"
#include "pathlocks.hh"
#include "primops.hh"
#include "store-api.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/primops.hh"
#include "libstore/download.hh"
#include "libstore/pathlocks.hh"
#include "libstore/store-api.hh"
using namespace std::string_literals;

View file

@ -1,6 +1,6 @@
#include "cpptoml/cpptoml.h"
#include "eval-inline.hh"
#include "primops.hh"
#include "libexpr/eval-inline.hh"
#include "libexpr/primops.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "symbol-table.hh"
#include "libexpr/symbol-table.hh"
#include <absl/container/node_hash_set.h>
#include <absl/strings/string_view.h>

View file

@ -1,11 +1,11 @@
#include "value-to-json.hh"
#include "libexpr/value-to-json.hh"
#include <cstdlib>
#include <iomanip>
#include "eval-inline.hh"
#include "json.hh"
#include "util.hh"
#include "libexpr/eval-inline.hh"
#include "libutil/json.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -3,8 +3,8 @@
#include <map>
#include <string>
#include "eval.hh"
#include "nixexpr.hh"
#include "libexpr/eval.hh"
#include "libexpr/nixexpr.hh"
namespace nix {

View file

@ -1,10 +1,10 @@
#include "value-to-xml.hh"
#include "libexpr/value-to-xml.hh"
#include <cstdlib>
#include "eval-inline.hh"
#include "util.hh"
#include "xml-writer.hh"
#include "libexpr/eval-inline.hh"
#include "libutil/util.hh"
#include "libutil/xml-writer.hh"
namespace nix {

View file

@ -3,8 +3,8 @@
#include <map>
#include <string>
#include "eval.hh"
#include "nixexpr.hh"
#include "libexpr/eval.hh"
#include "libexpr/nixexpr.hh"
namespace nix {

View file

@ -1,11 +1,9 @@
#pragma once
#include "symbol-table.hh"
#include "types.hh"
#if HAVE_BOEHMGC
#include <gc/gc_allocator.h>
#endif
#include "libexpr/symbol-table.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -1,8 +1,8 @@
#include "common-args.hh"
#include "libmain/common-args.hh"
#include <glog/logging.h>
#include "globals.hh"
#include "libstore/globals.hh"
namespace nix {

View file

@ -1,6 +1,6 @@
#pragma once
#include "args.hh"
#include "libutil/args.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "shared.hh"
#include "libmain/shared.hh"
#include <algorithm>
#include <cctype>
@ -15,9 +15,9 @@
#include <sys/time.h>
#include <unistd.h>
#include "globals.hh"
#include "store-api.hh"
#include "util.hh"
#include "libstore/globals.hh"
#include "libstore/store-api.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -5,9 +5,9 @@
#include <absl/strings/numbers.h>
#include <signal.h>
#include "args.hh"
#include "common-args.hh"
#include "util.hh"
#include "libmain/common-args.hh"
#include "libutil/args.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -5,7 +5,7 @@
#include <unistd.h>
#include "types.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -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 <glog/logging.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 "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 {

View file

@ -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 {

View file

@ -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__

View file

@ -1,6 +1,6 @@
#pragma once
#include "derivations.hh"
#include "libstore/derivations.hh"
namespace nix {

View file

@ -7,7 +7,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "builtins.hh"
#include "libstore/builtins.hh"
namespace nix {

View file

@ -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 {

View file

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

View file

@ -2,7 +2,7 @@
#include <map>
#include "types.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -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 {

View file

@ -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 {

View file

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

View file

@ -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 {

View file

@ -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 {

View file

@ -1,6 +1,6 @@
#pragma once
#include "types.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -1,6 +1,6 @@
#pragma once
#include "types.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -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 {

View file

@ -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 {

View file

@ -2,7 +2,7 @@
#include <functional>
#include "fs-accessor.hh"
#include "libstore/fs-accessor.hh"
namespace nix {

View file

@ -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 {

View file

@ -1,7 +1,7 @@
#pragma once
#include "nar-info.hh"
#include "ref.hh"
#include "libstore/nar-info.hh"
#include "libutil/ref.hh"
namespace nix {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -1,4 +1,4 @@
#include "parsed-derivations.hh"
#include "libstore/parsed-derivations.hh"
#include <absl/strings/str_split.h>

View file

@ -1,6 +1,6 @@
#include <nlohmann/json.hpp>
#include "derivations.hh"
#include "libstore/derivations.hh"
namespace nix {

View file

@ -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 {

View file

@ -1,6 +1,6 @@
#pragma once
#include "util.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -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 {

View file

@ -2,8 +2,8 @@
#include <time.h>
#include "pathlocks.hh"
#include "types.hh"
#include "libstore/pathlocks.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -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 {

View file

@ -1,7 +1,7 @@
#pragma once
#include "hash.hh"
#include "types.hh"
#include "libutil/hash.hh"
#include "libutil/types.hh"
namespace nix {

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

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

View file

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

View file

@ -2,7 +2,7 @@
#include <atomic>
#include "binary-cache-store.hh"
#include "libstore/binary-cache-store.hh"
namespace nix {

View file

@ -2,7 +2,7 @@
#if ENABLE_S3
#include "ref.hh"
#include "libutil/ref.hh"
namespace Aws {
namespace Client {

View file

@ -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 {

View file

@ -3,7 +3,7 @@
#include <functional>
#include <string>
#include "types.hh"
#include "libutil/types.hh"
class sqlite3;
class sqlite3_stmt;

View file

@ -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 {

View file

@ -1,4 +1,4 @@
#include "ssh.hh"
#include "libstore/ssh.hh"
#include <utility>

View file

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

View file

@ -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 {

View file

@ -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 {

View file

@ -1,9 +1,9 @@
#include "affinity.hh"
#include "libutil/affinity.hh"
#include <glog/logging.h>
#include "types.hh"
#include "util.hh"
#include "libutil/types.hh"
#include "libutil/util.hh"
#if __linux__
#include <sched.h>

View file

@ -1,4 +1,4 @@
#include "archive.hh"
#include "libutil/archive.hh"
#include <algorithm>
#include <cerrno>
@ -7,14 +7,14 @@
#include <dirent.h>
#include <fcntl.h>
#include <glog/logging.h>
#include <strings.h> // for strcasecmp
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "config.hh"
#include "glog/logging.h"
#include "util.hh"
#include "libutil/config.hh"
#include "libutil/util.hh"
namespace nix {

View file

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

View file

@ -1,6 +1,6 @@
#include "args.hh"
#include "libutil/args.hh"
#include "hash.hh"
#include "libutil/hash.hh"
namespace nix {

View file

@ -6,7 +6,7 @@
#include <absl/strings/numbers.h>
#include "util.hh"
#include "libutil/util.hh"
namespace nix {

View file

@ -1,4 +1,4 @@
#include "compression.hh"
#include "libutil/compression.hh"
#include <cstdio>
#include <cstring>
@ -7,11 +7,11 @@
#include <brotli/decode.h>
#include <brotli/encode.h>
#include <bzlib.h>
#include <glog/logging.h>
#include <lzma.h>
#include "finally.hh"
#include "glog/logging.h"
#include "util.hh"
#include "libutil/finally.hh"
#include "libutil/util.hh"
namespace nix {

Some files were not shown because too many files have changed in this diff Show more