From a4990638342a30aafd6b457becbb352ee4bd0922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 3 Aug 2025 10:38:50 +0200
Subject: [PATCH] bump to nix/nix-eval-jobs 2.31

---
 flake.lock                              | 15 ++++++++-------
 flake.nix                               |  4 ++--
 meson.build                             |  2 +-
 src/hydra-queue-runner/queue-monitor.cc |  5 +++--
 src/hydra-queue-runner/state.hh         |  1 +
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index b85d14d8..e0c89e67 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,16 +3,16 @@
     "nix": {
       "flake": false,
       "locked": {
-        "lastModified": 1758562014,
-        "narHash": "sha256-IazqNpt3jNldKy+rivmlGuo9pC1IczV0Xjk5+5EQEzQ=",
+        "lastModified": 1759956402,
+        "narHash": "sha256-CM27YK+KMi3HLRXqjPaJwkTabmKW+CDXOE3kMMtXH3s=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "f2b45e014b909bb5e6a9f99a8a511deed3b3e2a4",
+        "rev": "3019db2c87006817b6201113ad4ceee0c53c3b62",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "2.30-maintenance",
+        "ref": "2.31-maintenance",
         "repo": "nix",
         "type": "github"
       }
@@ -20,15 +20,16 @@
     "nix-eval-jobs": {
       "flake": false,
       "locked": {
-        "lastModified": 1752066681,
-        "narHash": "sha256-e10zYtdc5nDHs2iLf/h92+uW5WOUZGqohfaU919B/TI=",
+        "lastModified": 1757626891,
+        "narHash": "sha256-VrHPtHxVIboqgnw+tlCQepgtBOhBvU5hxbMHsPo8LAc=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "fae2b990f19c10b7d5718b6eff1df30188ca780e",
+        "rev": "c975efc5b2bec0c1ff93c67de4a03306af258ff7",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "v2.31.0",
         "repo": "nix-eval-jobs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index b8899c2a..7d443970 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,13 +4,13 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
 
   inputs.nix = {
-    url = "github:NixOS/nix/2.30-maintenance";
+    url = "github:NixOS/nix/2.31-maintenance";
     # We want to control the deps precisely
     flake = false;
   };
 
   inputs.nix-eval-jobs = {
-    url = "github:nix-community/nix-eval-jobs";
+    url = "github:nix-community/nix-eval-jobs/v2.31.0";
     # We want to control the deps precisely
     flake = false;
   };
diff --git a/meson.build b/meson.build
index c1eb577b..923794e6 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('hydra', 'cpp',
   default_options: [
     'debug=true',
     'optimization=2',
-    'cpp_std=c++20',
+    'cpp_std=c++23',
   ],
 )
 
diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc
index d6d87e71..7630230c 100644
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -488,10 +488,11 @@ Step::ptr State::createStep(ref<Store> destStore,
        runnable while step->created == false. */
     step->drv = std::make_unique<Derivation>(localStore->readDerivation(drvPath));
     {
-        auto parsedOpt = StructuredAttrs::tryParse(step->drv->env);
         try {
             step->drvOptions = std::make_unique<DerivationOptions>(
-                DerivationOptions::fromStructuredAttrs(step->drv->env, parsedOpt ? &*parsedOpt : nullptr));
+                DerivationOptions::fromStructuredAttrs(
+                    step->drv->env,
+                    step->drv->structuredAttrs ? &*step->drv->structuredAttrs : nullptr));
         } catch (Error & e) {
             e.addTrace({}, "while parsing derivation '%s'", localStore->printStorePath(drvPath));
             throw;
diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh
index f7ab7de3..eee042e2 100644
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -27,6 +27,7 @@
 #include <nix/store/serve-protocol-impl.hh>
 #include <nix/store/serve-protocol-connection.hh>
 #include <nix/store/machines.hh>
+#include <nix/store/globals.hh>
 
 
 typedef unsigned int BuildID;