Merge pull request 'Fix compilation for latest Lix main' (#19 ) from jade/fix-compilation into main

Reviewed-on: lix-project/nix-eval-jobs#19
Fix compilation for latest Lix main
2024-12-06 21:54:01 +00:00 · 2024-12-06 13:50:43 -08:00 · 2024-11-23 09:47:15 +01:00 · 2024-11-17 19:49:28 -05:00 · 2024-11-16 20:14:39 +01:00 · 2024-11-16 19:56:09 +01:00
6 changed files with 49 additions and 46 deletions
--- a/flake.lock
+++ b/flake.lock
@ -23,11 +23,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@ -47,11 +47,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1729696851,
-        "narHash": "sha256-XME7TzBvjK6GEmZqPLK+2+Wk0qnwc7DCwYH434hMcOM=",
-        "rev": "2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d",
+        "lastModified": 1733448312,
+        "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=",
+        "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d.tar.gz?rev=2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b"
      },
      "original": {
        "type": "tarball",
@ -65,11 +65,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729742964,
-        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
+        "lastModified": 1731952509,
+        "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
        "owner": "nix-community",
        "repo": "nix-github-actions",
-        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
+        "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
        "type": "github"
      },
      "original": {
@ -96,11 +96,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1729851744,
-        "narHash": "sha256-c3ZSmkQdcdmNAzHud2b0fANXNa8TcySH0ZAqND5zEi0=",
+        "lastModified": 1733408989,
+        "narHash": "sha256-VCQpCQy+6ik+oYKWUCvq0WM2V7UtEKldqdsEzCNEOLc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "45e5197248e59e92e88956c5aa12553a7f62337f",
+        "rev": "d916387b68a74040a3873ad2a08a559c60cedb5e",
        "type": "github"
      },
      "original": {
@ -158,11 +158,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729613947,
-        "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=",
+        "lastModified": 1732292307,
+        "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca",
+        "rev": "705df92694af7093dfbb27109ce16d828a79155f",
        "type": "github"
      },
      "original": {
--- a/src/drv.cc
+++ b/src/drv.cc
@ -45,13 +45,13 @@ queryIsCached(nix::Store &store,
 Drv::Drv(std::string &attrPath, nix::EvalState &state, nix::DrvInfo &drvInfo,
         MyArgs &args) {

-    auto localStore = state.store.dynamic_pointer_cast<nix::LocalFSStore>();
+    auto localStore = state.ctx.store.dynamic_pointer_cast<nix::LocalFSStore>();

    try {
        // CA derivations do not have static output paths, so we have to
        // defensively not query output paths in case we encounter one.
        for (auto &[outputName, optOutputPath] :
-             drvInfo.queryOutputs(!nix::experimentalFeatureSettings.isEnabled(
+             drvInfo.queryOutputs(state, !nix::experimentalFeatureSettings.isEnabled(
                 nix::Xp::CaDerivations))) {
            if (optOutputPath) {
                outputs[outputName] =
@ -63,18 +63,19 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state, nix::DrvInfo &drvInfo,
            }
        }
    } catch (const std::exception &e) {
-        throw nix::EvalError(state,
+        state.ctx.errors.make<nix::EvalError>(
            "derivation '%s' does not have valid outputs: %s",
-            attrPath, e.what());
+            attrPath, e.what()
+        ).debugThrow();
    }

    if (args.meta) {
        nlohmann::json meta_;
-        for (auto &metaName : drvInfo.queryMetaNames()) {
+        for (auto &metaName : drvInfo.queryMetaNames(state)) {
            nix::NixStringContext context;
            std::stringstream ss;

-            auto metaValue = drvInfo.queryMeta(metaName);
+            auto metaValue = drvInfo.queryMeta(state, metaName);
            // Skip non-serialisable types
            // TODO: Fix serialisation of derivations to store paths
            if (metaValue == 0) {
@ -96,9 +97,9 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state, nix::DrvInfo &drvInfo,
        cacheStatus = Drv::CacheStatus::Unknown;
    }

-    drvPath = localStore->printStorePath(drvInfo.requireDrvPath());
+    drvPath = localStore->printStorePath(drvInfo.requireDrvPath(state));

-    auto drv = localStore->readDerivation(drvInfo.requireDrvPath());
+    auto drv = localStore->readDerivation(drvInfo.requireDrvPath(state));
    for (const auto &[inputDrvPath, inputNode] : drv.inputDrvs.map) {
        std::set<std::string> inputDrvOutputs;
        for (auto &outputName : inputNode.value) {
@ -106,7 +107,7 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state, nix::DrvInfo &drvInfo,
        }
        inputDrvs[localStore->printStorePath(inputDrvPath)] = inputDrvOutputs;
    }
-    name = drvInfo.queryName();
+    name = drvInfo.queryName(state);
    system = drv.platform;
 }

--- a/src/eval-args.cc
+++ b/src/eval-args.cc
@ -100,5 +100,5 @@ MyArgs::MyArgs() : MixCommonArgs("nix-eval-jobs") {
 }

 void MyArgs::parseArgs(char **argv, int argc) {
-    parseCmdline(nix::argvToStrings(argc, argv));
+    parseCmdline(nix::Strings(argv + 1, argv + argc));
 }
--- a/src/nix-eval-jobs.cc
+++ b/src/nix-eval-jobs.cc
@ -24,7 +24,6 @@
 #include <nlohmann/json_fwd.hpp>
 #include <lix/libutil/ref.hh>
 #include <lix/libstore/store-api.hh>
-#include <map>
 #include <condition_variable>
 #include <filesystem>
 #include <exception>
@ -47,9 +46,8 @@ using namespace nlohmann;

 static MyArgs myArgs;

-typedef std::function<void(ref<EvalState> state, Bindings &autoArgs,
-                           AutoCloseFD &to, AutoCloseFD &from, MyArgs &args)>
-    Processor;
+using Processor = std::function<void(ref<nix::eval_cache::CachingEvaluator> state, Bindings &autoArgs,
+                           AutoCloseFD &to, AutoCloseFD &from, MyArgs &args)>;

 /* Auto-cleanup of fork's process and fds. */
 struct Proc {
@ -70,10 +68,10 @@ struct Proc {
                    auto evalStore = myArgs.evalStoreUrl
                                         ? openStore(*myArgs.evalStoreUrl)
                                         : openStore();
-                    auto state = std::make_shared<EvalState>(myArgs.searchPath,
+                    auto evaluator = nix::make_ref<nix::eval_cache::CachingEvaluator>(myArgs.searchPath,
                                                             evalStore);
-                    Bindings &autoArgs = *myArgs.getAutoArgs(*state);
-                    proc(ref<EvalState>(state), autoArgs, *to, *from, myArgs);
+                    Bindings &autoArgs = *myArgs.getAutoArgs(*evaluator);
+                    proc(evaluator, autoArgs, *to, *from, myArgs);
                } catch (Error &e) {
                    nlohmann::json err;
                    auto msg = e.msg();
@ -344,7 +342,7 @@ int main(int argc, char **argv) {

    return handleExceptions(argv[0], [&]() {
        initNix();
-        initGC();
+        initLibExpr();

        myArgs.parseArgs(argv, argc);

--- a/src/worker.cc
+++ b/src/worker.cc
@ -14,6 +14,7 @@
 #include <lix/libutil/canon-path.hh>
 #include <lix/libcmd/common-eval-args.hh>
 #include <lix/libutil/error.hh>
+#include <lix/libexpr/eval-cache.hh>
 #include <lix/libexpr/eval-inline.hh>
 #include <lix/libexpr/eval.hh>
 #include <lix/libexpr/flake/flakeref.hh>
@ -48,14 +49,14 @@ static nix::Value *releaseExprTopLevelValue(nix::EvalState &state,
    nix::Value vTop;

    if (args.fromArgs) {
-        nix::Expr &e = state.parseExprFromString(
-            args.releaseExpr, state.rootPath(nix::CanonPath::fromCwd()));
+        nix::Expr &e = state.ctx.parseExprFromString(
+            args.releaseExpr, nix::CanonPath::fromCwd());
        state.eval(e, vTop);
    } else {
-        state.evalFile(lookupFileArg(state, args.releaseExpr), vTop);
+        state.evalFile(nix::lookupFileArg(state.ctx, args.releaseExpr), vTop);
    }

-    auto vRoot = state.allocValue();
+    auto vRoot = state.ctx.mem.allocValue();

    state.autoCallFunction(autoArgs, vTop, *vRoot);

@ -73,16 +74,17 @@ static std::string attrPathJoin(nlohmann::json input) {
                           });
 }

-void worker(nix::ref<nix::EvalState> state, nix::Bindings &autoArgs,
+void worker(nix::ref<nix::eval_cache::CachingEvaluator> evaluator, nix::Bindings &autoArgs,
            nix::AutoCloseFD &to, nix::AutoCloseFD &from, MyArgs &args) {

    nix::Value *vRoot = [&]() {
+        auto state = evaluator->begin();
        if (args.flake) {
            auto [flakeRef, fragment, outputSpec] =
                nix::parseFlakeRefWithFragmentAndExtendedOutputsSpec(
                    args.releaseExpr, nix::absPath("."));
            nix::InstallableFlake flake{
-                {}, state, std::move(flakeRef), fragment, outputSpec,
+                {}, evaluator, std::move(flakeRef), fragment, outputSpec,
                {}, {},    args.lockFlags};

            return flake.toValue(*state).first;
@ -92,6 +94,7 @@ void worker(nix::ref<nix::EvalState> state, nix::Bindings &autoArgs,
    }();

    LineReader fromReader(from.release());
+    auto state = evaluator->begin();

    while (true) {
        /* Wait for the collector to send us a job name. */
@ -119,7 +122,7 @@ void worker(nix::ref<nix::EvalState> state, nix::Bindings &autoArgs,
                nix::findAlongAttrPath(*state, attrPathS, autoArgs, *vRoot)
                    .first;

-            auto v = state->allocValue();
+            auto v = evaluator->mem.allocValue();
            state->autoCallFunction(autoArgs, *vTmp, *v);

            if (v->type() == nix::nAttrs) {
@ -136,7 +139,7 @@ void worker(nix::ref<nix::EvalState> state, nix::Bindings &autoArgs,
                            std::string(nix::baseNameOf(drv.drvPath));
                        if (!nix::pathExists(root)) {
                            auto localStore =
-                                state->store
+                                evaluator->store
                                    .dynamic_pointer_cast<nix::LocalFSStore>();
                            auto storePath =
                                localStore->parseStorePath(drv.drvPath);
@ -151,14 +154,14 @@ void worker(nix::ref<nix::EvalState> state, nix::Bindings &autoArgs,
                                          // = true;` for top-level attrset

                    for (auto &i :
-                         v->attrs->lexicographicOrder(state->symbols)) {
-                        const std::string &name = state->symbols[i->name];
+                         v->attrs->lexicographicOrder(evaluator->symbols)) {
+                        const std::string &name = evaluator->symbols[i->name];
                        attrs.push_back(name);

                        if (name == "recurseForDerivations" &&
                            !args.forceRecurse) {
                            auto attrv =
-                                v->attrs->get(state->sRecurseForDerivations);
+                                v->attrs->get(evaluator->s.recurseForDerivations);
                            recurse = state->forceBool(
                                *attrv->value, attrv->pos,
                                "while evaluating recurseForDerivations");
--- a/src/worker.hh
+++ b/src/worker.hh
@ -1,6 +1,7 @@
 #pragma once
 #include <lix/libmain/shared.hh>
 #include <lix/libexpr/eval.hh>
+#include <lix/libexpr/eval-cache.hh>

 #include "eval-args.hh"

@ -13,5 +14,5 @@ class EvalState;
 template <typename T> class ref;
 }  // namespace nix

-void worker(nix::ref<nix::EvalState> state, nix::Bindings &autoArgs,
+void worker(nix::ref<nix::eval_cache::CachingEvaluator> evaluator, nix::Bindings &autoArgs,
            nix::AutoCloseFD &to, nix::AutoCloseFD &from, MyArgs &args);
Author	SHA1	Message	Date
jade	df3edf3730	Merge pull request 'Fix compilation for latest Lix main' (#19 ) from jade/fix-compilation into main Reviewed-on: lix-project/nix-eval-jobs#19	2024-12-06 21:54:01 +00:00
jade	bdbe3e1304	Fix compilation for latest Lix main	2024-12-06 13:50:43 -08:00
Maximilian Bosch	dfc286ca3d	flake.lock: Update Flake lock file updates: • Updated input 'lix': '`c859d03013`.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15) → '`66f6dbda32`.tar.gz?narHash=sha256-H7GN4%2B%2Ba4vE49SUNojZx%2BFSk4mmpb2ifJUtJMJHProI%3D&rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff' (2024-11-20) • Updated input 'nix-github-actions': 'github:nix-community/nix-github-actions/e04df33f62cdcf93d73e9a04142464753a16db67' (2024-10-24) → 'github:nix-community/nix-github-actions/7b5f051df789b6b20d259924d349a9ba3319b226' (2024-11-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/035d434d48f4375ac5d3a620954cf5fda7dd7c36' (2024-11-15) → 'github:NixOS/nixpkgs/df94f897ffe1af1bcd60cb68697c5d8e6431346e' (2024-11-22) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30) → 'github:numtide/treefmt-nix/705df92694af7093dfbb27109ce16d828a79155f' (2024-11-22)	2024-11-23 09:47:15 +01:00
leo60228	912a9d6331	Merge branch 'alois31-fix-build'	2024-11-17 19:49:28 -05:00
alois31	bbbebaf380	fix build with latest Lix Commit 8088927b90ff84dd37c342e1ef0a91bc8feca6ec renamed initGC to initLibExpr. Use the new name so that the build works again.	2024-11-16 20:14:39 +01:00
alois31	b9e0abe9e6	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1' (2024-10-01) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01) • Updated input 'lix': '`2734a9cf94`.tar.gz?narHash=sha256-XME7TzBvjK6GEmZqPLK%2B2%2BWk0qnwc7DCwYH434hMcOM%3D&rev=2734a9cf94debc6baef4e7d4d9fa28cc28f5b31d' (2024-10-23) → '`c859d03013`.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/45e5197248e59e92e88956c5aa12553a7f62337f' (2024-10-25) → 'github:NixOS/nixpkgs/035d434d48f4375ac5d3a620954cf5fda7dd7c36' (2024-11-15) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/aac86347fb5063960eccb19493e0cadcdb4205ca' (2024-10-22) → 'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30)	2024-11-16 19:56:09 +01:00