From f04fc2c3174d99fb9a5d9c9fd52d692f81b57e69 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 22 Feb 2026 16:00:38 -0500 Subject: [PATCH] edk2: 202511 -> 202602 Changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable202602 --- pkgs/by-name/ed/edk2/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index e4ded1dfd220..a16194894ef9 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -33,14 +33,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "edk2"; - version = "202511"; + version = "202602"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; tag = "edk2-stable${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU="; + hash = "sha256-TeMGpqVpXYRaeLjjg/aWHjtvfJpEfauA7Xg7dfe3XNg="; }; src = applyPatches { @@ -55,14 +55,6 @@ stdenv.mkDerivation (finalAttrs: { }) ./fix-cross-compilation-antlr-dlg.patch - - # fix compatibility with nasm 3.01 (https://github.com/tianocore/edk2/pull/11691) - # TODO: remove when updating beyond 202511 - (fetchpatch { - name = "UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructions.patch"; - url = "https://github.com/tianocore/edk2/commit/9ccf8751a74f26142e584c7b7c7572a182b67997.patch"; - hash = "sha256-0aqpuQDxLdbSJMBXzY/57GzL2wLn0m8dkT7X6uXtKMg="; - }) ]; # FIXME: unvendor OpenSSL again once upstream updates