Reorganise include files

.gitignore

@@ -128,5 +128,6 @@ compile_commands.json
 nix-rust/target
 
 result
+result-*
 
 .vscode/

local.mk

@@ -2,9 +2,8 @@ clean-files += Makefile.config
 
 GLOBAL_CXXFLAGS += -Wno-deprecated-declarations
 
-$(foreach i, config.h $(wildcard src/lib*/*.hh), \
-  $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
+$(eval $(call install-file-in, config.h, $(includedir)/nix, 0644))
 
-$(GCH): src/libutil/util.hh config.h
+$(GCH): src/libutil/include/nix/util/util.hh config.h
 
-GCH_CXXFLAGS = -I src/libutil
+GCH_CXXFLAGS = -Isrc/libutil/include/nix/util

perl/Makefile

@@ -1,6 +1,6 @@
 makefiles = local.mk
 
-GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I ../src
+GLOBAL_CXXFLAGS += -g -Wall -std=c++2a
 
 -include Makefile.config
 

perl/lib/Nix/Store.xs

@@ -1,4 +1,4 @@
-#include "config.h"
+#include "nix/config.h"
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -8,11 +8,11 @@
 #undef do_open
 #undef do_close
 
-#include "derivations.hh"
-#include "globals.hh"
-#include "store-api.hh"
-#include "util.hh"
-#include "crypto.hh"
+#include "nix/store/crypto.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/globals.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/util.hh"
 
 #include <sodium.h>
 #include <nlohmann/json.hpp>

src/build-remote/build-remote.cc

@@ -9,17 +9,17 @@
 #include <sys/time.h>
 #endif
 
-#include "machines.hh"
-#include "shared.hh"
-#include "pathlocks.hh"
-#include "globals.hh"
-#include "serialise.hh"
-#include "build-result.hh"
-#include "store-api.hh"
-#include "derivations.hh"
-#include "local-store.hh"
-#include "legacy.hh"
-#include "experimental-features.hh"
+#include "nix/store/machines.hh"
+#include "nix/main/shared.hh"
+#include "nix/store/pathlocks.hh"
+#include "nix/store/globals.hh"
+#include "nix/util/serialise.hh"
+#include "nix/store/build-result.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/derivations.hh"
+#include "nix/store/local-store.hh"
+#include "nix/cmd/legacy.hh"
+#include "nix/util/experimental-features.hh"
 
 using namespace nix;
 using std::cin;

src/libcmd/command.cc

@@ -1,10 +1,10 @@
-#include "command.hh"
-#include "store-api.hh"
-#include "local-fs-store.hh"
-#include "derivations.hh"
-#include "nixexpr.hh"
-#include "profiles.hh"
-#include "repl.hh"
+#include "nix/cmd/command.hh"
+#include "nix/store/store-api.hh"
+#include "nix/store/local-fs-store.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/nixexpr.hh"
+#include "nix/store/profiles.hh"
+#include "nix/cmd/repl.hh"
 
 #include <nlohmann/json.hpp>
 

src/libcmd/common-eval-args.cc

@@ -1,13 +1,13 @@
-#include "common-eval-args.hh"
-#include "shared.hh"
-#include "filetransfer.hh"
-#include "util.hh"
-#include "eval.hh"
-#include "fetchers.hh"
-#include "registry.hh"
-#include "flake/flakeref.hh"
-#include "store-api.hh"
-#include "command.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/main/shared.hh"
+#include "nix/store/filetransfer.hh"
+#include "nix/util/util.hh"
+#include "nix/expr/eval.hh"
+#include "nix/fetchers/fetchers.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/expr/flake/flakeref.hh"
+#include "nix/store/store-api.hh"
+#include "nix/cmd/command.hh"
 
 namespace nix {
 

src/libcmd/editor-for.cc

@@ -1,5 +1,5 @@
-#include "util.hh"
-#include "editor-for.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/editor-for.hh"
 
 namespace nix {
 

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

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "installables.hh"
-#include "args.hh"
-#include "common-eval-args.hh"
-#include "path.hh"
-#include "flake/lockfile.hh"
+#include "nix/cmd/installables.hh"
+#include "nix/util/args.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/path.hh"
+#include "nix/expr/flake/lockfile.hh"
 
 #include <optional>
 

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "args.hh"
+#include "nix/util/args.hh"
 
 namespace nix {
 

src/libcmd/editor-for.hh → src/libcmd/include/nix/cmd/editor-for.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libcmd/installable-attr-path.hh → src/libcmd/include/nix/cmd/installable-attr-path.hh

@@ -1,20 +1,20 @@
-#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"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.hh"
-#include "get-drvs.hh"
-#include "store-api.hh"
-#include "shared.hh"
-#include "eval-cache.hh"
-#include "url.hh"
-#include "registry.hh"
-#include "build-result.hh"
+#include "nix/store/globals.hh"
+#include "nix/cmd/installable-value.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-derived-path.hh → src/libcmd/include/nix/cmd/installable-derived-path.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "installables.hh"
+#include "nix/cmd/installables.hh"
 
 namespace nix {
 

src/libcmd/installable-flake.hh → src/libcmd/include/nix/cmd/installable-flake.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "installable-value.hh"
+#include "nix/cmd/installable-value.hh"
 
 namespace nix {
 

src/libcmd/installable-value.hh → src/libcmd/include/nix/cmd/installable-value.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "installables.hh"
+#include "nix/cmd/installables.hh"
 
 namespace nix {
 

src/libcmd/installables.hh → src/libcmd/include/nix/cmd/installables.hh

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "util.hh"
-#include "path.hh"
-#include "outputs-spec.hh"
-#include "derived-path.hh"
-#include "eval.hh"
-#include "store-api.hh"
-#include "flake/flake.hh"
-#include "build-result.hh"
+#include "nix/util/util.hh"
+#include "nix/store/path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/store/derived-path.hh"
+#include "nix/expr/eval.hh"
+#include "nix/store/store-api.hh"
+#include "nix/expr/flake/flake.hh"
+#include "nix/store/build-result.hh"
 
 #include <optional>
 

src/libcmd/markdown.hh → src/libcmd/include/nix/cmd/markdown.hh

@@ -1,4 +1,4 @@
-#include "types.hh"
+#include "nix/util/types.hh"
 
 namespace nix {
 

src/libcmd/repl.hh → src/libcmd/include/nix/cmd/repl.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "eval.hh"
+#include "nix/expr/eval.hh"
 
 #if HAVE_BOEHMGC
 #define GC_INCLUDE_NEW

src/libcmd/installable-attr-path.cc

@@ -1,21 +1,21 @@
-#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"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.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 "nix/store/globals.hh"
+#include "nix/cmd/installable-attr-path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
+#include "nix/expr/flake/flake.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-derived-path.cc

@@ -1,5 +1,5 @@
-#include "installable-derived-path.hh"
-#include "derivations.hh"
+#include "nix/cmd/installable-derived-path.hh"
+#include "nix/store/derivations.hh"
 
 namespace nix {
 

src/libcmd/installable-flake.cc

@@ -1,22 +1,22 @@
-#include "globals.hh"
-#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"
-#include "derivations.hh"
-#include "eval-inline.hh"
-#include "eval.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 "nix/store/globals.hh"
+#include "nix/cmd/installable-flake.hh"
+#include "nix/cmd/installable-attr-path.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
+#include "nix/expr/flake/flake.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installables.cc

@@ -1,24 +1,24 @@
-#include "globals.hh"
-#include "installables.hh"
-#include "installable-derived-path.hh"
-#include "installable-attr-path.hh"
-#include "installable-flake.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 "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 "nix/store/globals.hh"
+#include "nix/cmd/installables.hh"
+#include "nix/cmd/installable-derived-path.hh"
+#include "nix/cmd/installable-attr-path.hh"
+#include "nix/cmd/installable-flake.hh"
+#include "nix/store/outputs-spec.hh"
+#include "nix/util/util.hh"
+#include "nix/cmd/command.hh"
+#include "nix/expr/attr-path.hh"
+#include "nix/cmd/common-eval-args.hh"
+#include "nix/store/derivations.hh"
+#include "nix/expr/eval-inline.hh"
+#include "nix/expr/eval.hh"
+#include "nix/expr/get-drvs.hh"
+#include "nix/store/store-api.hh"
+#include "nix/main/shared.hh"
+#include "nix/expr/flake/flake.hh"
+#include "nix/expr/eval-cache.hh"
+#include "nix/util/url.hh"
+#include "nix/fetchers/registry.hh"
+#include "nix/store/build-result.hh"
 
 #include <regex>
 #include <queue>