From c2d71c11d04502f4be8eaaf14c57ad2ceead0d7b Mon Sep 17 00:00:00 2001 From: Tomo Date: Wed, 30 Oct 2024 17:12:50 +0000 Subject: [PATCH] jd-gui: drop Upstream has no commits since 2019: https://github.com/java-decompiler/jd-gui jd-gui uses Gradle 6, which has been EOL since 10 Feb 2023: https://endoflife.date/gradle (The JDK team is working on dropping Gradle 6). Attempting to build with a newer Gradle fails with a nontrivial error. Potential replacements: cfr, bytecode-viewer, procyon --- .../manual/release-notes/rl-2411.section.md | 3 + pkgs/tools/security/jd-gui/default.nix | 96 -------- pkgs/tools/security/jd-gui/deps.json | 210 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 4 insertions(+), 308 deletions(-) delete mode 100644 pkgs/tools/security/jd-gui/default.nix delete mode 100644 pkgs/tools/security/jd-gui/deps.json diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 8123f2ca52e9..490aa3d5f569 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -566,6 +566,9 @@ - The `services.patroni.raft` option has been removed, as Raft has been [deprecated by upstream since 3.0.0](https://github.com/patroni/patroni/blob/master/docs/releases.rst#version-300) +- The `jd-gui` package was removed due to an inactive upstreamĀ and a dependency on the end-of-life Gradle 6. + Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI). + - `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments. - The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer. diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix deleted file mode 100644 index a9ef78f3f5e4..000000000000 --- a/pkgs/tools/security/jd-gui/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, jre -, jdk -, gradle_6 -, makeDesktopItem -, copyDesktopItems -, runtimeShell -}: - -let - pname = "jd-gui"; - version = "1.6.6"; - - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "java-decompiler"; - repo = pname; - rev = "v${version}"; - hash = "sha256-QHiZPYFwDQzbXVSuhwzQqBRXlkG9QVU+Jl6SKvBoCwQ="; - }; - - gradle = gradle_6; - - desktopItem = makeDesktopItem { - name = "jd-gui"; - exec = "jd-gui %F"; - icon = "jd-gui"; - comment = "Java Decompiler JD-GUI"; - desktopName = "JD-GUI"; - genericName = "Java Decompiler"; - mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; - categories = [ "Development" "Debugger" ]; - startupWMClass = "org-jd-gui-App"; - }; - -in stdenv.mkDerivation rec { - inherit pname version src; - - patches = [ - # https://github.com/java-decompiler/jd-gui/pull/362 - (fetchpatch { - name = "nebula-plugin-gradle-6-compatibility.patch"; - url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch"; - hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE="; - }) - ]; - - nativeBuildInputs = [ jdk gradle copyDesktopItems ]; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - gradleBuildTask = "jar"; - - installPhase = let - jar = "$out/share/jd-gui/${name}.jar"; - in '' - runHook preInstall - - mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps} - cp build/libs/${name}.jar ${jar} - cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png - - cat > $out/bin/jd-gui <