From 5ac5ff63bd4628da099e5d9ca4ded947e4ceaf91 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Wed, 5 Aug 2026 11:24:06 +0000 Subject: [PATCH] nix-eval-jobs: 2.34.3 -> 2.35.0 Assisted-by: Claude:opus-5 --- pkgs/by-name/hy/hydra/package.nix | 21 ++++++++++++++++--- .../nix-eval-jobs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 8093f597f589..6574c94923b3 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -50,7 +50,22 @@ }: let + # Need these pins until we bump past https://github.com/NixOS/hydra/pull/1828 nix = nixVersions.nix_2_34; + nixEvalJobsVersion = "2.34.3"; + nix-eval-jobs_2_34 = + (nix-eval-jobs.override { + nixComponents = nixVersions.nixComponents_2_34; + }).overrideAttrs + { + version = nixEvalJobsVersion; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix-eval-jobs"; + tag = "v${nixEvalJobsVersion}"; + hash = "sha256-YaVQAgBxWbUBFHXLBLzdUyVvuA/DDw80SEnn9iq0Veo="; + }; + }; perlDeps = buildEnv { name = "hydra-perl-deps"; @@ -172,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: { subversion openssh nix - nix-eval-jobs + nix-eval-jobs_2_34 coreutils findutils pixz @@ -210,7 +225,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales python3 netcat - nix-eval-jobs + nix-eval-jobs_2_34 openldap postgresql ]; @@ -247,7 +262,7 @@ stdenv.mkDerivation (finalAttrs: { --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} \ - --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs.name or "unknown"} + --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs_2_34.name or "unknown"} done ''; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 8acb3bc46666..7b6b3d62b0a1 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.34.3"; + version = "2.35.0"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-eval-jobs"; tag = "v${version}"; - hash = "sha256-YaVQAgBxWbUBFHXLBLzdUyVvuA/DDw80SEnn9iq0Veo="; + hash = "sha256-/C5wyGYe4uMKKH26vy3knpwP/hvjOHO/58cySL8ADC4="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f88db270eaf..805442134f6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10765,7 +10765,7 @@ with pkgs; ); nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nixComponents = nixVersions.nixComponents_2_34; + nixComponents = nixVersions.nixComponents_2_35; }; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;