diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index b552a7675fe1..960869fbd2ef 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -34,14 +34,14 @@ let edk2 = stdenv.mkDerivation { pname = "edk2"; - version = "202411"; + version = "202502"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-KYaTGJ3DHtWbPEbP+n8MTk/WwzLv5Vugty/tvzuEUf0="; + hash = "sha256-iobC0CeWSylS9sLuXOqAmL36hl/tY+IedT/I3xQ80Ag="; }; src = applyPatches { @@ -62,18 +62,16 @@ let }) ]; - # EDK2 is currently working on OpenSSL 3.3.x support. Use buildpackages.openssl again, - # when "https://github.com/tianocore/edk2/pull/6167" is merged. postPatch = '' - # We don't want EDK2 to keep track of OpenSSL, they're frankly bad at it. + # de-vendor OpenSSL rm -r CryptoPkg/Library/OpensslLib/openssl mkdir -p CryptoPkg/Library/OpensslLib/openssl ( cd CryptoPkg/Library/OpensslLib/openssl - tar --strip-components=1 -xf ${buildPackages.openssl_3.src} + tar --strip-components=1 -xf ${buildPackages.openssl.src} # Apply OpenSSL patches. - ${lib.pipe buildPackages.openssl_3.patches [ + ${lib.pipe buildPackages.openssl.patches [ (builtins.filter ( patch: !builtins.elem (baseNameOf patch) [