Update to Nix 2.28

Ericson2314 · Ericson2314 · commit 7162bce9f9b6 · 2025-04-09T12:21:48.000-04:00
diff --git a/default.nix b/default.nix
@@ -38,8 +38,6 @@ stdenv.mkDerivation {
     nlohmann_json
   ];
 
-  env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
-
   doCheck = !stdenv.isDarwin;
 
   checkPhase = ''
diff --git a/flake.nix b/flake.nix
@@ -34,7 +34,7 @@
             callPackage
             stdenv
             ;
-          nix = nixVersions.nix_2_25;
+          nix = nixVersions.nix_2_28;
           llvmPackages = llvmPackages_19;
           nixf = callPackage ./libnixf { };
           nixt = callPackage ./libnixt { inherit nix; };
diff --git a/libnixt/default.nix b/libnixt/default.nix
@@ -38,8 +38,6 @@ stdenv.mkDerivation {
     boost182
   ];
 
-  env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
-
   meta = {
     mainProgram = "nixt";
     description = "Nix language frontend, parser & semantic analysis";
diff --git a/libnixt/include/nixt/Deserialize.h b/libnixt/include/nixt/Deserialize.h
@@ -3,8 +3,8 @@
 #include "HookExpr.h"
 #include "PtrPool.h"
 
+#include <nix/expr/nixexpr.hh>
 #include <nix/input-accessor.hh>
-#include <nix/nixexpr.hh>
 
 #include <string_view>
 
diff --git a/libnixt/include/nixt/Displacement.h b/libnixt/include/nixt/Displacement.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <nix/nixexpr.hh>
+#include <nix/expr/nixexpr.hh>
 
 namespace nixt {
 
diff --git a/libnixt/include/nixt/Flake.h b/libnixt/include/nixt/Flake.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <nix/eval.hh>
+#include <nix/expr/eval.hh>
 
 #include <string_view>
 
diff --git a/libnixt/include/nixt/HackCache.h b/libnixt/include/nixt/HackCache.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <nix/eval.hh>
+#include <nix/expr/eval.hh>
 
 namespace nixt {
 
diff --git a/libnixt/include/nixt/HookExpr.h b/libnixt/include/nixt/HookExpr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nix/nixexpr.hh>
+#include <nix/expr/nixexpr.hh>
 
 #include <map>
 
diff --git a/libnixt/include/nixt/InitEval.h b/libnixt/include/nixt/InitEval.h
@@ -1,20 +1,21 @@
 #pragma once
 
-#include <nix/common-eval-args.hh>
-#include <nix/eval-gc.hh>
-#include <nix/eval-settings.hh>
-#include <nix/eval.hh>
+#include <nix/cmd/common-eval-args.hh>
+#include <nix/expr/eval-gc.hh>
+#include <nix/expr/eval-settings.hh>
+#include <nix/expr/eval.hh>
 #include <nix/flake/flake.hh>
-#include <nix/plugin.hh>
-#include <nix/shared.hh>
-#include <nix/store-api.hh>
+#include <nix/flake/settings.hh>
+#include <nix/main/plugin.hh>
+#include <nix/main/shared.hh>
+#include <nix/store/store-api.hh>
 
 namespace nixt {
 
 inline void initEval() {
   nix::initNix();
   nix::initLibStore();
-  nix::flake::initLib(nix::flakeSettings);
+  nix::flakeSettings.configureEvalSettings(nix::evalSettings);
   nix::initPlugins();
   nix::initGC();
 }
diff --git a/libnixt/include/nixt/Serialize.h b/libnixt/include/nixt/Serialize.h
@@ -8,7 +8,7 @@
 
 #include <nixbc/Type.h>
 
-#include <nix/nixexpr.hh>
+#include <nix/expr/nixexpr.hh>
 
 namespace nixt {
 
diff --git a/libnixt/include/nixt/Value.h b/libnixt/include/nixt/Value.h
@@ -1,4 +1,4 @@
-#include <nix/eval.hh>
+#include <nix/expr/eval.hh>
 
 namespace nixt {
 
diff --git a/libnixt/include/nixt/Visitor.h b/libnixt/include/nixt/Visitor.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <nix/nixexpr.hh>
-#include <nix/symbol-table.hh>
+#include <nix/expr/nixexpr.hh>
+#include <nix/expr/symbol-table.hh>
 
 /// \brief Library for playing with `nix::Expr` nodes.
 ///
diff --git a/libnixt/lib/Kinds.cpp b/libnixt/lib/Kinds.cpp
@@ -1,6 +1,6 @@
 #include "nixt/Kinds.h"
 
-#include <nix/nixexpr.hh>
+#include <nix/expr/nixexpr.hh>
 
 namespace nixt {
 
diff --git a/libnixt/lib/Value.cpp b/libnixt/lib/Value.cpp
@@ -1,9 +1,9 @@
 #include "nixt/Value.h"
 
-#include <nix/attr-path.hh>
-#include <nix/nixexpr.hh>
-#include <nix/symbol-table.hh>
-#include <nix/value.hh>
+#include <nix/expr/attr-path.hh>
+#include <nix/expr/nixexpr.hh>
+#include <nix/expr/symbol-table.hh>
+#include <nix/expr/value.hh>
 
 using namespace nixt;
 
diff --git a/libnixt/test/Kinds.cpp b/libnixt/test/Kinds.cpp
@@ -2,7 +2,7 @@
 
 #include "nixt/Kinds.h"
 
-#include <nix/nixexpr.hh>
+#include <nix/expr/nixexpr.hh>
 
 namespace {
 
diff --git a/libnixt/test/StateTest.h b/libnixt/test/StateTest.h
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <nix/common-eval-args.hh>
-#include <nix/eval.hh>
-#include <nix/store-api.hh>
+#include <nix/cmd/common-eval-args.hh>
+#include <nix/expr/eval.hh>
+#include <nix/store/store-api.hh>
 
 namespace nixt {
 
diff --git a/nixd/default.nix b/nixd/default.nix
@@ -47,8 +47,6 @@ stdenv.mkDerivation {
     boost182
   ];
 
-  env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
-
   meta = {
     mainProgram = "nixd";
     description = "Nix language server";
diff --git a/nixd/include/nixd/Eval/AttrSetProvider.h b/nixd/include/nixd/Eval/AttrSetProvider.h
@@ -21,7 +21,7 @@
 
 #include "lspserver/LSPServer.h"
 
-#include <nix/eval.hh>
+#include <nix/expr/eval.hh>
 
 #include <memory>
 
diff --git a/nixd/include/nixd/Eval/EvalProvider.h b/nixd/include/nixd/Eval/EvalProvider.h
@@ -8,7 +8,7 @@
 #include <nixt/HookExpr.h>
 #include <nixt/PtrPool.h>
 
-#include <nix/nixexpr.hh>
+#include <nix/expr/nixexpr.hh>
 
 namespace nixd {
 
diff --git a/nixd/include/nixd/Protocol/AttrSet.h b/nixd/include/nixd/Protocol/AttrSet.h
@@ -16,7 +16,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 #endif
 
-#include <nix/value.hh>
+#include <nix/expr/value.hh>
 
 #ifdef __clang__
 #pragma clang diagnostic pop
diff --git a/nixd/lib/Eval/AttrSetProvider.cpp b/nixd/lib/Eval/AttrSetProvider.cpp
@@ -3,10 +3,10 @@
 
 #include "lspserver/Protocol.h"
 
-#include <nix/attr-path.hh>
-#include <nix/common-eval-args.hh>
-#include <nix/nixexpr.hh>
-#include <nix/store-api.hh>
+#include <nix/cmd/common-eval-args.hh>
+#include <nix/expr/attr-path.hh>
+#include <nix/expr/nixexpr.hh>
+#include <nix/store/store-api.hh>
 #include <nixt/Value.h>
 
 using namespace nixd;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`callPackage`
`35`	`35`	`stdenv`
`36`	`36`	`;`
`37`		`- nix = nixVersions.nix_2_25;`
	`37`	`+ nix = nixVersions.nix_2_28;`
`38`	`38`	`llvmPackages = llvmPackages_19;`
`39`	`39`	`nixf = callPackage ./libnixf { };`
`40`	`40`	`nixt = callPackage ./libnixt { inherit nix; };`