diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 7378878a648a4..14065f3aa7700 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Use com.google.protobuf:protobuf-gradle-plugin Ghidra/Debug/Debugger-isf/build.gradle | 8 +- Ghidra/Debug/Debugger-rmi-trace/build.gradle | 14 +-- build.gradle | 6 ++ - gradle/debugger/hasProtobuf.gradle | 94 -------------------- + gradle/hasProtobuf.gradle | 94 -------------------- 5 files changed, 26 insertions(+), 103 deletions(-) diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle @@ -19,7 +19,7 @@ index 9e1c57faf..3a3242eb5 100644 apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" --apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +-apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" +apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' @@ -41,7 +41,7 @@ index d135294a0..785681ca2 100644 apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" --apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +-apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" - +apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' @@ -63,9 +63,9 @@ index 40fbc17ab..7517ffe6e 100644 apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" --apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +-apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" +apply plugin: 'com.google.protobuf' - apply from: "${rootProject.projectDir}/gradle/debugger/hasPythonPackage.gradle" + apply from: "${rootProject.projectDir}/gradle/hasPythonPackage.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-rmi-trace' @@ -110,10 +110,10 @@ index b0c717fb1..5f56506a5 100644 } } else { -diff --git a/gradle/debugger/hasProtobuf.gradle b/gradle/debugger/hasProtobuf.gradle +diff --git a/gradle/hasProtobuf.gradle b/gradle/hasProtobuf.gradle index 23b4ce74b..e69de29bb 100644 ---- a/gradle/debugger/hasProtobuf.gradle -+++ b/gradle/debugger/hasProtobuf.gradle +--- a/gradle/hasProtobuf.gradle ++++ b/gradle/hasProtobuf.gradle @@ -1,94 +0,0 @@ -/* ### - * IP: GHIDRA diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 3a1fca3c393b1..328720f44b38f 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -3,9 +3,9 @@ fetchFromGitHub, lib, callPackage, - gradle_7, + gradle, makeBinaryWrapper, - openjdk17, + openjdk21, unzip, makeDesktopItem, copyDesktopItems, @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.1.1"; + version = "11.1.2"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -28,7 +28,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-t96FcAK3JwO66dOf4OhpOfU8CQfAczfF61Cg7m+B3fA="; + hash = "sha256-FL1nLaq8A9PI+RzqZg5+O+4+ZsH16MG3cf7OIKimDqw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,8 +43,6 @@ let ''; }; - gradle = gradle_7; - patches = [ # Use our own protoc binary instead of the prebuilt one ./0001-Use-protobuf-gradle-plugin.patch @@ -128,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { data = ./deps.json; }; - gradleFlags = [ "-Dorg.gradle.java.home=${openjdk17}" ]; + gradleFlags = [ "-Dorg.gradle.java.home=${openjdk21}" ]; preBuild = '' export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home" @@ -164,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s "${pkg_path}/ghidraRun" "$out/bin/ghidra" wrapProgram "${pkg_path}/support/launch.sh" \ --set-default NIX_GHIDRAHOME "${pkg_path}/Ghidra" \ - --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk21 ]} ''; passthru = { diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json index 994b25ef434eb..8e45b569a9166 100644 --- a/pkgs/tools/security/ghidra/deps.json +++ b/pkgs/tools/security/ghidra/deps.json @@ -38,37 +38,37 @@ } }, "https://github.com": { - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2012_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x64": { "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2012_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x86": { "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2015_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x64": { "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2015_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x86": { "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2017_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x64": { "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2017_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x86": { "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2019_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x64": { "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2019_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x86": { "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vsOlder_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x64": { "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vsOlder_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x86": { "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/lib/java-sarif-2.1-modified": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/lib/java-sarif-2.1-modified": { "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" }, "pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": {