Merge pull request #302 from nix-community/nix-bump

Nix bump
nix-community · May 9, 2024 · 63154bd · 63154bd
2 parents 7b6640f + 97f58a9
commit 63154bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.nix-version b/.nix-version
@@ -1 +1 @@
-unstable
+latest
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -31,7 +31,7 @@
           let
             drvArgs = {
               srcDir = self;
-              nix = if nixVersion == "unstable" then pkgs.nixUnstable else pkgs.nixVersions."nix_${nixVersion}";
+              nix = if nixVersion == "latest" then pkgs.nixVersions.latest else pkgs.nixVersions."nix_${nixVersion}";
             };
           in
           {

diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc
@@ -72,7 +72,7 @@ struct Proc {
                     auto evalStore = myArgs.evalStoreUrl
                                          ? openStore(*myArgs.evalStoreUrl)
                                          : openStore();
-                    auto state = std::make_shared<EvalState>(myArgs.searchPath,
+                    auto state = std::make_shared<EvalState>(myArgs.lookupPath,
                                                              evalStore);
                     Bindings &autoArgs = *myArgs.getAutoArgs(*state);
                     proc(ref<EvalState>(state), autoArgs, *to, *from, myArgs);

diff --git a/src/worker.cc b/src/worker.cc
@@ -158,14 +158,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(state->symbols)) {
                         const std::string &name = state->symbols[i->name];
                         attrs.push_back(name);
 
                         if (name == "recurseForDerivations" &&
                             !args.forceRecurse) {
                             auto attrv =
-                                v->attrs->get(state->sRecurseForDerivations);
+                                v->attrs()->get(state->sRecurseForDerivations);
                             recurse = state->forceBool(
                                 *attrv->value, attrv->pos,
                                 "while evaluating recurseForDerivations");