flake/deps: nix 2.19 -> 2.24 (#613)

Co-authored-by: Yingchi Long <i@lyc.dev>

Author: Mic92

flake.lock

@@ -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; };

flake.nix

@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, meson
-, ninja
-, pkg-config
-, nix
-, gtest
-, boost182
+{
+  lib,
+  stdenv,
+  meson,
+  ninja,
+  pkg-config,
+  nix,
+  gtest,
+  boost182,
 }:
 
 stdenv.mkDerivation {
@@ -14,7 +15,10 @@ stdenv.mkDerivation {
 
   src = ../.;
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   mesonBuildType = "release";
 
@@ -36,7 +40,6 @@ stdenv.mkDerivation {
 
   env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
 
-
   meta = {
     mainProgram = "nixt";
     description = "Nix language frontend, parser & semantic analysis";

libnixt/default.nix

@@ -1,6 +1,11 @@
 #pragma once
 
+#include <nix/common-eval-args.hh>
+#include <nix/eval-gc.hh>
+#include <nix/eval-settings.hh>
 #include <nix/eval.hh>
+#include <nix/flake/flake.hh>
+#include <nix/plugin.hh>
 #include <nix/shared.hh>
 #include <nix/store-api.hh>
 
@@ -9,6 +14,7 @@ namespace nixt {
 inline void initEval() {
   nix::initNix();
   nix::initLibStore();
+  nix::flake::initLib(nix::flakeSettings);
   nix::initPlugins();
   nix::initGC();
 }

libnixt/include/nixt/InitEval.h

@@ -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()));
+  nix::Expr *EFlakeCompat =
+      State.parseExprFromString(FlakeCompat, State.rootPath("."));
   State.eval(EFlakeCompat, *VFlakeCompat);
 
   State.callFunction(*VFlakeCompat, *VSrc, VRes, noPos);

libnixt/lib/Flake.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;
@@ -86,11 +86,11 @@ nix::Value &nixt::selectAttr(nix::EvalState &State, nix::Value &V,
   State.forceValue(V, nix::noPos);
 
   if (V.type() != nix::ValueType::nAttrs)
-    throw nix::TypeError("value is not an attrset");
+    throw nix::TypeError(State, "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;
 }
 

libnixt/lib/Value.cpp

@@ -1,4 +1,4 @@
-libnixt_deps = [ nix_expr, nix_main, nix_cmd, boost ]
+libnixt_deps = [ nix_expr, nix_flake, nix_main, nix_cmd, boost ]
 
 libnixd_inc = include_directories('../include')
 
@@ -19,7 +19,7 @@ pkgconfig.generate(name: 'nixt',
                    description: 'nix compatible layer',
                    subdirs: [ 'nixt' ],
                    libraries: libnixt,
-                   requires: [ 'nix-expr', 'nix-main', 'nix-cmd' ]
+                   requires: [ 'nix-expr', 'nix-main', 'nix-cmd', 'nix-flake' ]
 )
 
 

libnixt/lib/meson.build

@@ -14,6 +14,7 @@ pkgconfig = import('pkgconfig')
 nix_main = dependency('nix-main')
 nix_expr = dependency('nix-expr')
 nix_cmd = dependency('nix-cmd')
+nix_flake = dependency('nix-flake')
 
 subdir('lib')
 subdir('test')

libnixt/meson.build

@@ -1,13 +1,18 @@
 #include <gtest/gtest.h>
 
+#include <nix/common-eval-args.hh>
 #include <nix/eval.hh>
 #include <nix/store-api.hh>
 
 namespace nixt {
 
 struct StateTest : testing::Test {
   std::unique_ptr<nix::EvalState> State;
-  StateTest() : State(new nix::EvalState{{}, nix::openStore("dummy://")}) {}
+  StateTest()
+      : State(new nix::EvalState{{},
+                                 nix::openStore("dummy://"),
+                                 nix::fetchSettings,
+                                 nix::evalSettings}) {}
 };
 
 } // namespace nixt

libnixt/test/StateTest.h

@@ -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) {
@@ -58,7 +58,7 @@ TEST_F(ValueTest, selectAttrPath) {
   nix::Value &Kern = selectStringViews(*State, Nested, {"c", "d"});
 
   ASSERT_EQ(Kern.type(), nix::ValueType::nInt);
-  ASSERT_EQ(Kern.integer, 1);
+  ASSERT_EQ(Kern.integer(), 1);
 }
 
 } // namespace