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

Reviewed-on: lix-project/nix-eval-jobs#19

flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
+        "lastModified": 1730504689,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -47,15 +47,15 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1718590005,
+        "lastModified": 1733448312,
-        "narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=",
+        "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=",
-        "rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80",
+        "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/98d0249d5c7f5dcc1d2436c4829f073fca668f80.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
       }
     },
     "nix-github-actions": {
@@ -65,11 +65,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703863825,
+        "lastModified": 1731952509,
-        "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
+        "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
         "owner": "nix-community",
         "repo": "nix-github-actions",
-        "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
+        "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
     "nix2container": {
       "flake": false,
       "locked": {
-        "lastModified": 1712990762,
+        "lastModified": 1724996935,
-        "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=",
+        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
         "owner": "nlewo",
         "repo": "nix2container",
-        "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e",
+        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718676691,
+        "lastModified": 1733408989,
-        "narHash": "sha256-DWKbARWtRpT1yiLLm+5vMijx65YB7NwGZMV6NXOtrJ8=",
+        "narHash": "sha256-VCQpCQy+6ik+oYKWUCvq0WM2V7UtEKldqdsEzCNEOLc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d9e18354acbf59c625505b7315c85508e9831bf4",
+        "rev": "d916387b68a74040a3873ad2a08a559c60cedb5e",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     "pre-commit-hooks": {
       "flake": false,
       "locked": {
-        "lastModified": 1712055707,
+        "lastModified": 1726745158,
-        "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718139168,
+        "lastModified": 1732292307,
-        "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=",
+        "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1",
+        "rev": "705df92694af7093dfbb27109ce16d828a79155f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,7 +9,7 @@
   inputs.nix-github-actions.url = "github:nix-community/nix-github-actions";
   inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
   inputs.lix = {
-    url = "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz";
+    url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
     inputs.nixpkgs.follows = "nixpkgs";
   };
 

shell.nix

@@ -23,6 +23,7 @@ in
 pkgs.mkShell {
   inherit (nix-eval-jobs) buildInputs;
   nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [
+    pkgs.clang-tools
     (pkgs.python3.withPackages (ps: [
       ps.pytest
     ]))

src/drv.cc

@@ -23,14 +23,17 @@
 #include "drv.hh"
 #include "eval-args.hh"
 
-static bool queryIsCached(nix::Store &store,
+static bool
-                          std::map<std::string, std::string> &outputs) {
+queryIsCached(nix::Store &store,
+              std::map<std::string, std::optional<std::string>> &outputs) {
     uint64_t downloadSize, narSize;
     nix::StorePathSet willBuild, willSubstitute, unknown;
 
     std::vector<nix::StorePathWithOutputs> paths;
     for (auto const &[key, val] : outputs) {
-        paths.push_back(followLinksToStorePathWithOutputs(store, val));
+        if (val) {
+            paths.push_back(followLinksToStorePathWithOutputs(store, *val));
+        }
     }
 
     store.queryMissing(toDerivedPaths(paths), willBuild, willSubstitute,
@@ -42,26 +45,37 @@ static bool 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 {
-        for (auto out : drvInfo.queryOutputs(true)) {
+        // CA derivations do not have static output paths, so we have to
-            if (out.second)
+        // defensively not query output paths in case we encounter one.
-                outputs[out.first] = localStore->printStorePath(*out.second);
+        for (auto &[outputName, optOutputPath] :
+             drvInfo.queryOutputs(state, !nix::experimentalFeatureSettings.isEnabled(
+                 nix::Xp::CaDerivations))) {
+            if (optOutputPath) {
+                outputs[outputName] =
+                    localStore->printStorePath(*optOutputPath);
+            } else {
+                assert(nix::experimentalFeatureSettings.isEnabled(
+                    nix::Xp::CaDerivations));
+                outputs[outputName] = std::nullopt;
+            }
         }
     } 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) {
@@ -83,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) {
@@ -93,15 +107,21 @@ 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;
 }
 
 void to_json(nlohmann::json &json, const Drv &drv) {
+    std::map<std::string, nlohmann::json> outputsJson;
+    for (auto &[name, optPath] : drv.outputs) {
+        outputsJson[name] =
+            optPath ? nlohmann::json(*optPath) : nlohmann::json(nullptr);
+    }
+
     json = nlohmann::json{{"name", drv.name},
                           {"system", drv.system},
                           {"drvPath", drv.drvPath},
-                          {"outputs", drv.outputs},
+                          {"outputs", outputsJson},
                           {"inputDrvs", drv.inputDrvs}};
 
     if (drv.meta.has_value()) {

src/drv.hh

@@ -24,7 +24,7 @@ struct Drv {
     std::string drvPath;
 
     enum class CacheStatus { Cached, Uncached, Unknown } cacheStatus;
-    std::map<std::string, std::string> outputs;
+    std::map<std::string, std::optional<std::string>> outputs;
     std::map<std::string, std::set<std::string>> inputDrvs;
     std::optional<nlohmann::json> meta;
 

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

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,
+using Processor = std::function<void(ref<nix::eval_cache::CachingEvaluator> state, Bindings &autoArgs,
-                           AutoCloseFD &to, AutoCloseFD &from, MyArgs &args)>
+                           AutoCloseFD &to, AutoCloseFD &from, MyArgs &args)>;
-    Processor;
 
 /* 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);
+                    Bindings &autoArgs = *myArgs.getAutoArgs(*evaluator);
-                    proc(ref<EvalState>(state), autoArgs, *to, *from, myArgs);
+                    proc(evaluator, autoArgs, *to, *from, myArgs);
                 } catch (Error &e) {
                     nlohmann::json err;
                     auto msg = e.msg();
@@ -93,7 +91,7 @@ struct Proc {
 
         to = std::move(toPipe.writeSide);
         from = std::move(fromPipe.readSide);
-        pid = p;
+        pid = std::move(p);
     }
 
     ~Proc() {}
@@ -344,24 +342,16 @@ int main(int argc, char **argv) {
 
     return handleExceptions(argv[0], [&]() {
         initNix();
-        initGC();
+        initLibExpr();
 
         myArgs.parseArgs(argv, argc);
 
-        /* FIXME: The build hook in conjunction with import-from-derivation is
-         * causing "unexpected EOF" during eval */
-        settings.builders = "";
-
-        /* Prevent access to paths outside of the Nix search path and
-           to the environment. */
-        evalSettings.restrictEval = false;
-
         /* When building a flake, use pure evaluation (no access to
            'getEnv', 'currentSystem' etc. */
         if (myArgs.impure) {
-            evalSettings.pureEval = false;
+            evalSettings.pureEval.override(false);
         } else if (myArgs.flake) {
-            evalSettings.pureEval = true;
+            evalSettings.pureEval.override(true);
         }
 
         if (myArgs.releaseExpr == "")
@@ -374,7 +364,7 @@ int main(int argc, char **argv) {
         }
 
         if (myArgs.showTrace) {
-            loggerSettings.showTrace.assign(true);
+            loggerSettings.showTrace.override(true);
         }
 
         Sync<State> state_;

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>
@@ -30,15 +31,12 @@
 #include <lix/libexpr/value.hh>
 #include <lix/libutil/terminal.hh>
 #include <exception>
-#include <map>
-#include <memory>
 #include <numeric>
 #include <optional>
 #include <sstream>
 #include <string>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 #include "worker.hh"
 #include "drv.hh"
@@ -51,14 +49,14 @@ static nix::Value *releaseExprTopLevelValue(nix::EvalState &state,
     nix::Value vTop;
 
     if (args.fromArgs) {
-        nix::Expr *e = state.parseExprFromString(
+        nix::Expr &e = state.ctx.parseExprFromString(
-            args.releaseExpr, state.rootPath(nix::CanonPath::fromCwd()));
+            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);
 
@@ -76,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;
@@ -95,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. */
@@ -122,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) {
@@ -139,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);
@@ -154,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)) {
+                         v->attrs->lexicographicOrder(evaluator->symbols)) {
-                        const std::string &name = state->symbols[i->name];
+                        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");

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);