lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Include rearrangement: libstore

Browse source 
Change-Id: I27c83510d9053bb8bdd7eda9ad3a4b77d633056a
This commit is contained in:
jade 2024-11-12 15:06:38 -08:00
parent df0e1993b7
commit 94ca95714e
130 changed files with 582 additions and 582 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libstore/binary-cache-store.cc
View file

@ -1,17 +1,17 @@
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "binary-cache-store.hh" #include "lix/libstore/binary-cache-store.hh"
#include "compression.hh" #include "lix/libutil/compression.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "fs-accessor.hh" #include "lix/libstore/fs-accessor.hh"
#include "nar-info.hh" #include "lix/libstore/nar-info.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "remote-fs-accessor.hh" #include "lix/libstore/remote-fs-accessor.hh"
#include "nar-info-disk-cache.hh" // IWYU pragma: keep #include "lix/libstore/nar-info-disk-cache.hh" // IWYU pragma: keep
#include "nar-accessor.hh" #include "lix/libstore/nar-accessor.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "thread-pool.hh" #include "lix/libutil/thread-pool.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <chrono> #include <chrono>
#include <regex> #include <regex>

8
src/libstore/binary-cache-store.hh
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
///@file ///@file
#include "crypto.hh" #include "lix/libstore/crypto.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "log-store.hh" #include "lix/libstore/log-store.hh"
#include "pool.hh" #include "lix/libutil/pool.hh"
#include <atomic> #include <atomic>

2
src/libstore/build-result.cc
View file

@ -1,4 +1,4 @@
#include "build-result.hh" #include "lix/libstore/build-result.hh"
namespace nix { namespace nix {

6
src/libstore/build-result.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "realisation.hh" #include "lix/libstore/realisation.hh"
#include "derived-path.hh" #include "lix/libstore/derived-path.hh"
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include <string> #include <string>
#include <chrono> #include <chrono>

4
src/libstore/build/child.cc
View file

@ -1,5 +1,5 @@
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
namespace nix { namespace nix {

26
src/libstore/build/derivation-goal.cc
View file

@ -1,16 +1,16 @@
#include "derivation-goal.hh" #include "lix/libstore/build/derivation-goal.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "hook-instance.hh" #include "lix/libstore/build/hook-instance.hh"
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "compression.hh" #include "lix/libutil/compression.hh"
#include "common-protocol.hh" #include "lix/libstore/common-protocol.hh"
#include "common-protocol-impl.hh" // IWYU pragma: keep #include "lix/libstore/common-protocol-impl.hh" // IWYU pragma: keep
#include "local-store.hh" // TODO remove, along with remaining downcasts #include "lix/libstore/local-store.hh" // TODO remove, along with remaining downcasts
#include "logging-json.hh" #include "lix/libutil/logging-json.hh"
#include "substitution-goal.hh" #include "lix/libstore/build/substitution-goal.hh"
#include "drv-output-substitution-goal.hh" #include "lix/libstore/build/drv-output-substitution-goal.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <boost/outcome/try.hpp> #include <boost/outcome/try.hpp>
#include <fstream> #include <fstream>

14
src/libstore/build/derivation-goal.hh
View file

@ -1,13 +1,13 @@
#pragma once #pragma once
///@file ///@file
#include "notifying-counter.hh" #include "lix/libutil/notifying-counter.hh"
#include "parsed-derivations.hh" #include "lix/libstore/parsed-derivations.hh"
#include "lock.hh" #include "lix/libstore/lock.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include "goal.hh" #include "lix/libstore/build/goal.hh"
#include <kj/time.h> #include <kj/time.h>
namespace nix { namespace nix {

12
src/libstore/build/drv-output-substitution-goal.cc
View file

@ -1,9 +1,9 @@
#include "drv-output-substitution-goal.hh" #include "lix/libstore/build/drv-output-substitution-goal.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include "substitution-goal.hh" #include "lix/libstore/build/substitution-goal.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <kj/array.h> #include <kj/array.h>
#include <kj/async.h> #include <kj/async.h>
#include <kj/vector.h> #include <kj/vector.h>

8
src/libstore/build/drv-output-substitution-goal.hh
View file

@ -1,10 +1,10 @@
#pragma once #pragma once
///@file ///@file
#include "notifying-counter.hh" #include "lix/libutil/notifying-counter.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "goal.hh" #include "lix/libstore/build/goal.hh"
#include "realisation.hh" #include "lix/libstore/realisation.hh"
#include <future> #include <future>
namespace nix { namespace nix {

10
src/libstore/build/entry-points.cc
View file

@ -1,8 +1,8 @@
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include "substitution-goal.hh" #include "lix/libstore/build/substitution-goal.hh"
#include "derivation-goal.hh" #include "lix/libstore/build/derivation-goal.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

6
src/libstore/build/goal.cc
View file

@ -1,6 +1,6 @@
#include "goal.hh" #include "lix/libstore/build/goal.hh"
#include "async-collect.hh" #include "lix/libutil/async-collect.hh"
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include <boost/outcome/try.hpp> #include <boost/outcome/try.hpp>
#include <kj/time.h> #include <kj/time.h>

10
src/libstore/build/goal.hh
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
///@file ///@file
#include "async-semaphore.hh" #include "lix/libutil/async-semaphore.hh"
#include "result.hh" #include "lix/libutil/result.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include <concepts> // IWYU pragma: keep #include <concepts> // IWYU pragma: keep
#include <kj/async.h> #include <kj/async.h>

12
src/libstore/build/hook-instance.cc
View file

@ -1,9 +1,9 @@
#include "child.hh" #include "lix/libstore/build/child.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "hook-instance.hh" #include "lix/libstore/build/hook-instance.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

6
src/libstore/build/hook-instance.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
namespace nix { namespace nix {

42
src/libstore/build/local-derivation-goal.cc
View file

@ -1,24 +1,24 @@
#include "local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "indirect-root-store.hh" #include "lix/libstore/indirect-root-store.hh"
#include "machines.hh" #include "lix/libstore/machines.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include "builtins.hh" #include "lix/libstore/builtins.hh"
#include "builtins/buildenv.hh" #include "lix/libstore/builtins/buildenv.hh"
#include "path-references.hh" #include "lix/libstore/path-references.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "daemon.hh" #include "lix/libstore/daemon.hh"
#include "topo-sort.hh" #include "lix/libutil/topo-sort.hh"
#include "json-utils.hh" #include "lix/libutil/json-utils.hh"
#include "cgroup.hh" #include "lix/libutil/cgroup.hh"
#include "personality.hh" #include "lix/libstore/build/personality.hh"
#include "namespaces.hh" #include "lix/libutil/namespaces.hh"
#include "child.hh" #include "lix/libstore/build/child.hh"
#include "unix-domain-socket.hh" #include "lix/libutil/unix-domain-socket.hh"
#include "mount.hh" #include "lix/libutil/mount.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <regex> #include <regex>
#include <queue> #include <queue>

6
src/libstore/build/local-derivation-goal.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "derivation-goal.hh" #include "lix/libstore/build/derivation-goal.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
namespace nix { namespace nix {

4
src/libstore/build/personality.cc
View file

@ -1,5 +1,5 @@
#include "personality.hh" #include "lix/libstore/build/personality.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#if __linux__ #if __linux__
#include <sys/utsname.h> #include <sys/utsname.h>

10
src/libstore/build/substitution-goal.cc
View file

@ -1,8 +1,8 @@
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include "substitution-goal.hh" #include "lix/libstore/build/substitution-goal.hh"
#include "nar-info.hh" #include "lix/libstore/nar-info.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include <boost/outcome/try.hpp> #include <boost/outcome/try.hpp>
#include <kj/array.h> #include <kj/array.h>
#include <kj/vector.h> #include <kj/vector.h>

8
src/libstore/build/substitution-goal.hh
View file

@ -1,10 +1,10 @@
#pragma once #pragma once
///@file ///@file
#include "lock.hh" #include "lix/libstore/lock.hh"
#include "notifying-counter.hh" #include "lix/libutil/notifying-counter.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "goal.hh" #include "lix/libstore/build/goal.hh"
namespace nix { namespace nix {

18
src/libstore/build/worker.cc
View file

@ -1,12 +1,12 @@
#include "async-collect.hh" #include "lix/libutil/async-collect.hh"
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "worker.hh" #include "lix/libstore/build/worker.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "substitution-goal.hh" #include "lix/libstore/build/substitution-goal.hh"
#include "drv-output-substitution-goal.hh" #include "lix/libstore/build/drv-output-substitution-goal.hh"
#include "local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "hook-instance.hh" // IWYU pragma: keep #include "lix/libstore/build/hook-instance.hh" // IWYU pragma: keep
#include <boost/outcome/try.hpp> #include <boost/outcome/try.hpp>
#include <kj/vector.h> #include <kj/vector.h>

16
src/libstore/build/worker.hh
View file

@ -1,14 +1,14 @@
#pragma once #pragma once
///@file ///@file
#include "async-semaphore.hh" #include "lix/libutil/async-semaphore.hh"
#include "concepts.hh" #include "lix/libutil/concepts.hh"
#include "notifying-counter.hh" #include "lix/libutil/notifying-counter.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "lock.hh" #include "lix/libstore/lock.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "goal.hh" #include "lix/libstore/build/goal.hh"
#include "realisation.hh" #include "lix/libstore/realisation.hh"
#include <future> #include <future>
#include <kj/async-io.h> #include <kj/async-io.h>

2
src/libstore/builtins.hh
View file

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

4
src/libstore/builtins/buildenv.cc
View file

@ -1,5 +1,5 @@
#include "buildenv.hh" #include "lix/libstore/builtins/buildenv.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

4
src/libstore/builtins/buildenv.hh
View file

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

12
src/libstore/builtins/fetchurl.cc
View file

@ -1,9 +1,9 @@
#include "builtins.hh" #include "lix/libstore/builtins.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "compression.hh" #include "lix/libutil/compression.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

4
src/libstore/builtins/unpack-channel.cc
View file

@ -1,5 +1,5 @@
#include "builtins.hh" #include "lix/libstore/builtins.hh"
#include "tarfile.hh" #include "lix/libutil/tarfile.hh"
namespace nix { namespace nix {

4
src/libstore/common-protocol-impl.hh
View file

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

12
src/libstore/common-protocol.cc
View file

@ -1,9 +1,9 @@
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "common-protocol.hh" #include "lix/libstore/common-protocol.hh"
#include "common-protocol-impl.hh" #include "lix/libstore/common-protocol-impl.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

2
src/libstore/common-protocol.hh
View file

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

8
src/libstore/content-address.cc
View file

@ -1,7 +1,7 @@
#include "args.hh" #include "lix/libutil/args.hh"
#include "content-address.hh" #include "lix/libstore/content-address.hh"
#include "split.hh" #include "lix/libutil/split.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

8
src/libstore/content-address.hh
View file

@ -2,10 +2,10 @@
///@file ///@file
#include <variant> #include <variant>
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "path.hh" #include "lix/libstore/path.hh"
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include "variant-wrapper.hh" #include "lix/libutil/variant-wrapper.hh"
namespace nix { namespace nix {

10
src/libstore/crypto.cc
View file

@ -1,8 +1,8 @@
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "crypto.hh" #include "lix/libstore/crypto.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sodium.h> #include <sodium.h>

32
src/libstore/daemon.cc
View file

@ -1,19 +1,19 @@
#include "daemon.hh" #include "lix/libstore/daemon.hh"
#include "monitor-fd.hh" #include "lix/libutil/monitor-fd.hh"
#include "worker-protocol.hh" #include "lix/libstore/worker-protocol.hh"
#include "worker-protocol-impl.hh" #include "lix/libstore/worker-protocol-impl.hh"
#include "build-result.hh" // IWYU pragma: keep #include "lix/libstore/build-result.hh" // IWYU pragma: keep
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "store-cast.hh" #include "lix/libstore/store-cast.hh"
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "log-store.hh" #include "lix/libstore/log-store.hh"
#include "indirect-root-store.hh" #include "lix/libstore/indirect-root-store.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "args.hh" #include "lix/libutil/args.hh"
#include <sstream> #include <sstream>

4
src/libstore/daemon.hh
View file

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

20
src/libstore/derivations.cc
View file

@ -1,13 +1,13 @@
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "downstream-placeholder.hh" #include "lix/libstore/downstream-placeholder.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "common-protocol.hh" #include "lix/libstore/common-protocol.hh"
#include "common-protocol-impl.hh" #include "lix/libstore/common-protocol-impl.hh"
#include "json-utils.hh" #include "lix/libutil/json-utils.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "backed-string-view.hh" #include "lix/libutil/backed-string-view.hh"
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

18
src/libstore/derivations.hh
View file

@ -1,15 +1,15 @@
#pragma once #pragma once
///@file ///@file
#include "path.hh" #include "lix/libstore/path.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "content-address.hh" #include "lix/libstore/content-address.hh"
#include "repair-flag.hh" #include "lix/libutil/repair-flag.hh"
#include "derived-path-map.hh" #include "lix/libstore/derived-path-map.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include "variant-wrapper.hh" #include "lix/libutil/variant-wrapper.hh"
#include <map> #include <map>
#include <variant> #include <variant>

2
src/libstore/derived-path-map.cc
View file

@ -1,4 +1,4 @@
#include "derived-path-map.hh" #include "lix/libstore/derived-path-map.hh"
namespace nix { namespace nix {

4
src/libstore/derived-path-map.hh
View file

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

4
src/libstore/derived-path.cc
View file

@ -1,5 +1,5 @@
#include "derived-path.hh" #include "lix/libstore/derived-path.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

10
src/libstore/derived-path.hh
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
///@file ///@file
#include "config.hh" #include "lix/libutil/config.hh"
#include "path.hh" #include "lix/libstore/path.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include "ref.hh" #include "lix/libutil/ref.hh"
#include <variant> #include <variant>

4
src/libstore/downstream-placeholder.cc
View file

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

6
src/libstore/downstream-placeholder.hh
View file

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

4
src/libstore/dummy-store.cc
View file

@ -1,5 +1,5 @@
#include "dummy-store.hh" #include "lix/libstore/dummy-store.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
namespace nix { namespace nix {

10
src/libstore/export-import.cc
View file

@ -1,8 +1,8 @@
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "common-protocol.hh" #include "lix/libstore/common-protocol.hh"
#include "common-protocol-impl.hh" #include "lix/libstore/common-protocol-impl.hh"
#include <algorithm> #include <algorithm>

14
src/libstore/filetransfer.cc
View file

@ -1,10 +1,10 @@
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "namespaces.hh" #include "lix/libutil/namespaces.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "s3.hh" #include "lix/libstore/s3.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <cstddef> #include <cstddef>
#include <cstdio> #include <cstdio>

12
src/libstore/filetransfer.hh
View file

@ -1,12 +1,12 @@
#pragma once #pragma once
///@file ///@file
#include "box_ptr.hh" #include "lix/libutil/box_ptr.hh"
#include "ref.hh" #include "lix/libutil/ref.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "config.hh" #include "lix/libutil/config.hh"
#include <string> #include <string>
#include <future> #include <future>

2
src/libstore/fs-accessor.hh
View file

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

2
src/libstore/gc-store.hh
View file

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

16
src/libstore/gc.cc
View file

@ -1,11 +1,11 @@
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "unix-domain-socket.hh" #include "lix/libutil/unix-domain-socket.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <queue> #include <queue>
#include <regex> #include <regex>

40
src/libstore/globals.cc
View file

@ -1,13 +1,13 @@
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "args.hh" #include "lix/libutil/args.hh"
#include "abstract-setting-to-json.hh" #include "lix/libutil/abstract-setting-to-json.hh"
#include "compute-levels.hh" #include "lix/libutil/compute-levels.hh"
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include <algorithm> #include <algorithm>
#include <mutex> #include <mutex>
@ -25,23 +25,23 @@
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#include "config-impl.hh" #include "lix/libutil/config-impl.hh"
#ifdef __APPLE__ #ifdef __APPLE__
#include "processes.hh" #include "lix/libutil/processes.hh"
#include <curl/curl.h> #include <curl/curl.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
// All built-in store implementations. // All built-in store implementations.
#include "dummy-store.hh" #include "lix/libstore/dummy-store.hh"
#include "http-binary-cache-store.hh" #include "lix/libstore/http-binary-cache-store.hh"
#include "legacy-ssh-store.hh" #include "lix/libstore/legacy-ssh-store.hh"
#include "local-binary-cache-store.hh" #include "lix/libstore/local-binary-cache-store.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "s3-binary-cache-store.hh" #include "lix/libstore/s3-binary-cache-store.hh"
#include "ssh-store.hh" #include "lix/libstore/ssh-store.hh"
#include "uds-remote-store.hh" #include "lix/libstore/uds-remote-store.hh"
namespace nix { namespace nix {

6
src/libstore/globals.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "config.hh" #include "lix/libutil/config.hh"
#include <map> #include <map>
#include <limits> #include <limits>

10
src/libstore/http-binary-cache-store.cc
View file

@ -1,8 +1,8 @@
#include "http-binary-cache-store.hh" #include "lix/libstore/http-binary-cache-store.hh"
#include "binary-cache-store.hh" #include "lix/libstore/binary-cache-store.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "nar-info-disk-cache.hh" #include "lix/libstore/nar-info-disk-cache.hh"
namespace nix { namespace nix {

2
src/libstore/indirect-root-store.hh
View file

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

26
src/libstore/legacy-ssh-store.cc
View file

@ -1,16 +1,16 @@
#include "legacy-ssh-store.hh" #include "lix/libstore/legacy-ssh-store.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "pool.hh" #include "lix/libutil/pool.hh"
#include "remote-store.hh" #include "lix/libstore/remote-store.hh"
#include "serve-protocol.hh" #include "lix/libstore/serve-protocol.hh"
#include "serve-protocol-impl.hh" #include "lix/libstore/serve-protocol-impl.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "ssh.hh" #include "lix/libstore/ssh.hh"
#include "ssh-store.hh" #include "lix/libstore/ssh-store.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
namespace nix { namespace nix {

4
src/libstore/length-prefixed-protocol-helper.hh
View file

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

8
src/libstore/local-binary-cache-store.cc
View file

@ -1,7 +1,7 @@
#include "local-binary-cache-store.hh" #include "lix/libstore/local-binary-cache-store.hh"
#include "binary-cache-store.hh" #include "lix/libstore/binary-cache-store.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "nar-info-disk-cache.hh" #include "lix/libstore/nar-info-disk-cache.hh"
#include <atomic> #include <atomic>

14
src/libstore/local-fs-store.cc
View file

@ -1,10 +1,10 @@
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "fs-accessor.hh" #include "lix/libstore/fs-accessor.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "compression.hh" #include "lix/libutil/compression.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
namespace nix { namespace nix {

6
src/libstore/local-fs-store.hh
View file

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

28
src/libstore/local-store.cc
View file

@ -1,17 +1,17 @@
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "worker-protocol.hh" #include "lix/libstore/worker-protocol.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "nar-info.hh" #include "lix/libstore/nar-info.hh"
#include "references.hh" #include "lix/libutil/references.hh"
#include "topo-sort.hh" #include "lix/libutil/topo-sort.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "compression.hh" #include "lix/libutil/compression.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>

8
src/libstore/local-store.hh
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
///@file ///@file
#include "sqlite.hh" #include "lix/libstore/sqlite.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "indirect-root-store.hh" #include "lix/libstore/indirect-root-store.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include <chrono> #include <chrono>
#include <future> #include <future>

10
src/libstore/lock.cc
View file

@ -1,8 +1,8 @@
#include "lock.hh" #include "lix/libstore/lock.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>

2
src/libstore/log-store.cc
View file

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

2
src/libstore/log-store.hh
View file

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

8
src/libstore/machines.cc
View file

@ -1,7 +1,7 @@
#include "machines.hh" #include "lix/libstore/machines.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <algorithm> #include <algorithm>

2
src/libstore/machines.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "ref.hh" #include "lix/libutil/ref.hh"
#include <set> #include <set>
#include <vector> #include <vector>

6
src/libstore/make-content-addressed.cc
View file

@ -1,6 +1,6 @@
#include "make-content-addressed.hh" #include "lix/libstore/make-content-addressed.hh"
#include "references.hh" #include "lix/libutil/references.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

2
src/libstore/make-content-addressed.hh
View file

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

18
src/libstore/misc.cc
View file

@ -1,12 +1,12 @@
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "parsed-derivations.hh" #include "lix/libstore/parsed-derivations.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "thread-pool.hh" #include "lix/libutil/thread-pool.hh"
#include "topo-sort.hh" #include "lix/libutil/topo-sort.hh"
#include "closure.hh" #include "lix/libutil/closure.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

4
src/libstore/names.cc
View file

@ -1,5 +1,5 @@
#include "names.hh" #include "lix/libstore/names.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <regex> #include <regex>

2
src/libstore/names.hh
View file

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

4
src/libstore/nar-accessor.cc
View file

@ -1,5 +1,5 @@
#include "nar-accessor.hh" #include "lix/libstore/nar-accessor.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include <map> #include <map>
#include <memory> #include <memory>

4
src/libstore/nar-accessor.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "fs-accessor.hh" #include "lix/libstore/fs-accessor.hh"
#include "ref.hh" #include "lix/libutil/ref.hh"
#include <functional> #include <functional>

14
src/libstore/nar-info-disk-cache.cc
View file

@ -1,10 +1,10 @@
#include "nar-info-disk-cache.hh" #include "lix/libstore/nar-info-disk-cache.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "sqlite.hh" #include "lix/libstore/sqlite.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sqlite3.h> #include <sqlite3.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

6
src/libstore/nar-info-disk-cache.hh
View file

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

6
src/libstore/nar-info.cc
View file

@ -1,6 +1,6 @@
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "nar-info.hh" #include "lix/libstore/nar-info.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
namespace nix { namespace nix {

6
src/libstore/nar-info.hh
View file

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

8
src/libstore/optimise-store.cc
View file

@ -1,7 +1,7 @@
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <cstring> #include <cstring>
#include <sys/types.h> #include <sys/types.h>

8
src/libstore/outputs-spec.cc
View file

@ -1,10 +1,10 @@
#include <regex> #include <regex>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "regex-combinators.hh" #include "lix/libutil/regex-combinators.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "path-regex.hh" #include "lix/libstore/path-regex.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

8
src/libstore/outputs-spec.hh
View file

@ -6,10 +6,10 @@
#include <set> #include <set>
#include <variant> #include <variant>
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include "json-impls.hh" #include "lix/libutil/json-impls.hh"
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include "variant-wrapper.hh" #include "lix/libutil/variant-wrapper.hh"
namespace nix { namespace nix {

4
src/libstore/parsed-derivations.cc
View file

@ -1,5 +1,5 @@
#include "parsed-derivations.hh" #include "lix/libstore/parsed-derivations.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <regex> #include <regex>

4
src/libstore/parsed-derivations.hh
View file

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

6
src/libstore/path-info.cc
View file

@ -1,6 +1,6 @@
#include "path-info.hh" #include "lix/libstore/path-info.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

8
src/libstore/path-info.hh
View file

@ -1,10 +1,10 @@
#pragma once #pragma once
///@file ///@file
#include "crypto.hh" #include "lix/libstore/crypto.hh"
#include "path.hh" #include "lix/libstore/path.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "content-address.hh" #include "lix/libstore/content-address.hh"
#include <string> #include <string>
#include <optional> #include <optional>

6
src/libstore/path-references.cc
View file

@ -1,6 +1,6 @@
#include "path-references.hh" #include "lix/libstore/path-references.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include <map> #include <map>

4
src/libstore/path-references.hh
View file

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

6
src/libstore/path-with-outputs.cc
View file

@ -1,6 +1,6 @@
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

4
src/libstore/path-with-outputs.hh
View file

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

2
src/libstore/path.cc
View file

@ -1,4 +1,4 @@
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include <sodium.h> #include <sodium.h>

2
src/libstore/path.hh
View file

@ -4,7 +4,7 @@
#include <string_view> #include <string_view>
#include <string> #include <string>
#include "types.hh" // IWYU pragma: keep #include "lix/libutil/types.hh" // IWYU pragma: keep
namespace nix { namespace nix {

6
src/libstore/pathlocks.cc
View file

@ -1,6 +1,6 @@
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <cerrno> #include <cerrno>

4
src/libstore/pathlocks.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
namespace nix { namespace nix {

6
src/libstore/platform.cc
View file

@ -1,8 +1,8 @@
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "build/local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#if __linux__ #if __linux__
#include "platform/linux.hh" #include "lix/libstore/platform/linux.hh"
#elif __APPLE__ #elif __APPLE__
#include "platform/darwin.hh" #include "platform/darwin.hh"
#elif __FreeBSD__ #elif __FreeBSD__

10
src/libstore/platform/darwin.cc
View file

@ -1,8 +1,8 @@
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "platform/darwin.hh" #include "lix/libstore/platform/darwin.hh"
#include "regex.hh" #include "lix/libutil/regex.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/proc_info.h> #include <sys/proc_info.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>

6
src/libstore/platform/darwin.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "build/local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
namespace nix { namespace nix {

4
src/libstore/platform/fallback.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "build/local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
namespace nix { namespace nix {

6
src/libstore/platform/freebsd.cc
View file

@ -1,6 +1,6 @@
#include "platform/freebsd.hh" #include "lix/libstore/platform/freebsd.hh"
#include "regex.hh" #include "lix/libutil/regex.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/param.h> #include <sys/param.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/socket.h> #include <sys/socket.h>

6
src/libstore/platform/freebsd.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "build/local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
namespace nix { namespace nix {

16
src/libstore/platform/linux.cc
View file

@ -1,11 +1,11 @@
#include "build/worker.hh" #include "lix/libstore/build/worker.hh"
#include "cgroup.hh" #include "lix/libutil/cgroup.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "platform/linux.hh" #include "lix/libstore/platform/linux.hh"
#include "regex.hh" #include "lix/libutil/regex.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <grp.h> #include <grp.h>
#include <regex> #include <regex>

6
src/libstore/platform/linux.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "build/local-derivation-goal.hh" #include "lix/libstore/build/local-derivation-goal.hh"
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
namespace nix { namespace nix {

8
src/libstore/profiles.cc
View file

@ -1,7 +1,7 @@
#include "profiles.hh" #include "lix/libstore/profiles.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

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