From 14de5fa627ec9585cf4eface1f480cce02dfa81f Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Wed, 14 Jan 2026 17:20:25 +0100 Subject: [PATCH] *: fix non-local-dir includes these ended up referring to different directories and would break during source reorganization (or even just including them in different places). Change-Id: I91e8db04e3d3565efd5920982ed5bc59d2c27058 --- lix/libexpr/eval-settings.hh | 2 +- lix/libexpr/parser/parser-impl1.inc.cc | 2 +- lix/libexpr/primops/context.cc | 2 +- lix/libexpr/primops/fromTOML.cc | 2 +- lix/libfetchers/fetch-settings.hh | 2 +- lix/libstore/build/local-derivation-goal.cc | 6 +++--- lix/libstore/build/worker.cc | 2 +- lix/libstore/filetransfer.hh | 2 +- lix/libstore/globals.hh | 2 +- lix/libutil/config.hh | 2 +- lix/libutil/deprecated-features.hh | 5 ++--- lix/libutil/experimental-features.hh | 5 ++--- lix/libutil/logging-rpc.hh | 2 +- lix/libutil/logging.hh | 2 +- 14 files changed, 18 insertions(+), 20 deletions(-) diff --git a/lix/libexpr/eval-settings.hh b/lix/libexpr/eval-settings.hh index 86905d4bf..9ed6b9f1e 100644 --- a/lix/libexpr/eval-settings.hh +++ b/lix/libexpr/eval-settings.hh @@ -14,7 +14,7 @@ struct EvalSettings : Config static std::string resolvePseudoUrl(std::string_view url); - #include "libexpr-settings.gen.inc" +#include "lix/libexpr/libexpr-settings.gen.inc" /** * Implements the `eval-system` vs `system` defaulting logic diff --git a/lix/libexpr/parser/parser-impl1.inc.cc b/lix/libexpr/parser/parser-impl1.inc.cc index 6162b4bea..885f83c81 100644 --- a/lix/libexpr/parser/parser-impl1.inc.cc +++ b/lix/libexpr/parser/parser-impl1.inc.cc @@ -1,4 +1,4 @@ -#include "eval-settings.hh" +#include "lix/libexpr/eval-settings.hh" #include "lix/libexpr/nixexpr.hh" #include "lix/libexpr/parser/change_head.hh" #include "lix/libexpr/parser/grammar.hh" diff --git a/lix/libexpr/primops/context.cc b/lix/libexpr/primops/context.cc index 4c29759d4..994125a4b 100644 --- a/lix/libexpr/primops/context.cc +++ b/lix/libexpr/primops/context.cc @@ -3,7 +3,7 @@ #include "lix/libstore/derivations.hh" #include "lix/libstore/store-api.hh" #include "lix/libutil/types.hh" -#include "value.hh" +#include "lix/libexpr/value.hh" namespace nix { diff --git a/lix/libexpr/primops/fromTOML.cc b/lix/libexpr/primops/fromTOML.cc index 9e2ecce58..4c8f6aa7a 100644 --- a/lix/libexpr/primops/fromTOML.cc +++ b/lix/libexpr/primops/fromTOML.cc @@ -1,6 +1,6 @@ #include "lix/libexpr/eval.hh" #include "lix/libexpr/extra-primops.hh" -#include "value.hh" +#include "lix/libexpr/value.hh" #include #include diff --git a/lix/libfetchers/fetch-settings.hh b/lix/libfetchers/fetch-settings.hh index a69545020..544a4f7ba 100644 --- a/lix/libfetchers/fetch-settings.hh +++ b/lix/libfetchers/fetch-settings.hh @@ -20,7 +20,7 @@ struct FetchSettings : public Config { FetchSettings(); - #include "libfetchers-settings.gen.inc" +#include "lix/libfetchers/libfetchers-settings.gen.inc" }; // FIXME: don't use a global variable. diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc index 34a0f2da4..019505f02 100644 --- a/lix/libstore/build/local-derivation-goal.cc +++ b/lix/libstore/build/local-derivation-goal.cc @@ -1,5 +1,5 @@ #include "lix/libstore/build/local-derivation-goal.hh" -#include "build/derivation-goal.hh" +#include "derivation-goal.hh" #include "lix/libutil/async-io.hh" #include "lix/libutil/async.hh" #include "lix/libutil/error.hh" @@ -29,8 +29,8 @@ #include "lix/libutil/mount.hh" #include "lix/libutil/strings.hh" #include "lix/libutil/thread-name.hh" -#include "platform/linux.hh" -#include "path-tree.hh" +#include "lix/libstore/platform/linux.hh" +#include "lix/libstore/path-tree.hh" #include #include diff --git a/lix/libstore/build/worker.cc b/lix/libstore/build/worker.cc index ba45f60fe..b27eb0299 100644 --- a/lix/libstore/build/worker.cc +++ b/lix/libstore/build/worker.cc @@ -1,4 +1,4 @@ -#include "build/derivation-goal.hh" +#include "derivation-goal.hh" #include "lix/libutil/async-collect.hh" #include "lix/libutil/async.hh" #include "lix/libutil/charptr-cast.hh" diff --git a/lix/libstore/filetransfer.hh b/lix/libstore/filetransfer.hh index 24540e50b..f01adb994 100644 --- a/lix/libstore/filetransfer.hh +++ b/lix/libstore/filetransfer.hh @@ -19,7 +19,7 @@ namespace nix { struct FileTransferSettings : Config { - #include "file-transfer-settings.gen.inc" +#include "lix/libstore/file-transfer-settings.gen.inc" }; extern FileTransferSettings fileTransferSettings; diff --git a/lix/libstore/globals.hh b/lix/libstore/globals.hh index 1e8f633cf..fe8232e14 100644 --- a/lix/libstore/globals.hh +++ b/lix/libstore/globals.hh @@ -132,7 +132,7 @@ public: */ bool readOnlyMode = false; - #include "libstore-settings.gen.inc" +#include "lix/libstore/libstore-settings.gen.inc" }; diff --git a/lix/libutil/config.hh b/lix/libutil/config.hh index a5a223053..524382aed 100644 --- a/lix/libutil/config.hh +++ b/lix/libutil/config.hh @@ -332,7 +332,7 @@ extern GlobalConfig globalConfig; struct FeatureSettings : Config { - #include "feature-settings.gen.inc" +#include "lix/libutil/feature-settings.gen.inc" /** * Check whether the given experimental feature is enabled. diff --git a/lix/libutil/deprecated-features.hh b/lix/libutil/deprecated-features.hh index 5cfa386d7..24be387d5 100644 --- a/lix/libutil/deprecated-features.hh +++ b/lix/libutil/deprecated-features.hh @@ -14,9 +14,8 @@ namespace nix { * Reminder: New deprecated features should start out with a warning without throwing an error. * See the developer documentation for details. */ -enum struct DeprecatedFeature -{ - #include "deprecated-features.gen.inc" +enum struct DeprecatedFeature { +#include "lix/libutil/deprecated-features.gen.inc" NumDepFeatures, // number of available deprecated features, do not use }; diff --git a/lix/libutil/experimental-features.hh b/lix/libutil/experimental-features.hh index 6f28c2dea..9fe4b809b 100644 --- a/lix/libutil/experimental-features.hh +++ b/lix/libutil/experimental-features.hh @@ -11,9 +11,8 @@ namespace nix { /** * The list of available experimental features. */ -enum struct ExperimentalFeature -{ - #include "experimental-features.gen.inc" +enum struct ExperimentalFeature { +#include "lix/libutil/experimental-features.gen.inc" NumXpFeatures, // number of available experimental features, do not use }; diff --git a/lix/libutil/logging-rpc.hh b/lix/libutil/logging-rpc.hh index e8de0bc32..b8a47d122 100644 --- a/lix/libutil/logging-rpc.hh +++ b/lix/libutil/logging-rpc.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "logging.capnp.h" +#include "lix/libutil/logging.capnp.h" #include "logging.hh" #include "rpc.hh" // IWYU pragma: keep #include diff --git a/lix/libutil/logging.hh b/lix/libutil/logging.hh index e37df0025..5523c0e4d 100644 --- a/lix/libutil/logging.hh +++ b/lix/libutil/logging.hh @@ -97,7 +97,7 @@ typedef uint64_t ActivityId; struct LoggerSettings : Config { - #include "logging-settings.gen.inc" +#include "lix/libutil/logging-settings.gen.inc" }; extern LoggerSettings loggerSettings;