From a0dff55e9a0462a0e80545426cf26356be1d08b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 14:25:28 +0000
Subject: [PATCH] edk2: 202411 -> 202505

edk2: 202411 -> 202505
---
 pkgs/by-name/ed/edk2/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix
index b552a7675fe1..247ecbeddb4a 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 = "202505";
 
     srcWithVendoring = fetchFromGitHub {
       owner = "tianocore";
       repo = "edk2";
-      rev = "edk2-stable${edk2.version}";
+      tag = "edk2-stable${edk2.version}";
       fetchSubmodules = true;
-      hash = "sha256-KYaTGJ3DHtWbPEbP+n8MTk/WwzLv5Vugty/tvzuEUf0=";
+      hash = "sha256-VuiEqVpG/k7pfy0cOC6XmY+8NBtU/OHdDB9Y52tyNe8=";
     };
 
     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) [
@@ -144,7 +142,10 @@ let
 
     passthru = {
       # exercise a channel blocker
-      tests.uefiUsb = nixosTests.boot.uefiCdrom;
+      tests = {
+        systemdBootExtraEntries = nixosTests.systemd-boot.extraEntries;
+        uefiUsb = nixosTests.boot.uefiCdrom;
+      };
 
       updateScript = writeScript "update-edk2" ''
         #!/usr/bin/env nix-shell