From 57c298f8cd4bd8a4427076d902964aee879aeaf4 Mon Sep 17 00:00:00 2001
From: RatCornu <balthazar.patiachvili@crans.org>
Date: Mon, 21 Apr 2025 20:07:46 +0200
Subject: [PATCH] suwayomi-server: 1.1.1 -> 2.1.1867

---
 nixos/tests/suwayomi-server.nix             | 17 ++++++++++++-----
 pkgs/by-name/su/suwayomi-server/package.nix | 16 ++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/nixos/tests/suwayomi-server.nix b/nixos/tests/suwayomi-server.nix
index 7f7da9c3d831..94f22b7f417b 100644
--- a/nixos/tests/suwayomi-server.nix
+++ b/nixos/tests/suwayomi-server.nix
@@ -17,11 +17,6 @@ let
           settings.server.port = 1234;
         };
       };
-    testScript = ''
-      machine.wait_for_unit("suwayomi-server.service")
-      machine.wait_for_open_port(1234)
-      machine.succeed("curl --fail http://localhost:1234/")
-    '';
   };
 in
 
@@ -29,6 +24,12 @@ in
   without-auth = makeTest (
     recursiveUpdate baseTestConfig {
       name = "suwayomi-server-without-auth";
+
+      testScript = ''
+        machine.wait_for_unit("suwayomi-server.service")
+        machine.wait_for_open_port(1234)
+        machine.succeed("curl --fail http://localhost:1234/")
+      '';
     }
   );
 
@@ -50,6 +51,12 @@ in
             };
           };
         };
+
+      testScript = ''
+        machine.wait_for_unit("suwayomi-server.service")
+        machine.wait_for_open_port(1234)
+        machine.succeed("curl --fail -u alice:pass http://localhost:1234/")
+      '';
     }
   );
 }
diff --git a/pkgs/by-name/su/suwayomi-server/package.nix b/pkgs/by-name/su/suwayomi-server/package.nix
index 31da4c3a1833..c88cd902cba2 100644
--- a/pkgs/by-name/su/suwayomi-server/package.nix
+++ b/pkgs/by-name/su/suwayomi-server/package.nix
@@ -3,22 +3,21 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  jdk17_headless,
+  jdk21_headless,
   nixosTests,
 }:
 
 let
-  jdk = jdk17_headless;
+  jdk = jdk21_headless;
 in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "suwayomi-server";
-  version = "1.1.1";
-  revision = 1535;
+  version = "2.1.1867";
 
   src = fetchurl {
-    url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}-r${toString finalAttrs.revision}.jar";
-    hash = "sha256-mPzREuH89RGhZLK+5aIPuq1gmNGc9MGG0wh4ZV5dLTg=";
+    url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}.jar";
+    hash = "sha256-UeMHwlgeThoAKZGrPjp3UDyLB0xCaVmHqYSnOC0Kxa8=";
   };
 
   nativeBuildInputs = [
@@ -42,9 +41,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "Free and open source manga reader server that runs extensions built for Tachiyomi";
+    description = "Free and open source manga reader server that runs extensions built for Mihon (Tachiyomi)";
     longDescription = ''
-      Suwayomi is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.
+      Suwayomi is an independent Mihon (Tachiyomi) compatible software and is not a Fork of Mihon (Tachiyomi).
 
       Suwayomi-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc.
     '';
@@ -53,6 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Suwayomi/Suwayomi-Server/releases/tag/v${finalAttrs.version}";
     license = licenses.mpl20;
     platforms = jdk.meta.platforms;
+    sourceProvenance = [ sourceTypes.binaryBytecode ];
     maintainers = with maintainers; [ ratcornu ];
     mainProgram = "tachidesk-server";
   };