From 3c616cd906223298bd7108634aa0229b8daf41ec Mon Sep 17 00:00:00 2001 From: Tomo Date: Wed, 30 Oct 2024 19:14:14 +0000 Subject: [PATCH] jd-cli: drop JCenter Bintray is dead. This package depends on jd-core, which was only hosted through JCenter Bintray. --- .../manual/release-notes/rl-2411.section.md | 4 +++ pkgs/tools/security/jd-cli/default.nix | 34 ------------------- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 pkgs/tools/security/jd-cli/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 490aa3d5f569..fc17ae8523eb 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -566,6 +566,10 @@ - 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-cli` package was removed due to an inactive upstreamĀ and a dependency on the shut down + JCenter JAR repository. + Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI). + - 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). diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix deleted file mode 100644 index d99c1e687ac3..000000000000 --- a/pkgs/tools/security/jd-cli/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchFromGitHub, jre, makeWrapper, maven }: - -maven.buildMavenPackage rec { - pname = "jd-cli"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "intoolswetrust"; - repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; - }; - - mvnHash = "sha256-lEcAq0H8Uacv02ItjVGfxvtRip5206HtpREBrQDzBDo="; - - mvnParameters = "-DskipTests"; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin $out/share/jd-cli - install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli - - makeWrapper ${jre}/bin/java $out/bin/jd-cli \ - --add-flags "-jar $out/share/jd-cli/jd-cli.jar" - ''; - - meta = with lib; { - description = "Simple command line wrapper around JD Core Java Decompiler project"; - homepage = "https://github.com/intoolswetrust/jd-cli"; - license = licenses.gpl3; - maintainers = with maintainers; [ majiir ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1b1e68f38e6..43a6c818c44e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -533,7 +533,8 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 - jd-gui = throw "jd-gui has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 + jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 + jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 # Julia diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760bbc942a98..f10f72f9256f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8743,8 +8743,6 @@ with pkgs; jc = with python3Packages; toPythonApplication jc; - jd-cli = callPackage ../tools/security/jd-cli { }; - jd-diff-patch = callPackage ../development/tools/jd-diff-patch { }; jdiskreport = callPackage ../tools/misc/jdiskreport { };