diff options
| author | jade <lix@jade.fyi> | 2024-05-30 02:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-30 02:33:05 +0000 |
| commit | 562ff516ab27b8e98490646dd30ac96e7e2c36bb (patch) | |
| tree | 1798a20b33da0101bd91acf7da26c891f0cda620 /src/libmain | |
| parent | c71f21da3ac4d95ef9a42a26416ccee71639dbd6 (diff) | |
| parent | a39ba22ff7112cd3984bbf28d8610d84dd525a0f (diff) | |
Merge changes from topic "libutil-split" into main
* changes:
util.hh: Delete remaining file and clean up headers
util.hh: Move nativeSystem to local-derivation-goal.cc
util.hh: Move stuff to types.hh
util.cc: Delete remaining file
util.{hh,cc}: Move ignoreException to error.{hh,cc}
util.{hh,cc}: Split out namespaces.{hh,cc}
util.{hh,cc}: Split out users.{hh,cc}
util.{hh,cc}: Split out strings.{hh,cc}
util.{hh,cc}: Split out unix-domain-socket.{hh,cc}
util.{hh,cc}: Split out child.{hh,cc}
util.{hh,cc}: Split out current-process.{hh,cc}
util.{hh,cc}: Split out processes.{hh,cc}
util.{hh,cc}: Split out file-descriptor.{hh,cc}
util.{hh,cc}: Split out file-system.{hh,cc}
util.{hh,cc}: Split out terminal.{hh,cc}
util.{hh,cc}: Split out environment-variables.{hh,cc}
Diffstat (limited to 'src/libmain')
| -rw-r--r-- | src/libmain/common-args.cc | 1 | ||||
| -rw-r--r-- | src/libmain/loggers.cc | 2 | ||||
| -rw-r--r-- | src/libmain/progress-bar.cc | 2 | ||||
| -rw-r--r-- | src/libmain/shared.cc | 2 | ||||
| -rw-r--r-- | src/libmain/shared.hh | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc index 12ce289c5..af7f46296 100644 --- a/src/libmain/common-args.cc +++ b/src/libmain/common-args.cc @@ -2,6 +2,7 @@ #include "args/root.hh" #include "globals.hh" #include "loggers.hh" +#include "logging.hh" namespace nix { diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc index cda5cb939..80080d616 100644 --- a/src/libmain/loggers.cc +++ b/src/libmain/loggers.cc @@ -1,6 +1,6 @@ +#include "environment-variables.hh" #include "loggers.hh" #include "progress-bar.hh" -#include "util.hh" namespace nix { diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index 1a68daca2..11b2fe800 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -1,8 +1,8 @@ #include "progress-bar.hh" -#include "util.hh" #include "sync.hh" #include "store-api.hh" #include "names.hh" +#include "terminal.hh" #include <atomic> #include <map> diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 33323a226..f99777a20 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -2,10 +2,10 @@ #include "shared.hh" #include "store-api.hh" #include "gc-store.hh" -#include "util.hh" #include "signals.hh" #include "loggers.hh" #include "progress-bar.hh" +#include "current-process.hh" #include <algorithm> #include <cctype> diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh index a7810f77c..b791980fa 100644 --- a/src/libmain/shared.hh +++ b/src/libmain/shared.hh @@ -1,12 +1,12 @@ #pragma once ///@file -#include "util.hh" #include "args.hh" #include "args/root.hh" #include "common-args.hh" #include "path.hh" #include "derived-path.hh" +#include "processes.hh" #include "exit.hh" #include <signal.h> |