From 81bdf8d2d672e135e68745e6975ad5edafadf13a Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 11:19:08 +0200 Subject: util.{hh,cc}: Split out terminal.{hh,cc} Change-Id: I9de2296b4012d50f540124001d54d6ca3be4c6da --- src/libexpr/flake/flake.cc | 1 + src/libexpr/print.cc | 1 + 2 files changed, 2 insertions(+) (limited to 'src/libexpr') diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index e13d1cb93..ac50351ad 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -8,6 +8,7 @@ #include "fetchers.hh" #include "finally.hh" #include "fetch-settings.hh" +#include "terminal.hh" namespace nix { diff --git a/src/libexpr/print.cc b/src/libexpr/print.cc index 231bde0a0..c56b0e72e 100644 --- a/src/libexpr/print.cc +++ b/src/libexpr/print.cc @@ -9,6 +9,7 @@ #include "english.hh" #include "signals.hh" #include "eval.hh" +#include "terminal.hh" namespace nix { -- cgit v1.2.3 From 9a52e4688ca265155817817f373938428f023966 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 13:14:13 +0200 Subject: util.{hh,cc}: Split out processes.{hh,cc} Change-Id: I39280dc40ca3f7f9007bc6c898ffcf760e2238b7 --- src/libexpr/primops.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libexpr') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 64a52dfd6..f8ce90ac1 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -9,8 +9,8 @@ #include "json-to-value.hh" #include "names.hh" #include "path-references.hh" +#include "processes.hh" #include "store-api.hh" -#include "util.hh" #include "value-to-json.hh" #include "value-to-xml.hh" #include "primops.hh" -- cgit v1.2.3 From f79ee66646f66e5117583bcf9a579b7f538ca8bb Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 15:40:03 +0200 Subject: util.{hh,cc}: Split out users.{hh,cc} Change-Id: I1bd92479a2cb7e5c2c2e1541b80474adb05ea0df --- src/libexpr/eval-cache.cc | 2 +- src/libexpr/eval-settings.cc | 3 ++- src/libexpr/flake/config.cc | 2 +- src/libexpr/parser.y | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/libexpr') diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc index 5969ee449..90fbfa308 100644 --- a/src/libexpr/eval-cache.cc +++ b/src/libexpr/eval-cache.cc @@ -1,8 +1,8 @@ #include "eval-cache.hh" #include "sqlite.hh" #include "eval.hh" -#include "eval-inline.hh" #include "store-api.hh" +#include "users.hh" namespace nix::eval_cache { diff --git a/src/libexpr/eval-settings.cc b/src/libexpr/eval-settings.cc index 046ca557d..105fd3e9d 100644 --- a/src/libexpr/eval-settings.cc +++ b/src/libexpr/eval-settings.cc @@ -1,6 +1,7 @@ +#include "file-system.hh" #include "globals.hh" #include "profiles.hh" -#include "eval.hh" +#include "users.hh" #include "eval-settings.hh" namespace nix { diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc index b9613462a..35c605de2 100644 --- a/src/libexpr/flake/config.cc +++ b/src/libexpr/flake/config.cc @@ -1,5 +1,5 @@ #include "flake.hh" -#include "globals.hh" +#include "users.hh" #include "fetch-settings.hh" #include diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 5424d8741..91cc7d089 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -19,7 +19,7 @@ #include #include "finally.hh" -#include "util.hh" +#include "users.hh" #include "nixexpr.hh" #include "eval.hh" -- cgit v1.2.3 From a39ba22ff7112cd3984bbf28d8610d84dd525a0f Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 May 2024 16:53:21 +0200 Subject: util.hh: Delete remaining file and clean up headers Change-Id: Ic1f68e6af658e94ef7922841dd3ad4c69551ef56 --- src/libexpr/attr-path.cc | 1 - src/libexpr/eval.cc | 1 - src/libexpr/flake/config.cc | 1 + src/libexpr/get-drvs.cc | 1 - src/libexpr/nixexpr.cc | 1 - src/libexpr/print-ambiguous.cc | 3 ++- src/libexpr/search-path.cc | 1 - src/libexpr/value-to-json.cc | 1 - src/libexpr/value-to-xml.cc | 4 ---- src/libexpr/value/context.hh | 1 - 10 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src/libexpr') diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index f4da99a9a..3e60f295d 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -1,6 +1,5 @@ #include "attr-path.hh" #include "eval-inline.hh" -#include "util.hh" namespace nix { diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index a8b37325b..c9a624eeb 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -5,7 +5,6 @@ #include "print-options.hh" #include "shared.hh" #include "types.hh" -#include "util.hh" #include "store-api.hh" #include "derivations.hh" #include "downstream-placeholder.hh" diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc index 35c605de2..b330d96f9 100644 --- a/src/libexpr/flake/config.cc +++ b/src/libexpr/flake/config.cc @@ -1,4 +1,5 @@ #include "flake.hh" +#include "logging.hh" #include "users.hh" #include "fetch-settings.hh" diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index e686ffe8c..8c8e142b8 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -1,5 +1,4 @@ #include "get-drvs.hh" -#include "util.hh" #include "eval-inline.hh" #include "derivations.hh" #include "store-api.hh" diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index 72a8764e6..6a1aa8f35 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -2,7 +2,6 @@ #include "derivations.hh" #include "eval.hh" #include "symbol-table.hh" -#include "util.hh" #include "print.hh" #include "escape-string.hh" diff --git a/src/libexpr/print-ambiguous.cc b/src/libexpr/print-ambiguous.cc index ec30f5073..bcf86b5c6 100644 --- a/src/libexpr/print-ambiguous.cc +++ b/src/libexpr/print-ambiguous.cc @@ -1,6 +1,7 @@ #include "print-ambiguous.hh" +#include "attr-set.hh" +#include "logging.hh" #include "print.hh" -#include "eval.hh" #include "signals.hh" #include "escape-string.hh" diff --git a/src/libexpr/search-path.cc b/src/libexpr/search-path.cc index 180d5f8b1..a25767496 100644 --- a/src/libexpr/search-path.cc +++ b/src/libexpr/search-path.cc @@ -1,5 +1,4 @@ #include "search-path.hh" -#include "util.hh" namespace nix { diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc index ebb3379a8..5743d9057 100644 --- a/src/libexpr/value-to-json.cc +++ b/src/libexpr/value-to-json.cc @@ -1,6 +1,5 @@ #include "value-to-json.hh" #include "eval-inline.hh" -#include "util.hh" #include "signals.hh" #include "store-api.hh" diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc index 5d1fbd28d..fda360eff 100644 --- a/src/libexpr/value-to-xml.cc +++ b/src/libexpr/value-to-xml.cc @@ -1,11 +1,7 @@ #include "value-to-xml.hh" #include "xml-writer.hh" -#include "eval-inline.hh" -#include "util.hh" #include "signals.hh" -#include - namespace nix { diff --git a/src/libexpr/value/context.hh b/src/libexpr/value/context.hh index 998b70e36..7f23cd3a4 100644 --- a/src/libexpr/value/context.hh +++ b/src/libexpr/value/context.hh @@ -1,7 +1,6 @@ #pragma once ///@file -#include "util.hh" #include "comparator.hh" #include "derived-path.hh" #include "variant-wrapper.hh" -- cgit v1.2.3