WIP get settings info out of headers, out of libutil

Also make a tiny bit of progress on libstore

Author: Ericson2314

doc/manual/source/release-notes/rl-2.28.md

@@ -46,7 +46,7 @@ This completes the infrastructure overhaul for the [RFC 132](https://github.com/
   @@ @@
   -#include "config.hh"
   +// Additionally renamed to distinguish from components' config headers.
-  +#include "nix/util/configuration.hh"
+  +#include "nix/main/configuration.hh"
   @@ @@
   -#if HAVE_ACL_SUPPORT
   +#if NIX_SUPPORT_ACL

maintainers/flake-module.nix

@@ -180,8 +180,14 @@
               ''^src/libflake/lockfile\.cc$''
               ''^src/libflake/include/nix/flake/lockfile\.hh$''
               ''^src/libflake/url-name\.cc$''
+              ''^src/libmain/args/root\.hh$''
+              ''^src/libmain/args\.cc$''
+              ''^src/libmain/args\.hh$''
               ''^src/libmain/common-args\.cc$''
               ''^src/libmain/include/nix/main/common-args\.hh$''
+              ''^src/libmain/include/nix/main/config-impl\.hh$''
+              ''^src/libmain/config\.cc$''
+              ''^src/libmain/include/nix/main/config\.hh$''
               ''^src/libmain/loggers\.cc$''
               ''^src/libmain/include/nix/main/loggers\.hh$''
               ''^src/libmain/progress-bar\.cc$''
@@ -312,19 +318,13 @@
               ''^src/libutil-c/nix_api_util_internal\.h$''
               ''^src/libutil/archive\.cc$''
               ''^src/libutil/include/nix/util/archive\.hh$''
-              ''^src/libutil/args\.cc$''
-              ''^src/libutil/include/nix/util/args\.hh$''
-              ''^src/libutil/include/nix/util/args/root\.hh$''
               ''^src/libutil/include/nix/util/callback\.hh$''
               ''^src/libutil/canon-path\.cc$''
               ''^src/libutil/include/nix/util/canon-path\.hh$''
               ''^src/libutil/include/nix/util/chunked-vector\.hh$''
               ''^src/libutil/include/nix/util/closure\.hh$''
               ''^src/libutil/include/nix/util/comparator\.hh$''
               ''^src/libutil/compute-levels\.cc$''
-              ''^src/libutil/include/nix/util/config-impl\.hh$''
-              ''^src/libutil/configuration\.cc$''
-              ''^src/libutil/include/nix/util/configuration\.hh$''
               ''^src/libutil/current-process\.cc$''
               ''^src/libutil/include/nix/util/current-process\.hh$''
               ''^src/libutil/english\.cc$''

src/libcmd/common-eval-args.cc

@@ -2,7 +2,7 @@
 #include "nix/expr/eval-settings.hh"
 #include "nix/cmd/common-eval-args.hh"
 #include "nix/main/shared.hh"
-#include "nix/util/config-global.hh"
+#include "nix/main/config-global.hh"
 #include "nix/store/filetransfer.hh"
 #include "nix/expr/eval.hh"
 #include "nix/fetchers/fetchers.hh"

src/libcmd/include/nix/cmd/command.hh

@@ -2,7 +2,7 @@
 ///@file
 
 #include "nix/cmd/installable-value.hh"
-#include "nix/util/args.hh"
+#include "nix/main/args.hh"
 #include "nix/cmd/common-eval-args.hh"
 #include "nix/store/path.hh"
 #include "nix/flake/lockfile.hh"

src/libcmd/include/nix/cmd/common-eval-args.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "nix/util/args.hh"
+#include "nix/main/args.hh"
 #include "nix/util/canon-path.hh"
 #include "nix/main/common-args.hh"
 #include "nix/expr/search-path.hh"

src/libcmd/include/nix/cmd/compatibility-settings.hh

@@ -1,5 +1,5 @@
 #pragma once
-#include "nix/util/configuration.hh"
+#include "nix/main/configuration.hh"
 
 namespace nix {
 struct CompatibilitySettings : public Config

src/libcmd/include/nix/cmd/misc-store-flags.hh

@@ -1,4 +1,4 @@
-#include "nix/util/args.hh"
+#include "nix/main/args.hh"
 #include "nix/store/content-address.hh"
 
 namespace nix::flag {

src/libexpr-c/nix_api_external.cc

@@ -1,5 +1,5 @@
 #include "nix/expr/attr-set.hh"
-#include "nix/util/configuration.hh"
+#include "nix/main/configuration.hh"
 #include "nix/expr/eval.hh"
 #include "nix/store/globals.hh"
 #include "nix/expr/value.hh"

src/libexpr-c/nix_api_value.cc

@@ -1,5 +1,5 @@
 #include "nix/expr/attr-set.hh"
-#include "nix/util/configuration.hh"
+#include "nix/main/configuration.hh"
 #include "nix/expr/eval.hh"
 #include "nix/store/globals.hh"
 #include "nix/store/path.hh"

src/libexpr/eval-gc.cc

@@ -1,7 +1,7 @@
 #include "nix/util/error.hh"
 #include "nix/util/environment-variables.hh"
 #include "nix/expr/eval-settings.hh"
-#include "nix/util/config-global.hh"
+#include "nix/main/config-global.hh"
 #include "nix/util/serialise.hh"
 #include "nix/expr/eval-gc.hh"