From 161355f6c3713deb29f2bfcb954ba9fc7c630217 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 19 Jun 2024 21:34:08 -0400 Subject: [PATCH 1/4] edk2: simplify src by using postFetch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❯ ls -ld result-new result-statusquo lrwxrwxrwx - adam 19 Jun 21:20 result-new -> /nix/store/srk9dl484fh6fr4qpzxah0cwmhhz86xd-source lrwxrwxrwx - adam 19 Jun 21:09 result-statusquo -> /nix/store/p3kl9i7xwpaczbh30riqgj1z51w1zilr-edk2-unvendored-src ❯ diff -r result-new result-statusquo diff: result-new/EmulatorPkg/Unix/Host/X11IncludeHack: No such file or directory diff: result-statusquo/EmulatorPkg/Unix/Host/X11IncludeHack: No such file or directory --- pkgs/development/compilers/edk2/default.nix | 37 +++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index cd15f29e370c..524ff18471b8 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,10 +1,7 @@ { stdenv -, clangStdenv , fetchFromGitHub , fetchpatch -, runCommand , libuuid -, python3 , bc , lib , buildPackages @@ -31,7 +28,7 @@ buildType = if stdenv.isDarwin then else "GCC5"; -edk2 = stdenv.mkDerivation rec { +edk2 = stdenv.mkDerivation { pname = "edk2"; version = "202402"; @@ -48,29 +45,27 @@ edk2 = stdenv.mkDerivation rec { }) ]; - srcWithVendoring = fetchFromGitHub { + src = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-Nurm6QNKCyV6wvbj0ELdYAL7mbZ0yg/tTwnEJ+N18ng="; + hash = "sha256-xIOaM4l08R7OqYgCIl17qeKO0xWy+3qTwyrknzQWA40="; + + # We don't want EDK2 to keep track of OpenSSL, + # they're frankly bad at it. + postFetch = '' + rm -rf $out/CryptoPkg/Library/OpensslLib/openssl + mkdir -p $out/CryptoPkg/Library/OpensslLib/openssl + tar --strip-components=1 -xf ${buildPackages.openssl.src} -C $out/CryptoPkg/Library/OpensslLib/openssl + + # Fix missing INT64_MAX include that edk2 explicitly does not provide + # via it's own . Let's pull in openssl's definition instead: + sed -i $out/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c \ + -e '1i #include "internal/numbers.h"' + ''; }; - # We don't want EDK2 to keep track of OpenSSL, - # they're frankly bad at it. - src = runCommand "edk2-unvendored-src" { } '' - cp --no-preserve=mode -r ${srcWithVendoring} $out - rm -rf $out/CryptoPkg/Library/OpensslLib/openssl - mkdir -p $out/CryptoPkg/Library/OpensslLib/openssl - tar --strip-components=1 -xf ${buildPackages.openssl.src} -C $out/CryptoPkg/Library/OpensslLib/openssl - chmod -R +w $out/ - - # Fix missing INT64_MAX include that edk2 explicitly does not provide - # via it's own . Let's pull in openssl's definition instead: - sed -i $out/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c \ - -e '1i #include "internal/numbers.h"' - ''; - nativeBuildInputs = [ pythonEnv ]; depsBuildBuild = [ buildPackages.stdenv.cc buildPackages.bash ]; depsHostHost = [ libuuid ]; From 62921811ddc0e9b4e0f5ba41f96b628def6269be Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 19 Jun 2024 21:47:20 -0400 Subject: [PATCH 2/4] edk2: move to by-name --- .../compilers/edk2/default.nix => by-name/ed/edk2/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/compilers/edk2/default.nix => by-name/ed/edk2/package.nix} (100%) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/by-name/ed/edk2/package.nix similarity index 100% rename from pkgs/development/compilers/edk2/default.nix rename to pkgs/by-name/ed/edk2/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adba1c835f36..c2ad81b37d57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7458,8 +7458,6 @@ with pkgs; edit = callPackage ../applications/editors/edit { }; - edk2 = callPackage ../development/compilers/edk2 { }; - edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; edl = callPackage ../development/embedded/edl { }; From 0de2895c09d4bcea2ec141aef56abb36f84dcb4a Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 19 Jun 2024 21:50:36 -0400 Subject: [PATCH 3/4] edk2: add updateScript and changelog --- pkgs/by-name/ed/edk2/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 524ff18471b8..a5147a90e0ef 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -5,6 +5,7 @@ , bc , lib , buildPackages +, nix-update-script }: let @@ -98,11 +99,14 @@ edk2 = stdenv.mkDerivation { meta = with lib; { description = "Intel EFI development kit"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; + changelog = "https://github.com/tianocore/edk2/releases/tag/edk2-stable${edk2.version}"; license = licenses.bsd2; platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64; }; passthru = { + updateScript = nix-update-script { }; + mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs: let attrs = lib.toFunction attrsOrFun finalAttrs; From 24efbe2c36e56bf92b645207e581be2e951a6fe0 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 20 Jun 2024 01:56:51 +0000 Subject: [PATCH 4/4] edk2: 202402 -> 202405 --- pkgs/by-name/ed/edk2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index a5147a90e0ef..a28108f985f9 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -31,7 +31,7 @@ buildType = if stdenv.isDarwin then edk2 = stdenv.mkDerivation { pname = "edk2"; - version = "202402"; + version = "202405"; patches = [ # pass targetPrefix as an env var @@ -51,7 +51,7 @@ edk2 = stdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-xIOaM4l08R7OqYgCIl17qeKO0xWy+3qTwyrknzQWA40="; + hash = "sha256-7vNodHocwqQiO0ZXtqo8lEOFyt8JkFHcAathEhrKWE0="; # We don't want EDK2 to keep track of OpenSSL, # they're frankly bad at it.