colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #306017 from helsinki-systems/fix/cve-2024-32657 

hydra_unstable: Fix CVE-2024-32657
This commit is contained in:
Rick van Schijndel 2024-04-22 18:54:14 +02:00 committed by GitHub
parent e35e653b2a 0a79256e0d
commit 999dc38f52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/misc/hydra/unstable.nix
View File

@ -43,6 +43,7 @@
, cacert
, glibcLocales
, fetchFromGitHub
, fetchpatch2
, nixosTests
}:
@ -205,6 +206,15 @@ 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 \