suwayomi-server: 1.1.1 -> 2.1.1867 (#400589)

nixos/tests/all-tests.nix

···
   sudo-rs = runTest ./sudo-rs.nix;
   sunshine = runTest ./sunshine.nix;
   suricata = runTest ./suricata.nix;
-  suwayomi-server = handleTest ./suwayomi-server.nix { };
+  suwayomi-server = import ./suwayomi-server.nix {
+    inherit runTest;
+    lib = pkgs.lib;
+  };
   swap-file-btrfs = runTest ./swap-file-btrfs.nix;
   swap-partition = runTest ./swap-partition.nix;
   swap-random-encryption = runTest ./swap-random-encryption.nix;

nixos/tests/suwayomi-server.nix

···
-{
-  system ? builtins.currentSystem,
-  pkgs,
-  lib ? pkgs.lib,
-}:
+{ lib, runTest }:
+
 let
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
   inherit (lib) recursiveUpdate;
 
   baseTestConfig = {
···
           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
 
 {
-  without-auth = makeTest (
+  without-auth = runTest (
     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/")
+      '';
     }
   );
 
-  with-auth = makeTest (
+  with-auth = runTest (
     recursiveUpdate baseTestConfig {
       name = "suwayomi-server-with-auth";
 
···
             };
           };
         };
+
+      testScript = ''
+        machine.wait_for_unit("suwayomi-server.service")
+        machine.wait_for_open_port(1234)
+        machine.succeed("curl --fail -u alice:pass http://localhost:1234/")
+      '';
     }
   );
 }

pkgs/by-name/su/suwayomi-server/package.nix

···
   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 = [
···
   };
 
   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.
     '';
···
     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";
   };