Unverified Commit 5c1fa02d authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #329477 from Mindavi/hydra/2024-07-09 

hydra_unstable: 2024-03-08 -> 2024-07-09, modernize, nix 2.22
parents 2d350522 b530767c

pkgs/development/tools/misc/hydra/unstable.nix

+7 −16
Original line number Diff line number Diff line
@@ -122,15 +122,15 @@ let 
      ];

  };

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "hydra";

  version = "2024-03-08";

  version = "2024-07-09";



  src = fetchFromGitHub {

    owner = "NixOS";

    repo = "hydra";

    rev = "8f56209bd6f3b9ec53d50a23812a800dee7a1969";

    hash = "sha256-mhEj02VruXPmxz3jsKHMov2ERNXk9DwaTAunWEO1iIQ=";

    rev = "d7986226f0666d5aa0032fdcdb9f38eef6a91dd3";

    hash = "sha256-9DW0tAiAOfglua76t3viSvIw1gR1EETf0HTAmZklc3I=";

  };



  buildInputs = [
@@ -206,19 +206,10 @@ stdenv.mkDerivation rec { 


  enableParallelBuilding = true;



  patches = [

    # https://github.com/NixOS/hydra/security/advisories/GHSA-2p75-6g9f-pqgx

    (fetchpatch2 {

      name = "CVE-2024-32657.patch";

      url = "https://github.com/NixOS/hydra/commit/b72528be5074f3e62e9ae2c2ae8ef9c07a0b4dd3.patch";

      hash = "sha256-+y27N8AIaHj13mj0LwW7dkpzfzZ4xfjN8Ld23c5mzuU=";

    })

  ];



  postPatch = ''

    # Change 5s timeout for init to 30s

    substituteInPlace t/lib/HydraTestContext.pm \

      --replace 'expectOkay(5, ("hydra-init"));' 'expectOkay(30, ("hydra-init"));'

      --replace-fail 'expectOkay(5, ("hydra-init"));' 'expectOkay(30, ("hydra-init"));'

  '';



  preCheck = ''
@@ -238,7 +229,7 @@ stdenv.mkDerivation rec { 
        wrapProgram $i \

            --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \

            --prefix PATH ':' $out/bin:$hydraPath \

            --set-default HYDRA_RELEASE ${version} \

            --set-default HYDRA_RELEASE ${finalAttrs.version} \

            --set HYDRA_HOME $out/libexec/hydra \

            --set NIX_RELEASE ${nix.name or "unknown"}

    done
@@ -258,4 +249,4 @@ stdenv.mkDerivation rec { 
    platforms = platforms.linux;

    maintainers = with maintainers; [ mindavi ] ++ teams.helsinki-systems.members;

  };

}
 
})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -21134,7 +21134,7 @@ with pkgs; 














  hwloc = callPackage ../development/libraries/hwloc { };



























  hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_20; };













  hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_22; };





























  hydra-cli = callPackage ../development/tools/misc/hydra-cli { };