From 7a2f89ea262c37bfc998bb9cddd7370002d488a5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 Nov 2024 17:37:48 +1000 Subject: [PATCH] hydra: 0-unstable-2024-12-05 -> 0-unstable-2025-02-12 Diff: https://github.com/NixOS/hydra/compare/250668a19fa4d8ff9a6176ee6c44ca3003adedf1...c6f98202cd1b091475ae51b6a093d00b4c8060d4 --- pkgs/by-name/hy/hydra/package.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index e6b509b67636..d77fcd597f30 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -42,6 +42,7 @@ , glibcLocales , meson , ninja +, nix-eval-jobs , fetchFromGitHub , nixosTests , unstableGitUpdater @@ -122,16 +123,26 @@ let git ]; }; + + nix-eval-jobs' = nix-eval-jobs.overrideAttrs (_: { + version = "2.25.0-unstable-2025-02-13"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-eval-jobs"; + rev = "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7"; + hash = "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA="; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-12-05"; + version = "0-unstable-2025-02-12"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "250668a19fa4d8ff9a6176ee6c44ca3003adedf1"; - hash = "sha256-r+t/0U8Pp6/Lvi3s3v8nDB9xCggvxFsnCEJ9TuZvVJc="; + rev = "c6f98202cd1b091475ae51b6a093d00b4c8060d4"; + hash = "sha256-CEDUtkA005PiLt1wSo3sgmxfxUBikQSE74ZudyWNxfE="; }; outputs = [ "out" "doc" ]; @@ -161,6 +172,7 @@ stdenv.mkDerivation (finalAttrs: { subversion openssh nix + nix-eval-jobs' coreutils findutils pixz @@ -193,6 +205,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales python3 libressl.nc + nix-eval-jobs' openldap postgresql ]; @@ -202,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { }; shellHook = '' - PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH + PATH=$(pwd)/src/script:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH PERL5LIB=$(pwd)/src/lib:$PERL5LIB; ''; @@ -228,7 +241,8 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH ':' $out/bin:$hydraPath \ --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name or "unknown"} + --set NIX_RELEASE ${nix.name or "unknown"} \ + --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs'.name or "unknown"} done '';