From 647cac40fb1dd092a412f6f8ad7e9666ec63e362 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Thu, 7 Nov 2024 18:28:48 -0500
Subject: [PATCH 1/2] ghidra-bin: 10.4 -> 11.2.1

---
 pkgs/tools/security/ghidra/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 8f39076b4eec..0b12186a9f88 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -4,7 +4,7 @@
   lib,
   makeWrapper,
   autoPatchelfHook,
-  openjdk17,
+  openjdk21,
   pam,
   makeDesktopItem,
   icoutils,
@@ -28,12 +28,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ghidra";
-  version = "10.4";
-  versiondate = "20230928";
+  version = "11.2.1";
+  versiondate = "20241105";
 
   src = fetchzip {
     url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip";
-    hash = "sha256-IiAQ9OKmr8ZgqmGftuW0ITdG06fb9Lr30n2H9GArctk=";
+    hash = "sha256-w6FCAjF2ggFWH8eo7X8V6ZTbSptGkwRzoEMj9nGL5/M=";
   };
 
   nativeBuildInputs = [
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless"
 
     wrapProgram "${pkg_path}/support/launch.sh" \
-      --prefix PATH : ${lib.makeBinPath [ openjdk17 ]}
+      --prefix PATH : ${lib.makeBinPath [ openjdk21 ]}
   '';
 
   meta = with lib; {

From 95faddaab7292bd14f25231430125038b058c6ea Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Thu, 7 Nov 2024 18:54:48 -0500
Subject: [PATCH 2/2] ghidra-bin: add aarch64 platforms

---
 pkgs/tools/security/ghidra/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 0b12186a9f88..357d104c665e 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -78,7 +78,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/NationalSecurityAgency/ghidra";
     platforms = [
       "x86_64-linux"
+      "aarch64-linux"
       "x86_64-darwin"
+      "aarch64-darwin"
     ];
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.asl20;