commit 35c669bae60e876ee9d9ad357c00e20b71b92a8c · pyrox.dev/nixpkgs

+4 -1

nixos/tests/all-tests.nix

···

       1388
       1388
        
         sudo-rs = runTest ./sudo-rs.nix;

     

       1389
       1389
        
         sunshine = runTest ./sunshine.nix;

     

       1390
       1390
        
         suricata = runTest ./suricata.nix;

     

       1391
       1391
       -
         suwayomi-server = handleTest ./suwayomi-server.nix { };

     

       1391
       1391
       +
         suwayomi-server = import ./suwayomi-server.nix {

     

       1392
       1392
       +
           inherit runTest;

     

       1393
       1393
       +
           lib = pkgs.lib;

     

       1394
       1394
       +
         };

     

       1392
       1395
        
         swap-file-btrfs = runTest ./swap-file-btrfs.nix;

     

       1393
       1396
        
         swap-partition = runTest ./swap-partition.nix;

     

       1394
       1397
        
         swap-random-encryption = runTest ./swap-random-encryption.nix;

+16 -13

nixos/tests/suwayomi-server.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         system ? builtins.currentSystem,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         lib ? pkgs.lib,

     

       5
       5
       -
       }:

     

       1
       1
       +
       { lib, runTest }:

     

       2
       2
       +
       

     

       6
       3
        
       let

     

       7
       7
       -
         inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

     

       8
       4
        
         inherit (lib) recursiveUpdate;

     

       9
       5
        
       

     

       10
       6
        
         baseTestConfig = {

     
···

       17
       13
        
                 settings.server.port = 1234;

     

       18
       14
        
               };

     

       19
       15
        
             };

     

       20
       20
       -
           testScript = ''

     

       21
       21
       -
             machine.wait_for_unit("suwayomi-server.service")

     

       22
       22
       -
             machine.wait_for_open_port(1234)

     

       23
       23
       -
             machine.succeed("curl --fail http://localhost:1234/")

     

       24
       24
       -
           '';

     

       25
       16
        
         };

     

       26
       17
        
       in

     

       27
       18
        
       

     

       28
       19
        
       {

     

       29
       29
       -
         without-auth = makeTest (

     

       20
       20
       +
         without-auth = runTest (

     

       30
       21
        
           recursiveUpdate baseTestConfig {

     

       31
       22
        
             name = "suwayomi-server-without-auth";

     

       23
       23
       +
       

     

       24
       24
       +
             testScript = ''

     

       25
       25
       +
               machine.wait_for_unit("suwayomi-server.service")

     

       26
       26
       +
               machine.wait_for_open_port(1234)

     

       27
       27
       +
               machine.succeed("curl --fail http://localhost:1234/")

     

       28
       28
       +
             '';

     

       32
       29
        
           }

     

       33
       30
        
         );

     

       34
       31
        
       

     

       35
       35
       -
         with-auth = makeTest (

     

       32
       32
       +
         with-auth = runTest (

     

       36
       33
        
           recursiveUpdate baseTestConfig {

     

       37
       34
        
             name = "suwayomi-server-with-auth";

     

       38
       35
        
       

     
···

       50
       47
        
                   };

     

       51
       48
        
                 };

     

       52
       49
        
               };

     

       50
       50
       +
       

     

       51
       51
       +
             testScript = ''

     

       52
       52
       +
               machine.wait_for_unit("suwayomi-server.service")

     

       53
       53
       +
               machine.wait_for_open_port(1234)

     

       54
       54
       +
               machine.succeed("curl --fail -u alice:pass http://localhost:1234/")

     

       55
       55
       +
             '';

     

       53
       56
        
           }

     

       54
       57
        
         );

     

       55
       58
        
       }

+8 -8

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

···

       3
       3
        
         stdenvNoCC,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         makeWrapper,

     

       6
       6
       -
         jdk17_headless,

     

       6
       6
       +
         jdk21_headless,

     

       7
       7
        
         nixosTests,

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
       -
         jdk = jdk17_headless;

     

       11
       11
       +
         jdk = jdk21_headless;

     

       12
       12
        
       in

     

       13
       13
        
       

     

       14
       14
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       15
       15
        
         pname = "suwayomi-server";

     

       16
       16
       -
         version = "1.1.1";

     

       17
       17
       -
         revision = 1535;

     

       16
       16
       +
         version = "2.1.1867";

     

       18
       17
        
       

     

       19
       18
        
         src = fetchurl {

     

       20
       20
       -
           url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}-r${toString finalAttrs.revision}.jar";

     

       21
       21
       -
           hash = "sha256-mPzREuH89RGhZLK+5aIPuq1gmNGc9MGG0wh4ZV5dLTg=";

     

       19
       19
       +
           url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}.jar";

     

       20
       20
       +
           hash = "sha256-UeMHwlgeThoAKZGrPjp3UDyLB0xCaVmHqYSnOC0Kxa8=";

     

       22
       21
        
         };

     

       23
       22
        
       

     

       24
       23
        
         nativeBuildInputs = [

     
···

       42
       41
        
         };

     

       43
       42
        
       

     

       44
       43
        
         meta = with lib; {

     

       45
       45
       -
           description = "Free and open source manga reader server that runs extensions built for Tachiyomi";

     

       44
       44
       +
           description = "Free and open source manga reader server that runs extensions built for Mihon (Tachiyomi)";

     

       46
       45
        
           longDescription = ''

     

       47
       47
       -
             Suwayomi is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.

     

       46
       46
       +
             Suwayomi is an independent Mihon (Tachiyomi) compatible software and is not a Fork of Mihon (Tachiyomi).

     

       48
       47
        
       

     

       49
       48
        
             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.

     

       50
       49
        
           '';

     
···

       53
       52
        
           changelog = "https://github.com/Suwayomi/Suwayomi-Server/releases/tag/v${finalAttrs.version}";

     

       54
       53
        
           license = licenses.mpl20;

     

       55
       54
        
           platforms = jdk.meta.platforms;

     

       55
       55
       +
           sourceProvenance = [ sourceTypes.binaryBytecode ];

     

       56
       56
        
           maintainers = with maintainers; [ ratcornu ];

     

       57
       57
        
           mainProgram = "tachidesk-server";

     

       58
       58
        
         };