fix compilation with nix 2.24

nix-community · Nov 7, 2024 · c0cc285 · c0cc285
1 parent 20290ee
commit c0cc285
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 22 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -33,7 +33,7 @@
             callPackage
             stdenv
             ;
-          nix = nixVersions.nix_2_19;
+          nix = nixVersions.nix_2_24;
           llvmPackages = llvmPackages_16;
           nixf = callPackage ./libnixf { };
           nixt = callPackage ./libnixt { inherit nix; };

diff --git a/libnixt/include/nixt/InitEval.h b/libnixt/include/nixt/InitEval.h
@@ -3,12 +3,18 @@
 #include <nix/eval.hh>
 #include <nix/shared.hh>
 #include <nix/store-api.hh>
+#include <nix/eval-gc.hh>
+#include <nix/eval-settings.hh>
+#include <nix/flake/flake.hh>
+#include <nix/plugin.hh>
+#include <nix/common-eval-args.hh>
 
 namespace nixt {
 
 inline void initEval() {
   nix::initNix();
   nix::initLibStore();
+  nix::flake::initLib(nix::flakeSettings);
   nix::initPlugins();
   nix::initGC();
 }

diff --git a/libnixt/lib/Flake.cpp b/libnixt/lib/Flake.cpp
@@ -147,12 +147,12 @@ void nixt::callDirtyFlake(EvalState &State, std::string_view Src,
                           nix::Value &VRes) {
 
   nix::Value *VSrc = State.allocValue();
-  VSrc->mkPath(State.rootPath(nix::CanonPath(Src, nix::CanonPath::fromCwd())));
+  VSrc->mkPath(State.rootPath(nix::CanonPath(Src)));
 
   auto *VFlakeCompat = State.allocValue();
 
   nix::Expr *EFlakeCompat = State.parseExprFromString(
-      FlakeCompat, State.rootPath(nix::CanonPath::fromCwd()));
+      FlakeCompat, State.rootPath("."));
   State.eval(EFlakeCompat, *VFlakeCompat);
 
   State.callFunction(*VFlakeCompat, *VSrc, VRes, noPos);

diff --git a/libnixt/lib/Value.cpp b/libnixt/lib/Value.cpp
@@ -14,7 +14,7 @@ std::optional<nix::Value> nixt::getField(nix::EvalState &State, nix::Value &V,
     return std::nullopt;
 
   nix::Symbol SFiled = State.symbols.create(Field);
-  if (auto *It = V.attrs->find(SFiled); It != V.attrs->end())
+  if (auto *It = V.attrs()->find(SFiled); It != V.attrs()->end())
     return *It->value;
 
   return std::nullopt;
@@ -88,9 +88,9 @@ nix::Value &nixt::selectAttr(nix::EvalState &State, nix::Value &V,
   if (V.type() != nix::ValueType::nAttrs)
     throw nix::TypeError("value is not an attrset");
 
-  assert(V.attrs && "nix must allocate non-null attrs!");
-  auto *Nested = V.attrs->find(Attr);
-  if (Nested == V.attrs->end())
+  assert(V.attrs() && "nix must allocate non-null attrs!");
+  auto *Nested = V.attrs()->find(Attr);
+  if (Nested == V.attrs()->end())
     throw nix::AttrPathNotFound("attrname " + State.symbols[Attr] +
                                 " not found in attrset");
 
@@ -145,11 +145,12 @@ nix::Value getSubOptions(nix::EvalState &State, nix::Value &Type) {
   nix::Value &GetSubOptions =
       selectAttr(State, Type, State.symbols.create("getSubOptions"));
 
-  nix::Value EmptyList;
-  EmptyList.mkList(0);
+  auto list = State.buildList(0);
+  auto EmptyList = State.allocValue();
+  EmptyList->mkList(list);
   // Invoke "GetSubOptions"
   nix::Value VResult;
-  State.callFunction(GetSubOptions, EmptyList, VResult, nix::noPos);
+  State.callFunction(GetSubOptions, *EmptyList, VResult, nix::noPos);
   return VResult;
 }
 

diff --git a/libnixt/test/Value.cpp b/libnixt/test/Value.cpp
@@ -7,7 +7,7 @@ using namespace nixt;
 namespace {
 
 struct ValueTest : StateTest {
-  nix::SourcePath cwd() { return State->rootPath(nix::CanonPath::fromCwd()); }
+  nix::SourcePath cwd() { return State->rootPath("."); }
 };
 
 TEST_F(ValueTest, IsOption_neg) {

diff --git a/nixd/lib/Eval/AttrSetProvider.cpp b/nixd/lib/Eval/AttrSetProvider.cpp
@@ -131,16 +131,16 @@ void fillOptionDescription(nix::EvalState &State, nix::Value &V,
   fillOptionDeclarations(State, V, R);
   // FIXME: add definitions location.
   if (V.type() == nix::ValueType::nAttrs) [[likely]] {
-    assert(V.attrs);
-    if (auto *It = V.attrs->find(State.symbols.create("type"));
-        It != V.attrs->end()) [[likely]] {
+    assert(V.attrs());
+    if (auto *It = V.attrs()->find(State.symbols.create("type"));
+        It != V.attrs()->end()) [[likely]] {
       OptionType Type;
       fillOptionType(State, *It->value, Type);
       R.Type = std::move(Type);
     }
 
-    if (auto *It = V.attrs->find(State.symbols.create("example"));
-        It != V.attrs->end()) {
+    if (auto *It = V.attrs()->find(State.symbols.create("example"));
+        It != V.attrs()->end()) {
       State.forceValue(*It->value, It->pos);
 
       // In nixpkgs some examples are nested in "literalExpression"
@@ -177,7 +177,7 @@ void AttrSetProvider::onEvalExpr(
     lspserver::Callback<std::optional<std::string>> Reply) {
   try {
     nix::Expr *AST = state().parseExprFromString(
-        Name, state().rootPath(nix::CanonPath::fromCwd()));
+        Name, state().rootPath("."));
     state().eval(AST, Nixpkgs);
     Reply(std::nullopt);
     return;
@@ -234,7 +234,7 @@ void AttrSetProvider::onAttrPathComplete(
     // evaluating package details.
     // "Trie"s may not beneficial becausae it cannot speedup eval.
     for (const auto *AttrPtr :
-         Scope.attrs->lexicographicOrder(state().symbols)) {
+         Scope.attrs()->lexicographicOrder(state().symbols)) {
       const nix::Attr &Attr = *AttrPtr;
       const std::string Name = state().symbols[Attr.name];
       if (Name.starts_with(Params.Prefix)) {
@@ -309,7 +309,7 @@ void AttrSetProvider::onOptionComplete(
     // evaluating package details.
     // "Trie"s may not beneficial becausae it cannot speedup eval.
     for (const auto *AttrPtr :
-         Scope.attrs->lexicographicOrder(state().symbols)) {
+         Scope.attrs()->lexicographicOrder(state().symbols)) {
       const nix::Attr &Attr = *AttrPtr;
       std::string Name = state().symbols[Attr.name];
       if (Name.starts_with(Params.Prefix)) {