diff options
Diffstat (limited to 'src/libcmd')
| -rw-r--r-- | src/libcmd/common-eval-args.cc | 1 | ||||
| -rw-r--r-- | src/libcmd/editor-for.cc | 2 | ||||
| -rw-r--r-- | src/libcmd/installable-attr-path.cc | 1 | ||||
| -rw-r--r-- | src/libcmd/installable-attr-path.hh | 1 | ||||
| -rw-r--r-- | src/libcmd/installable-flake.cc | 1 | ||||
| -rw-r--r-- | src/libcmd/installables.cc | 7 | ||||
| -rw-r--r-- | src/libcmd/installables.hh | 1 | ||||
| -rw-r--r-- | src/libcmd/markdown.cc | 3 | ||||
| -rw-r--r-- | src/libcmd/repl-interacter.cc | 7 | ||||
| -rw-r--r-- | src/libcmd/repl.cc | 1 |
10 files changed, 9 insertions, 16 deletions
diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index 9beea5aa2..e86213020 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -2,7 +2,6 @@ #include "common-eval-args.hh" #include "shared.hh" #include "filetransfer.hh" -#include "util.hh" #include "eval.hh" #include "fetchers.hh" #include "registry.hh" diff --git a/src/libcmd/editor-for.cc b/src/libcmd/editor-for.cc index e5f762104..67653d9c9 100644 --- a/src/libcmd/editor-for.cc +++ b/src/libcmd/editor-for.cc @@ -1,5 +1,5 @@ -#include "util.hh" #include "editor-for.hh" +#include "environment-variables.hh" #include "source-path.hh" namespace nix { diff --git a/src/libcmd/installable-attr-path.cc b/src/libcmd/installable-attr-path.cc index 06e507872..eb15fecc3 100644 --- a/src/libcmd/installable-attr-path.cc +++ b/src/libcmd/installable-attr-path.cc @@ -1,7 +1,6 @@ #include "globals.hh" #include "installable-attr-path.hh" #include "outputs-spec.hh" -#include "util.hh" #include "command.hh" #include "attr-path.hh" #include "common-eval-args.hh" diff --git a/src/libcmd/installable-attr-path.hh b/src/libcmd/installable-attr-path.hh index e9f0c33da..86c2f8219 100644 --- a/src/libcmd/installable-attr-path.hh +++ b/src/libcmd/installable-attr-path.hh @@ -4,7 +4,6 @@ #include "globals.hh" #include "installable-value.hh" #include "outputs-spec.hh" -#include "util.hh" #include "command.hh" #include "attr-path.hh" #include "common-eval-args.hh" diff --git a/src/libcmd/installable-flake.cc b/src/libcmd/installable-flake.cc index 46bdd411b..b1ebd339e 100644 --- a/src/libcmd/installable-flake.cc +++ b/src/libcmd/installable-flake.cc @@ -2,7 +2,6 @@ #include "installable-flake.hh" #include "installable-derived-path.hh" #include "outputs-spec.hh" -#include "util.hh" #include "command.hh" #include "attr-path.hh" #include "common-eval-args.hh" diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index 2c18653e4..ab0e4fd1c 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -3,26 +3,21 @@ #include "installable-derived-path.hh" #include "installable-attr-path.hh" #include "installable-flake.hh" +#include "logging.hh" #include "outputs-spec.hh" -#include "util.hh" #include "command.hh" #include "attr-path.hh" #include "common-eval-args.hh" #include "derivations.hh" -#include "eval-inline.hh" #include "eval.hh" #include "eval-settings.hh" -#include "get-drvs.hh" #include "store-api.hh" #include "shared.hh" #include "flake/flake.hh" #include "eval-cache.hh" -#include "url.hh" #include "registry.hh" #include "build-result.hh" -#include <regex> -#include <queue> #include <nlohmann/json.hpp> diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh index ad5b4f759..95e8841ca 100644 --- a/src/libcmd/installables.hh +++ b/src/libcmd/installables.hh @@ -1,7 +1,6 @@ #pragma once ///@file -#include "util.hh" #include "path.hh" #include "outputs-spec.hh" #include "derived-path.hh" diff --git a/src/libcmd/markdown.cc b/src/libcmd/markdown.cc index 668a07763..dbaab8c19 100644 --- a/src/libcmd/markdown.cc +++ b/src/libcmd/markdown.cc @@ -1,6 +1,7 @@ #include "markdown.hh" -#include "util.hh" +#include "error.hh" #include "finally.hh" +#include "terminal.hh" #include <sys/queue.h> #include <lowdown.h> diff --git a/src/libcmd/repl-interacter.cc b/src/libcmd/repl-interacter.cc index 41589cda1..0cf4e34b8 100644 --- a/src/libcmd/repl-interacter.cc +++ b/src/libcmd/repl-interacter.cc @@ -1,3 +1,7 @@ +#include "error.hh" +#include "file-system.hh" +#include "logging.hh" +#include <csignal> #include <cstdio> #include <iostream> #include <string> @@ -18,11 +22,8 @@ extern "C" { } #endif -#include "signals.hh" #include "finally.hh" #include "repl-interacter.hh" -#include "util.hh" -#include "repl.hh" namespace nix { diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index 02aa5a272..49865aa90 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -31,6 +31,7 @@ #include "print.hh" #include "progress-bar.hh" #include "gc-small-vector.hh" +#include "users.hh" #if HAVE_BOEHMGC #define GC_INCLUDE_NEW |