From 411c3eec3be112e5dcce833b53ac29fcf84fd4f4 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Wed, 7 Aug 2024 20:22:16 +0100
Subject: [PATCH] nzbhydra2: move to by-name

---
 .../default.nix => by-name/nz/nzbhydra2/package.nix}        | 6 +++---
 pkgs/top-level/all-packages.nix                             | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{servers/nzbhydra2/default.nix => by-name/nz/nzbhydra2/package.nix} (94%)

diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
similarity index 94%
rename from pkgs/servers/nzbhydra2/default.nix
rename to pkgs/by-name/nz/nzbhydra2/package.nix
index 080a147931ed..d92d9904aab4 100644
--- a/pkgs/servers/nzbhydra2/default.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchzip,
   makeWrapper,
-  jre,
+  openjdk17,
   python3,
   unzip,
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    jre
+    openjdk17
     makeWrapper
     unzip
   ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \
       --add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \
-      --prefix PATH ":" ${jre}/bin
+      --prefix PATH ":" ${openjdk17}/bin
 
     runHook postInstall
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 150c5785dcc0..d835f9192cad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10945,11 +10945,6 @@ with pkgs;
 
   nzbget = callPackage ../tools/networking/nzbget { };
 
-  nzbhydra2 = callPackage ../servers/nzbhydra2 {
-    # Requires Java 17, not lower, not higher
-    jre = openjdk17;
-  };
-
   oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
 
   oath-toolkit = callPackage ../tools/security/oath-toolkit { };