movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

edk2: 202411 -> 202505

Browse source 
edk2: 202411 -> 202505
This commit is contained in:
R. Ryantm 2025-05-27 14:25:28 +00:00 • committed by Adam C. Stephens
parent 3f62a1ca1a
commit a0dff55e9a
No known key found for this signature in database
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pkgs/by-name/ed/edk2/package.nix
View file

@ -34,14 +34,14 @@ let
edk2 = stdenv.mkDerivation { edk2 = stdenv.mkDerivation {
pname = "edk2"; pname = "edk2";
version = "202411"; version = "202505";
srcWithVendoring = fetchFromGitHub { srcWithVendoring = fetchFromGitHub {
owner = "tianocore"; owner = "tianocore";
repo = "edk2"; repo = "edk2";
rev = "edk2-stable${edk2.version}"; tag = "edk2-stable${edk2.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-KYaTGJ3DHtWbPEbP+n8MTk/WwzLv5Vugty/tvzuEUf0="; hash = "sha256-VuiEqVpG/k7pfy0cOC6XmY+8NBtU/OHdDB9Y52tyNe8=";
}; };
src = applyPatches { 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 = '' 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 rm -r CryptoPkg/Library/OpensslLib/openssl
mkdir -p CryptoPkg/Library/OpensslLib/openssl mkdir -p CryptoPkg/Library/OpensslLib/openssl
( (
cd 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. # Apply OpenSSL patches.
${lib.pipe buildPackages.openssl_3.patches [ ${lib.pipe buildPackages.openssl.patches [
(builtins.filter ( (builtins.filter (
patch: patch:
!builtins.elem (baseNameOf patch) [ !builtins.elem (baseNameOf patch) [
@ -144,7 +142,10 @@ let
passthru = { passthru = {
# exercise a channel blocker # exercise a channel blocker
tests.uefiUsb = nixosTests.boot.uefiCdrom; tests = {
systemdBootExtraEntries = nixosTests.systemd-boot.extraEntries;
uefiUsb = nixosTests.boot.uefiCdrom;
};
updateScript = writeScript "update-edk2" '' updateScript = writeScript "update-edk2" ''
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell