Skip to content

Commit 44d63ba

Browse files
edk2: 202502 -> 202411 (#386486)
2 parents 3ebbe88 + 1be848d commit 44d63ba

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkgs/by-name/ed/edk2/package.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ let
3434

3535
edk2 = stdenv.mkDerivation {
3636
pname = "edk2";
37-
version = "202502";
37+
version = "202411";
3838

3939
srcWithVendoring = fetchFromGitHub {
4040
owner = "tianocore";
4141
repo = "edk2";
4242
rev = "edk2-stable${edk2.version}";
4343
fetchSubmodules = true;
44-
hash = "sha256-iobC0CeWSylS9sLuXOqAmL36hl/tY+IedT/I3xQ80Ag=";
44+
hash = "sha256-KYaTGJ3DHtWbPEbP+n8MTk/WwzLv5Vugty/tvzuEUf0=";
4545
};
4646

4747
src = applyPatches {
@@ -62,16 +62,18 @@ let
6262
})
6363
];
6464

65+
# EDK2 is currently working on OpenSSL 3.3.x support. Use buildpackages.openssl again,
66+
# when "https://github.com/tianocore/edk2/pull/6167" is merged.
6567
postPatch = ''
66-
# de-vendor OpenSSL
68+
# We don't want EDK2 to keep track of OpenSSL, they're frankly bad at it.
6769
rm -r CryptoPkg/Library/OpensslLib/openssl
6870
mkdir -p CryptoPkg/Library/OpensslLib/openssl
6971
(
7072
cd CryptoPkg/Library/OpensslLib/openssl
71-
tar --strip-components=1 -xf ${buildPackages.openssl.src}
73+
tar --strip-components=1 -xf ${buildPackages.openssl_3.src}
7274
7375
# Apply OpenSSL patches.
74-
${lib.pipe buildPackages.openssl.patches [
76+
${lib.pipe buildPackages.openssl_3.patches [
7577
(builtins.filter (
7678
patch:
7779
!builtins.elem (baseNameOf patch) [

0 commit comments

Comments
 (0)