ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1528 from NixOS/nix-2.31

Browse Source 
Bump to nix/nix-eval-jobs 2.31
This commit is contained in:
John Ericson
2025-10-08 21:07:05 +00:00
committed by GitHub
parent 3059dc16a3 a499063834
commit 94eaad22bc
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
flake.lock generated
View File

@@ -3,16 +3,16 @@
"nix": { "nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758562014, "lastModified": 1759956402,
"narHash": "sha256-IazqNpt3jNldKy+rivmlGuo9pC1IczV0Xjk5+5EQEzQ=", "narHash": "sha256-CM27YK+KMi3HLRXqjPaJwkTabmKW+CDXOE3kMMtXH3s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "f2b45e014b909bb5e6a9f99a8a511deed3b3e2a4", "rev": "3019db2c87006817b6201113ad4ceee0c53c3b62",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "2.30-maintenance", "ref": "2.31-maintenance",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@@ -20,15 +20,16 @@
"nix-eval-jobs": { "nix-eval-jobs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1752066681, "lastModified": 1757626891,
"narHash": "sha256-e10zYtdc5nDHs2iLf/h92+uW5WOUZGqohfaU919B/TI=", "narHash": "sha256-VrHPtHxVIboqgnw+tlCQepgtBOhBvU5hxbMHsPo8LAc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "fae2b990f19c10b7d5718b6eff1df30188ca780e", "rev": "c975efc5b2bec0c1ff93c67de4a03306af258ff7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "v2.31.0",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@@ -4,13 +4,13 @@
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
inputs.nix = { inputs.nix = {
url = "github:NixOS/nix/2.30-maintenance"; url = "github:NixOS/nix/2.31-maintenance";
# We want to control the deps precisely # We want to control the deps precisely
flake = false; flake = false;
}; };
inputs.nix-eval-jobs = { 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 # We want to control the deps precisely
flake = false; flake = false;
}; };

2
meson.build
View File

@@ -4,7 +4,7 @@ project('hydra', 'cpp',
default_options: [ default_options: [
'debug=true', 'debug=true',
'optimization=2', 'optimization=2',
'cpp_std=c++20', 'cpp_std=c++23',
], ],
) )

5
src/hydra-queue-runner/queue-monitor.cc
View File

@@ -488,10 +488,11 @@ Step::ptr State::createStep(ref<Store> destStore,
runnable while step->created == false. */ runnable while step->created == false. */
step->drv = std::make_unique<Derivation>(localStore->readDerivation(drvPath)); step->drv = std::make_unique<Derivation>(localStore->readDerivation(drvPath));
{ {
auto parsedOpt = StructuredAttrs::tryParse(step->drv->env);
try { try {
step->drvOptions = std::make_unique<DerivationOptions>( 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) { } catch (Error & e) {
e.addTrace({}, "while parsing derivation '%s'", localStore->printStorePath(drvPath)); e.addTrace({}, "while parsing derivation '%s'", localStore->printStorePath(drvPath));
throw; throw;

1
src/hydra-queue-runner/state.hh
View File

@@ -27,6 +27,7 @@
#include <nix/store/serve-protocol-impl.hh> #include <nix/store/serve-protocol-impl.hh>
#include <nix/store/serve-protocol-connection.hh> #include <nix/store/serve-protocol-connection.hh>
#include <nix/store/machines.hh> #include <nix/store/machines.hh>
#include <nix/store/globals.hh>
typedef unsigned int BuildID; typedef unsigned int BuildID;