Merge pull request 'nixexpr -> lixexpr' (#5) from jade/lixexpr into main

Reviewed-on: #5

meson.build

@@ -3,10 +3,10 @@ project('nix-eval-jobs', 'cpp',
   license : 'GPL-3.0',
 )
 
-nix_main_dep = dependency('nix-main', required: true)
+nix_main_dep = dependency('lix-main', required: true)
-nix_store_dep = dependency('nix-store', required: true)
+nix_store_dep = dependency('lix-store', required: true)
-nix_expr_dep = dependency('nix-expr', required: true)
+nix_expr_dep = dependency('lix-expr', required: true)
-nix_cmd_dep = dependency('nix-cmd', required: true)
+nix_cmd_dep = dependency('lix-cmd', required: true)
 threads_dep = dependency('threads', required: true)
 nlohmann_json_dep = dependency('nlohmann_json', required: true)
 boost_dep = dependency('boost', required: true)

src/buffered-io.cc

@@ -1,9 +1,9 @@
 #include <string.h>
 #include <unistd.h>
-#include <nix/signals.hh>
+#include <lix/libutil/signals.hh>
 #include <errno.h>
 #include <stdlib.h>
-#include <error.hh>
+#include <lix/libutil/error.hh>
 
 #include "buffered-io.hh"
 

src/drv.cc

@@ -1,19 +1,19 @@
-#include <nix/config.h> // IWYU pragma: keep
+#include <lix/config.h> // IWYU pragma: keep
 
-#include <nix/path-with-outputs.hh>
+#include <lix/libstore/path-with-outputs.hh>
-#include <nix/store-api.hh>
+#include <lix/libstore/store-api.hh>
-#include <nix/local-fs-store.hh>
+#include <lix/libstore/local-fs-store.hh>
-#include <nix/value-to-json.hh>
+#include <lix/libexpr/value-to-json.hh>
-#include <nix/derivations.hh>
+#include <lix/libstore/derivations.hh>
 #include <stdint.h>
-#include <nix/derived-path-map.hh>
+#include <lix/libstore/derived-path-map.hh>
-#include <nix/eval.hh>
+#include <lix/libexpr/eval.hh>
-#include <nix/get-drvs.hh>
+#include <lix/libexpr/get-drvs.hh>
-#include <nix/nixexpr.hh>
+#include <lix/libexpr/nixexpr.hh>
 #include <nlohmann/detail/json_ref.hpp>
-#include <nix/path.hh>
+#include <lix/libstore/path.hh>
-#include <nix/ref.hh>
+#include <lix/libutil/ref.hh>
-#include <nix/value/context.hh>
+#include <lix/libexpr/value/context.hh>
 #include <exception>
 #include <memory>
 #include <sstream>

src/drv.hh

@@ -1,5 +1,5 @@
-#include <nix/get-drvs.hh>
+#include <lix/libexpr/get-drvs.hh>
-#include <nix/eval.hh>
+#include <lix/libexpr/eval.hh>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 #include <string>

src/eval-args.cc

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <args.hh>
+#include <lix/libutil/args.hh>
-#include <flake/flake.hh>
+#include <lix/libexpr/flake/flake.hh>
-#include <flake/lockfile.hh>
+#include <lix/libexpr/flake/lockfile.hh>
 #include <functional>
 #include <map>
 #include <memory>

src/eval-args.hh

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <nix/flake/flake.hh>
+#include <lix/libexpr/flake/flake.hh>
-#include <nix/args/root.hh>
+#include <lix/libutil/args/root.hh>
-#include <nix/common-eval-args.hh>
+#include <lix/libcmd/common-eval-args.hh>
 #include <stddef.h>
-#include <nix/common-args.hh>
+#include <lix/libmain/common-args.hh>
-#include <nix/flake/flakeref.hh>
+#include <lix/libexpr/flake/flakeref.hh>
-#include <nix/types.hh>
+#include <lix/libutil/types.hh>
 #include <string>
 #include <optional>
 

src/nix-eval-jobs.cc

@@ -1,10 +1,10 @@
-#include <nix/config.h> // IWYU pragma: keep
+#include <lix/config.h> // IWYU pragma: keep
 
-#include <eval-settings.hh>
+#include <lix/libexpr/eval-settings.hh>
-#include <shared.hh>
+#include <lix/libmain/shared.hh>
-#include <sync.hh>
+#include <lix/libutil/sync.hh>
-#include <eval.hh>
+#include <lix/libexpr/eval.hh>
-#include <signals.hh>
+#include <lix/libutil/signals.hh>
 #include <sys/wait.h>
 #include <nlohmann/json.hpp>
 #include <errno.h>
@@ -12,16 +12,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <attr-set.hh>
+#include <lix/libexpr/attr-set.hh>
-#include <config.hh>
+#include <lix/libutil/config.hh>
-#include <error.hh>
+#include <lix/libutil/error.hh>
-#include <globals.hh>
+#include <lix/libstore/globals.hh>
-#include <logging.hh>
+#include <lix/libutil/logging.hh>
 #include <nlohmann/detail/iterators/iter_impl.hpp>
 #include <nlohmann/detail/json_ref.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <ref.hh>
+#include <lix/libutil/ref.hh>
-#include <store-api.hh>
+#include <lix/libstore/store-api.hh>
 #include <map>
 #include <thread>
 #include <condition_variable>

src/worker.cc

@@ -1,34 +1,34 @@
-#include <nix/config.h> // IWYU pragma: keep
+#include <lix/config.h> // IWYU pragma: keep
 
 // doesn't exist on macOS
 // IWYU pragma: no_include <bits/types/struct_rusage.h>
 
-#include <attr-path.hh>
+#include <lix/libexpr/attr-path.hh>
-#include <local-fs-store.hh>
+#include <lix/libstore/local-fs-store.hh>
-#include <installable-flake.hh>
+#include <lix/libcmd/installable-flake.hh>
 #include <sys/resource.h>
 #include <nlohmann/json.hpp>
 #include <stdio.h>
 #include <stdlib.h>
-#include <attr-set.hh>
+#include <lix/libexpr/attr-set.hh>
-#include <canon-path.hh>
+#include <lix/libutil/canon-path.hh>
-#include <common-eval-args.hh>
+#include <lix/libcmd/common-eval-args.hh>
-#include <error.hh>
+#include <lix/libutil/error.hh>
-#include <eval-inline.hh>
+#include <lix/libexpr/eval-inline.hh>
-#include <eval.hh>
+#include <lix/libexpr/eval.hh>
-#include <flake/flakeref.hh>
+#include <lix/libexpr/flake/flakeref.hh>
-#include <get-drvs.hh>
+#include <lix/libexpr/get-drvs.hh>
-#include <input-accessor.hh>
+#include <lix/libutil/input-accessor.hh>
-#include <logging.hh>
+#include <lix/libutil/logging.hh>
-#include <nixexpr.hh>
+#include <lix/libexpr/nixexpr.hh>
 #include <nlohmann/detail/json_ref.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <ref.hh>
+#include <lix/libutil/ref.hh>
-#include <store-api.hh>
+#include <lix/libstore/store-api.hh>
-#include <symbol-table.hh>
+#include <lix/libexpr/symbol-table.hh>
-#include <types.hh>
+#include <lix/libutil/types.hh>
-#include <util.hh>
+#include <lix/libutil/util.hh>
-#include <value.hh>
+#include <lix/libexpr/value.hh>
 #include <exception>
 #include <map>
 #include <memory>

src/worker.hh

@@ -1,6 +1,6 @@
 #pragma once
-#include <nix/shared.hh>
+#include <lix/libmain/shared.hh>
-#include <nix/eval.hh>
+#include <lix/libexpr/eval.hh>
 
 #include "eval-args.hh"