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

Include rearrangement: rest

Browse source 
Change-Id: If9b5502ff348d358d7007b885e26e98a0d228f39
This commit is contained in:
jade 2024-11-12 15:07:17 -08:00
parent eeaa72b62b
commit 103cd44a04
179 changed files with 837 additions and 837 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
perl/lib/Nix/Store.xs
View file

@ -8,10 +8,10 @@
#undef do_open #undef do_open
#undef do_close #undef do_close
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "crypto.hh" #include "lix/libstore/crypto.hh"
#include <sodium.h> #include <sodium.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

26
src/legacy/build-remote.cc
View file

@ -6,19 +6,19 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "machines.hh" #include "lix/libstore/machines.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "experimental-features.hh" #include "lix/libutil/experimental-features.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "build-remote.hh" #include "build-remote.hh"
namespace nix { namespace nix {

2
src/legacy/dotgraph.cc
View file

@ -1,5 +1,5 @@
#include "dotgraph.hh" #include "dotgraph.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include <iostream> #include <iostream>

2
src/legacy/dotgraph.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 {

4
src/legacy/graphml.cc
View file

@ -1,6 +1,6 @@
#include "graphml.hh" #include "graphml.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include <iostream> #include <iostream>

2
src/legacy/graphml.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 {

32
src/legacy/nix-build.cc
View file

@ -9,23 +9,23 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "parsed-derivations.hh" #include "lix/libstore/parsed-derivations.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 "current-process.hh" #include "lix/libutil/current-process.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "shlex.hh" #include "lix/libutil/shlex.hh"
#include "nix-build.hh" #include "nix-build.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
extern char * * environ __attribute__((weak)); // Man what even is this extern char * * environ __attribute__((weak)); // Man what even is this

20
src/legacy/nix-channel.cc
View file

@ -1,13 +1,13 @@
#include "profiles.hh" #include "lix/libstore/profiles.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "eval-settings.hh" // for defexpr #include "lix/libexpr/eval-settings.hh" // for defexpr
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "nix-channel.hh" #include "nix-channel.hh"
#include <fcntl.h> #include <fcntl.h>

18
src/legacy/nix-collect-garbage.cc
View file

@ -1,12 +1,12 @@
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#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 "profiles.hh" #include "lix/libstore/profiles.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "nix-collect-garbage.hh" #include "nix-collect-garbage.hh"
#include <iostream> #include <iostream>

6
src/legacy/nix-copy-closure.cc
View file

@ -1,6 +1,6 @@
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "nix-copy-closure.hh" #include "nix-copy-closure.hh"
namespace nix { namespace nix {

36
src/legacy/nix-env.cc
View file

@ -1,22 +1,22 @@
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "names.hh" #include "lix/libstore/names.hh"
#include "profiles.hh" #include "lix/libstore/profiles.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "user-env.hh" #include "user-env.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "value-to-json.hh" #include "lix/libexpr/value-to-json.hh"
#include "xml-writer.hh" #include "lix/libutil/xml-writer.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "eval-settings.hh" // for defexpr #include "lix/libexpr/eval-settings.hh" // for defexpr
#include "nix-env.hh" #include "nix-env.hh"
#include <ctime> #include <ctime>

26
src/legacy/nix-instantiate.cc
View file

@ -1,16 +1,16 @@
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "print-ambiguous.hh" #include "lix/libexpr/print-ambiguous.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "value-to-xml.hh" #include "lix/libexpr/value-to-xml.hh"
#include "value-to-json.hh" #include "lix/libexpr/value-to-json.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "nix-instantiate.hh" #include "nix-instantiate.hh"
#include <map> #include <map>

30
src/legacy/nix-store.cc
View file

@ -1,20 +1,20 @@
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "dotgraph.hh" #include "dotgraph.hh"
#include "exit.hh" #include "lix/libutil/exit.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "build-result.hh" #include "lix/libstore/build-result.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 "local-store.hh" #include "lix/libstore/local-store.hh"
#include "monitor-fd.hh" #include "lix/libutil/monitor-fd.hh"
#include "serve-protocol.hh" #include "lix/libstore/serve-protocol.hh"
#include "serve-protocol-impl.hh" #include "lix/libstore/serve-protocol-impl.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "graphml.hh" #include "graphml.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "nix-store.hh" #include "nix-store.hh"
#include <iostream> #include <iostream>

20
src/legacy/user-env.cc
View file

@ -1,14 +1,14 @@
#include "user-env.hh" #include "user-env.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "path-with-outputs.hh" #include "lix/libstore/path-with-outputs.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "profiles.hh" #include "lix/libstore/profiles.hh"
#include "print-ambiguous.hh" #include "lix/libexpr/print-ambiguous.hh"
#include <limits> #include <limits>
#include <sstream> #include <sstream>

2
src/legacy/user-env.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
namespace nix { namespace nix {

6
src/libcmd/built-path.cc
View file

@ -1,6 +1,6 @@
#include "built-path.hh" #include "lix/libcmd/built-path.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/libcmd/built-path.hh
View file

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

16
src/libcmd/cmd-profiles.cc
View file

@ -1,13 +1,13 @@
#include <set> #include <set>
#include "cmd-profiles.hh" #include "lix/libcmd/cmd-profiles.hh"
#include "built-path.hh" #include "lix/libcmd/built-path.hh"
#include "builtins/buildenv.hh" #include "lix/libstore/builtins/buildenv.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "names.hh" #include "lix/libstore/names.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "url-name.hh" #include "lix/libutil/url-name.hh"
namespace nix namespace nix
{ {

14
src/libcmd/cmd-profiles.hh
View file

@ -1,13 +1,13 @@
#pragma once #pragma once
///@file ///@file
#include "built-path.hh" #include "lix/libcmd/built-path.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "flake/flakeref.hh" #include "lix/libexpr/flake/flakeref.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "url.hh" #include "lix/libutil/url.hh"
#include "url-name.hh" #include "lix/libutil/url-name.hh"
#include <string> #include <string>
#include <set> #include <set>

14
src/libcmd/command.cc
View file

@ -1,10 +1,10 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "nixexpr.hh" #include "lix/libexpr/nixexpr.hh"
#include "profiles.hh" #include "lix/libstore/profiles.hh"
#include "repl.hh" #include "lix/libcmd/repl.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

10
src/libcmd/command.hh
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
///@file ///@file
#include "installable-value.hh" #include "lix/libcmd/installable-value.hh"
#include "args.hh" #include "lix/libutil/args.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "path.hh" #include "lix/libstore/path.hh"
#include "flake/lockfile.hh" #include "lix/libexpr/flake/lockfile.hh"
#include <optional> #include <optional>

20
src/libcmd/common-eval-args.cc
View file

@ -1,13 +1,13 @@
#include "eval-settings.hh" #include "lix/libexpr/eval-settings.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "registry.hh" #include "lix/libfetchers/registry.hh"
#include "flake/flakeref.hh" #include "lix/libexpr/flake/flakeref.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include <regex> #include <regex>

6
src/libcmd/common-eval-args.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "args.hh" #include "lix/libutil/args.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "search-path.hh" #include "lix/libexpr/search-path.hh"
namespace nix { namespace nix {

8
src/libcmd/editor-for.cc
View file

@ -1,7 +1,7 @@
#include "editor-for.hh" #include "lix/libcmd/editor-for.hh"
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "source-path.hh" #include "lix/libutil/source-path.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

4
src/libcmd/editor-for.hh
View file

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

16
src/libcmd/installable-attr-path.cc
View file

@ -1,11 +1,11 @@
#include "installable-attr-path.hh" #include "lix/libcmd/installable-attr-path.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "flake/flake.hh" #include "lix/libexpr/flake/flake.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

10
src/libcmd/installable-attr-path.hh
View file

@ -1,11 +1,11 @@
#pragma once #pragma once
///@file ///@file
#include "installable-value.hh" #include "lix/libcmd/installable-value.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/libcmd/installable-derived-path.cc
View file

@ -1,5 +1,5 @@
#include "installable-derived-path.hh" #include "lix/libcmd/installable-derived-path.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
namespace nix { namespace nix {

2
src/libcmd/installable-derived-path.hh
View file

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

36
src/libcmd/installable-flake.cc
View file

@ -1,21 +1,21 @@
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "installable-flake.hh" #include "lix/libcmd/installable-flake.hh"
#include "installable-derived-path.hh" #include "lix/libcmd/installable-derived-path.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "flake/flake.hh" #include "lix/libexpr/flake/flake.hh"
#include "eval-cache.hh" #include "lix/libexpr/eval-cache.hh"
#include "url.hh" #include "lix/libutil/url.hh"
#include "registry.hh" #include "lix/libfetchers/registry.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include <regex> #include <regex>
#include <queue> #include <queue>

2
src/libcmd/installable-flake.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "installable-value.hh" #include "lix/libcmd/installable-value.hh"
namespace nix { namespace nix {

6
src/libcmd/installable-value.cc
View file

@ -1,6 +1,6 @@
#include "installable-value.hh" #include "lix/libcmd/installable-value.hh"
#include "eval-cache.hh" #include "lix/libexpr/eval-cache.hh"
#include "fetch-to-store.hh" #include "lix/libfetchers/fetch-to-store.hh"
namespace nix { namespace nix {

4
src/libcmd/installable-value.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "installables.hh" #include "lix/libcmd/installables.hh"
#include "flake/flake.hh" #include "lix/libexpr/flake/flake.hh"
namespace nix { namespace nix {

38
src/libcmd/installables.cc
View file

@ -1,22 +1,22 @@
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "installables.hh" #include "lix/libcmd/installables.hh"
#include "installable-derived-path.hh" #include "lix/libcmd/installable-derived-path.hh"
#include "installable-attr-path.hh" #include "lix/libcmd/installable-attr-path.hh"
#include "installable-flake.hh" #include "lix/libcmd/installable-flake.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-settings.hh" #include "lix/libexpr/eval-settings.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "flake/flake.hh" #include "lix/libexpr/flake/flake.hh"
#include "eval-cache.hh" #include "lix/libexpr/eval-cache.hh"
#include "registry.hh" #include "lix/libfetchers/registry.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

12
src/libcmd/installables.hh
View file

@ -1,12 +1,12 @@
#pragma once #pragma once
///@file ///@file
#include "path.hh" #include "lix/libstore/path.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "derived-path.hh" #include "lix/libstore/derived-path.hh"
#include "built-path.hh" #include "lix/libcmd/built-path.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "build-result.hh" #include "lix/libstore/build-result.hh"
#include <optional> #include <optional>

2
src/libcmd/legacy.cc
View file

@ -1,4 +1,4 @@
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
namespace nix { namespace nix {

8
src/libcmd/markdown.cc
View file

@ -1,7 +1,7 @@
#include "markdown.hh" #include "lix/libcmd/markdown.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include <sys/queue.h> #include <sys/queue.h>
#include <lowdown.h> #include <lowdown.h>

2
src/libcmd/markdown.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 {

10
src/libcmd/repl-interacter.cc
View file

@ -1,6 +1,6 @@
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include <csignal> #include <csignal>
#include <cstdio> #include <cstdio>
#include <iostream> #include <iostream>
@ -17,8 +17,8 @@ extern "C" {
#include <editline.h> #include <editline.h>
} }
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "repl-interacter.hh" #include "lix/libcmd/repl-interacter.hh"
namespace nix { namespace nix {

4
src/libcmd/repl-interacter.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
/// @file /// @file
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include <functional> #include <functional>
#include <string> #include <string>

54
src/libcmd/repl.cc
View file

@ -6,34 +6,34 @@
#include <climits> #include <climits>
#include <string_view> #include <string_view>
#include "box_ptr.hh" #include "lix/libutil/box_ptr.hh"
#include "repl-interacter.hh" #include "lix/libcmd/repl-interacter.hh"
#include "repl.hh" #include "lix/libcmd/repl.hh"
#include "ansicolor.hh" #include "lix/libutil/ansicolor.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-cache.hh" #include "lix/libexpr/eval-cache.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "eval-settings.hh" #include "lix/libexpr/eval-settings.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "log-store.hh" #include "lix/libstore/log-store.hh"
#include "common-eval-args.hh" #include "lix/libcmd/common-eval-args.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "flake/flake.hh" #include "lix/libexpr/flake/flake.hh"
#include "flake/lockfile.hh" #include "lix/libexpr/flake/lockfile.hh"
#include "editor-for.hh" #include "lix/libcmd/editor-for.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "markdown.hh" #include "lix/libcmd/markdown.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "print.hh" #include "lix/libexpr/print.hh"
#include "gc-small-vector.hh" #include "lix/libexpr/gc-small-vector.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#if HAVE_BOEHMGC #if HAVE_BOEHMGC
#define GC_INCLUDE_NEW #define GC_INCLUDE_NEW

2
src/libcmd/repl.hh
View file

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

4
src/libfetchers/attrs.cc
View file

@ -1,5 +1,5 @@
#include "attrs.hh" #include "lix/libfetchers/attrs.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/libfetchers/attrs.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include <variant> #include <variant>

2
src/libfetchers/builtin-fetchers.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file internal header for fetcher declarations ///@file internal header for fetcher declarations
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
namespace nix::fetchers { namespace nix::fetchers {

10
src/libfetchers/cache.cc
View file

@ -1,8 +1,8 @@
#include "cache.hh" #include "lix/libfetchers/cache.hh"
#include "sqlite.hh" #include "lix/libstore/sqlite.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/libfetchers/cache.hh
View file

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

8
src/libfetchers/fetch-settings.cc
View file

@ -1,7 +1,7 @@
#include "abstract-setting-to-json.hh" #include "lix/libutil/abstract-setting-to-json.hh"
#include "args.hh" #include "lix/libutil/args.hh"
#include "config-impl.hh" #include "lix/libutil/config-impl.hh"
#include "fetch-settings.hh" #include "lix/libfetchers/fetch-settings.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/libfetchers/fetch-settings.hh
View file

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

6
src/libfetchers/fetch-to-store.cc
View file

@ -1,6 +1,6 @@
#include "fetch-to-store.hh" #include "lix/libfetchers/fetch-to-store.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "cache.hh" #include "lix/libfetchers/cache.hh"
namespace nix { namespace nix {

8
src/libfetchers/fetch-to-store.hh
View file

@ -1,10 +1,10 @@
#pragma once #pragma once
///@file ///@file
#include "source-path.hh" #include "lix/libutil/source-path.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "repair-flag.hh" #include "lix/libutil/repair-flag.hh"
#include "content-address.hh" #include "lix/libstore/content-address.hh"
namespace nix { namespace nix {

10
src/libfetchers/fetchers.cc
View file

@ -1,8 +1,8 @@
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "source-path.hh" #include "lix/libutil/source-path.hh"
#include "fetch-to-store.hh" #include "lix/libfetchers/fetch-to-store.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

16
src/libfetchers/fetchers.hh
View file

@ -1,14 +1,14 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "canon-path.hh" #include "lix/libutil/canon-path.hh"
#include "path.hh" #include "lix/libstore/path.hh"
#include "attrs.hh" #include "lix/libfetchers/attrs.hh"
#include "url.hh" #include "lix/libutil/url.hh"
#include "ref.hh" #include "lix/libutil/ref.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <memory> #include <memory>

32
src/libfetchers/git.cc
View file

@ -1,20 +1,20 @@
#include "error.hh" #include "lix/libutil/error.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "cache.hh" #include "lix/libfetchers/cache.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "tarfile.hh" #include "lix/libutil/tarfile.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "url-parts.hh" #include "lix/libutil/url-parts.hh"
#include "pathlocks.hh" #include "lix/libstore/pathlocks.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "git.hh" #include "lix/libutil/git.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "fetch-settings.hh" #include "lix/libfetchers/fetch-settings.hh"
#include <regex> #include <regex>
#include <string.h> #include <string.h>

22
src/libfetchers/github.cc
View file

@ -1,14 +1,14 @@
#include "attrs.hh" #include "lix/libfetchers/attrs.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "cache.hh" #include "lix/libfetchers/cache.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "url-parts.hh" #include "lix/libutil/url-parts.hh"
#include "git.hh" #include "lix/libutil/git.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "fetch-settings.hh" #include "lix/libfetchers/fetch-settings.hh"
#include <optional> #include <optional>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

8
src/libfetchers/indirect.cc
View file

@ -1,7 +1,7 @@
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "url-parts.hh" #include "lix/libutil/url-parts.hh"
#include "path.hh" #include "lix/libstore/path.hh"
namespace nix::fetchers { namespace nix::fetchers {

18
src/libfetchers/mercurial.cc
View file

@ -1,13 +1,13 @@
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "cache.hh" #include "lix/libfetchers/cache.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "url-parts.hh" #include "lix/libutil/url-parts.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "fetch-settings.hh" #include "lix/libfetchers/fetch-settings.hh"
#include <sys/time.h> #include <sys/time.h>

8
src/libfetchers/path.cc
View file

@ -1,7 +1,7 @@
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
namespace nix::fetchers { namespace nix::fetchers {

14
src/libfetchers/registry.cc
View file

@ -1,11 +1,11 @@
#include "registry.hh" #include "lix/libfetchers/registry.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "users.hh" #include "lix/libutil/users.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "fetch-settings.hh" #include "lix/libfetchers/fetch-settings.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/libfetchers/registry.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
namespace nix { class Store; } namespace nix { class Store; }

22
src/libfetchers/tarball.cc
View file

@ -1,14 +1,14 @@
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "cache.hh" #include "lix/libfetchers/cache.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "builtin-fetchers.hh" #include "lix/libfetchers/builtin-fetchers.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "tarfile.hh" #include "lix/libutil/tarfile.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "split.hh" #include "lix/libutil/split.hh"
namespace nix::fetchers { namespace nix::fetchers {

12
src/libmain/common-args.cc
View file

@ -1,9 +1,9 @@
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "args/root.hh" #include "lix/libutil/args/root.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "loggers.hh" #include "lix/libmain/loggers.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
namespace nix { namespace nix {

4
src/libmain/common-args.hh
View file

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

4
src/libmain/crash-handler.cc
View file

@ -1,5 +1,5 @@
#include "crash-handler.hh" #include "lix/libmain/crash-handler.hh"
#include "fmt.hh" #include "lix/libutil/fmt.hh"
#include <boost/core/demangle.hpp> #include <boost/core/demangle.hpp>
#include <exception> #include <exception>

6
src/libmain/loggers.cc
View file

@ -1,6 +1,6 @@
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "loggers.hh" #include "lix/libmain/loggers.hh"
#include "progress-bar.hh" #include "lix/libmain/progress-bar.hh"
namespace nix { namespace nix {

2
src/libmain/loggers.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 {

12
src/libmain/progress-bar.cc
View file

@ -1,9 +1,9 @@
#include "progress-bar.hh" #include "lix/libmain/progress-bar.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "names.hh" #include "lix/libstore/names.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <map> #include <map>
#include <thread> #include <thread>

4
src/libmain/progress-bar.hh
View file

@ -3,8 +3,8 @@
#include <chrono> #include <chrono>
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
namespace nix { namespace nix {

22
src/libmain/shared.cc
View file

@ -1,14 +1,14 @@
#include "crash-handler.hh" #include "lix/libmain/crash-handler.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "gc-store.hh" #include "lix/libstore/gc-store.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "loggers.hh" #include "lix/libmain/loggers.hh"
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "exit.hh" #include "lix/libutil/exit.hh"
#include <algorithm> #include <algorithm>
#include <exception> #include <exception>

14
src/libmain/shared.hh
View file

@ -1,13 +1,13 @@
#pragma once #pragma once
///@file ///@file
#include "args.hh" #include "lix/libutil/args.hh"
#include "args/root.hh" #include "lix/libutil/args/root.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "path.hh" #include "lix/libstore/path.hh"
#include "derived-path.hh" #include "lix/libstore/derived-path.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <signal.h> #include <signal.h>

4
src/libmain/stack.cc
View file

@ -1,5 +1,5 @@
#include "error.hh" #include "lix/libutil/error.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include <cstring> #include <cstring>

8
src/nix/add-to-store.cc
View file

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
using namespace nix; using namespace nix;

20
src/nix/app.cc
View file

@ -1,13 +1,13 @@
#include "installables.hh" #include "lix/libcmd/installables.hh"
#include "installable-derived-path.hh" #include "lix/libcmd/installable-derived-path.hh"
#include "installable-value.hh" #include "lix/libcmd/installable-value.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "eval-cache.hh" #include "lix/libexpr/eval-cache.hh"
#include "names.hh" #include "lix/libstore/names.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "downstream-placeholder.hh" #include "lix/libstore/downstream-placeholder.hh"
namespace nix { namespace nix {

10
src/nix/build.cc
View file

@ -1,8 +1,8 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

16
src/nix/bundle.cc
View file

@ -1,11 +1,11 @@
#include "installable-flake.hh" #include "lix/libcmd/installable-flake.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "fs-accessor.hh" #include "lix/libstore/fs-accessor.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
using namespace nix; using namespace nix;

8
src/nix/cat.cc
View file

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "fs-accessor.hh" #include "lix/libstore/fs-accessor.hh"
#include "nar-accessor.hh" #include "lix/libstore/nar-accessor.hh"
using namespace nix; using namespace nix;

8
src/nix/config.cc
View file

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

6
src/nix/copy.cc
View file

@ -1,6 +1,6 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
using namespace nix; using namespace nix;

28
src/nix/daemon.cc
View file

@ -1,19 +1,19 @@
///@file ///@file
#include "command.hh" #include "lix/libcmd/command.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "local-store.hh" #include "lix/libstore/local-store.hh"
#include "remote-store.hh" #include "lix/libstore/remote-store.hh"
#include "remote-store-connection.hh" #include "lix/libstore/remote-store-connection.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "daemon.hh" #include "lix/libstore/daemon.hh"
#include "unix-domain-socket.hh" #include "lix/libutil/unix-domain-socket.hh"
#include "daemon-command.hh" #include "daemon-command.hh"
#include <algorithm> #include <algorithm>

10
src/nix/derivation-add.cc
View file

@ -1,10 +1,10 @@
// FIXME: rename to 'nix plan add' or 'nix derivation add'? // FIXME: rename to 'nix plan add' or 'nix derivation add'?
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using namespace nix; using namespace nix;

10
src/nix/derivation-show.cc
View file

@ -1,11 +1,11 @@
// FIXME: integrate this with nix path-info? // FIXME: integrate this with nix path-info?
// FIXME: rename to 'nix store derivation show' or 'nix debug derivation show'? // FIXME: rename to 'nix store derivation show' or 'nix debug derivation show'?
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using namespace nix; using namespace nix;

2
src/nix/derivation.cc
View file

@ -1,4 +1,4 @@
#include "command.hh" #include "lix/libcmd/command.hh"
using namespace nix; using namespace nix;

18
src/nix/develop.cc
View file

@ -1,13 +1,13 @@
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "installable-flake.hh" #include "lix/libcmd/installable-flake.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "run.hh" #include "run.hh"
#include "temporary-dir.hh" #include "lix/libstore/temporary-dir.hh"
#include <iterator> #include <iterator>
#include <memory> #include <memory>

12
src/nix/diff-closures.cc
View file

@ -1,9 +1,9 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "cmd-profiles.hh" #include "lix/libcmd/cmd-profiles.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "names.hh" #include "lix/libstore/names.hh"
#include <regex> #include <regex>

16
src/nix/doctor.cc
View file

@ -1,13 +1,13 @@
#include <sstream> #include <sstream>
#include "command.hh" #include "lix/libcmd/command.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "serve-protocol.hh" #include "lix/libstore/serve-protocol.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "local-fs-store.hh" #include "lix/libstore/local-fs-store.hh"
#include "worker-protocol.hh" #include "lix/libstore/worker-protocol.hh"
#include "exit.hh" #include "lix/libutil/exit.hh"
using namespace nix; using namespace nix;

6
src/nix/dump-path.cc
View file

@ -1,6 +1,6 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
using namespace nix; using namespace nix;

12
src/nix/edit.cc
View file

@ -1,9 +1,9 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "editor-for.hh" #include "lix/libcmd/editor-for.hh"
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include <unistd.h> #include <unistd.h>

16
src/nix/eval.cc
View file

@ -1,11 +1,11 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "print-options.hh" #include "lix/libexpr/print-options.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-inline.hh" #include "lix/libexpr/eval-inline.hh"
#include "value-to-json.hh" #include "lix/libexpr/value-to-json.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

38
src/nix/flake.cc
View file

@ -1,22 +1,22 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "installable-flake.hh" #include "lix/libcmd/installable-flake.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-inline.hh" // IWYU pragma: keep #include "lix/libexpr/eval-inline.hh" // IWYU pragma: keep
#include "eval-settings.hh" #include "lix/libexpr/eval-settings.hh"
#include "flake/flake.hh" #include "lix/libexpr/flake/flake.hh"
#include "get-drvs.hh" #include "lix/libexpr/get-drvs.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "derivations.hh" #include "lix/libstore/derivations.hh"
#include "outputs-spec.hh" #include "lix/libstore/outputs-spec.hh"
#include "attr-path.hh" #include "lix/libexpr/attr-path.hh"
#include "fetchers.hh" #include "lix/libfetchers/fetchers.hh"
#include "registry.hh" #include "lix/libfetchers/registry.hh"
#include "eval-cache.hh" #include "lix/libexpr/eval-cache.hh"
#include "markdown.hh" #include "lix/libcmd/markdown.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <limits> #include <limits>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

4
src/nix/fmt.cc
View file

@ -1,5 +1,5 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "installable-value.hh" #include "lix/libcmd/installable-value.hh"
#include "run.hh" #include "run.hh"
using namespace nix; using namespace nix;

14
src/nix/hash.cc
View file

@ -1,10 +1,10 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "content-address.hh" #include "lix/libstore/content-address.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "references.hh" #include "lix/libutil/references.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "hash-command.hh" #include "hash-command.hh"
namespace nix { namespace nix {

10
src/nix/log.cc
View file

@ -1,8 +1,8 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "log-store.hh" #include "lix/libstore/log-store.hh"
using namespace nix; using namespace nix;

10
src/nix/ls.cc
View file

@ -1,8 +1,8 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "fs-accessor.hh" #include "lix/libstore/fs-accessor.hh"
#include "nar-accessor.hh" #include "lix/libstore/nar-accessor.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using namespace nix; using namespace nix;

34
src/nix/main.cc
View file

@ -1,20 +1,20 @@
#include "args/root.hh" #include "lix/libutil/args/root.hh"
#include "command.hh" #include "lix/libcmd/command.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include "eval.hh" #include "lix/libexpr/eval.hh"
#include "eval-settings.hh" #include "lix/libexpr/eval-settings.hh"
#include "globals.hh" #include "lix/libstore/globals.hh"
#include "legacy.hh" #include "lix/libcmd/legacy.hh"
#include "namespaces.hh" #include "lix/libutil/namespaces.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "filetransfer.hh" #include "lix/libstore/filetransfer.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "loggers.hh" #include "lix/libmain/loggers.hh"
#include "markdown.hh" #include "lix/libcmd/markdown.hh"
#include "experimental-features-json.hh" #include "lix/libutil/experimental-features-json.hh"
#include "deprecated-features-json.hh" #include "lix/libutil/deprecated-features-json.hh"
#include "build-remote.hh" #include "build-remote.hh"
#include "daemon-command.hh" #include "daemon-command.hh"
#include "hash-command.hh" #include "hash-command.hh"

8
src/nix/make-content-addressed.cc
View file

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "make-content-addressed.hh" #include "lix/libstore/make-content-addressed.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

2
src/nix/nar.cc
View file

@ -1,4 +1,4 @@
#include "command.hh" #include "lix/libcmd/command.hh"
using namespace nix; using namespace nix;

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

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include <atomic> #include <atomic>

4
src/nix/path-from-hash-part.cc
View file

@ -1,5 +1,5 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
using namespace nix; using namespace nix;

8
src/nix/path-info.cc
View file

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "common-args.hh" #include "lix/libmain/common-args.hh"
#include <algorithm> #include <algorithm>
#include <array> #include <array>

8
src/nix/ping-store.cc
View file

@ -1,7 +1,7 @@
#include "command.hh" #include "lix/libcmd/command.hh"
#include "shared.hh" #include "lix/libmain/shared.hh"
#include "store-api.hh" #include "lix/libstore/store-api.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

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