Merge #185 #187

185: build(deps): bump DeterminateSystems/update-flake-lock from 16 to 17 r=Mic92 a=dependabot[bot]



187: fix build with nix 2.14 r=Mic92 a=Mic92



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

.github/workflows/update-flake-lock.yml

@@ -16,6 +16,6 @@ jobs:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v16
+        uses: DeterminateSystems/update-flake-lock@v17
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}

.nix-version

@@ -1 +1 @@
-2_13
+2_14

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677714448,
-        "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=",
+        "lastModified": 1678379998,
+        "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002",
+        "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1678321859,
-        "narHash": "sha256-WnAM2zrtDJDfSEmiiklSAHfep+XMIjfpU/8aTXwHZ5A=",
+        "lastModified": 1678391601,
+        "narHash": "sha256-KpP4agiaNf2PO67HlvToZKuWS1jvDrORz09bJXkE8bQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "75c8abce0657f9981be937f2bc7b88125d98c03f",
+        "rev": "8d8f5ede919dc60a86ac37311a63092411c72e90",
         "type": "github"
       },
       "original": {

src/nix-eval-jobs.cc

@@ -21,6 +21,7 @@
 #include <nix/error.hh>
 #include <nix/installables.hh>
 #include <nix/path-with-outputs.hh>
+#include <nix/installable-flake.hh>
 
 #include <nix/value-to-json.hh>
 
@@ -328,8 +329,9 @@ static void worker(ref<EvalState> state, Bindings &autoArgs, AutoCloseFD &to,
                         if (name == "recurseForDerivations") {
                             auto attrv =
                                 v->attrs->get(state->sRecurseForDerivations);
-                            recurse =
-                                state->forceBool(*attrv->value, attrv->pos);
+                            recurse = state->forceBool(
+                                *attrv->value, attrv->pos,
+                                "while evaluating recurseForDerivations");
                         }
                     }
                     if (recurse)