commit f1f849afb89d04f9d6fe3fc04cd147c44263efbb · pyrox.dev/nixpkgs

+8 -6

nixos/modules/services/web-apps/nextcloud.nix

···

       153
       153
        
           package = mkOption {

     

       154
       154
        
             type = types.package;

     

       155
       155
        
             description = "Which package to use for the Nextcloud instance.";

     

       156
       156
       -
             relatedPackages = [ "nextcloud22" "nextcloud23" ];

     

       156
       156
       +
             relatedPackages = [ "nextcloud22" "nextcloud23" "nextcloud24" ];

     

       157
       157
        
           };

     

       158
       158
        
           phpPackage = mkOption {

     

       159
       159
        
             type = types.package;

     

       160
       160
       -
             relatedPackages = [ "php74" "php80" ];

     

       160
       160
       +
             relatedPackages = [ "php74" "php80" "php81" ];

     

       161
       161
        
             defaultText = "pkgs.php";

     

       162
       162
        
             description = ''

     

       163
       163
        
               PHP package to use for Nextcloud.

     
···

       568
       568
        
       

     

       569
       569
        
         config = mkIf cfg.enable (mkMerge [

     

       570
       570
        
           { warnings = let

     

       571
       571
       -
               latest = 23;

     

       571
       571
       +
               latest = 24;

     

       572
       572
        
               upgradeWarning = major: nixos:

     

       573
       573
        
                 ''

     

       574
       574
        
                   A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.

     
···

       604
       604
        
               ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05"))

     

       605
       605
        
               ++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11"))

     

       606
       606
        
               ++ (optional (versionOlder cfg.package.version "23") (upgradeWarning 22 "22.05"))

     

       607
       607
       +
               ++ (optional (versionOlder cfg.package.version "24") (upgradeWarning 23 "22.05"))

     

       607
       608
        
               ++ (optional isUnsupportedMariadb ''

     

       608
       609
        
                   You seem to be using MariaDB at an unsupported version (i.e. at least 10.6)!

     

       609
       610
        
                   Please note that this isn't supported officially by Nextcloud. You can either

     
···

       626
       627
        
                   ''

     

       627
       628
        
                 else if versionOlder stateVersion "21.11" then nextcloud21

     

       628
       629
        
                 else if versionOlder stateVersion "22.05" then nextcloud22

     

       629
       629
       -
                 else nextcloud23

     

       630
       630
       +
                 else nextcloud24

     

       630
       631
        
               );

     

       631
       632
        
       

     

       632
       633
        
             services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;

     

       633
       634
        
       

     

       634
       635
        
             services.nextcloud.phpPackage =

     

       635
       636
        
               if versionOlder cfg.package.version "21" then pkgs.php74

     

       636
       636
       -
               else pkgs.php80;

     

       637
       637
       +
               else if versionOlder cfg.package.version "24" then pkgs.php80

     

       638
       638
       +
               else pkgs.php81;

     

       637
       639
        
           }

     

       638
       640
        
       

     

       639
       641
        
           { assertions = [

     
···

       884
       886
        
               # FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,

     

       885
       887
        
               # this is a workaround.

     

       886
       888
        
               # See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22

     

       887
       887
       -
               settings = {

     

       889
       889
       +
               settings = mkIf (versionOlder cfg.package.version "24") {

     

       888
       890
        
                 mysqld = {

     

       889
       891
        
                   innodb_read_only_compressed = 0;

     

       890
       892
        
                 };

+1 -1

nixos/modules/services/web-apps/nextcloud.xml

···

       11
       11
        
         desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.

     

       12
       12
        
        </para>

     

       13
       13
        
        <para>

     

       14
       14
       -
         The current default by NixOS is <package>nextcloud23</package> which is also the latest

     

       14
       14
       +
         The current default by NixOS is <package>nextcloud24</package> which is also the latest

     

       15
       15
        
         major version available.

     

       16
       16
        
        </para>

     

       17
       17
        
        <section xml:id="module-services-nextcloud-basic-usage">

+1 -1

nixos/tests/nextcloud/default.nix

···

       18
       18
        
           };

     

       19
       19
        
         })

     

       20
       20
        
       { }

     

       21
       21
       -
         [ 22 23 ]

     

       21
       21
       +
         [ 22 23 24 ]

pkgs/servers/nextcloud/default.nix

···

       54
       54
        
           version = "23.0.4";

     

       55
       55
        
           sha256 = "67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a";

     

       56
       56
        
         };

     

       57
       57
       +
       

     

       58
       58
       +
         nextcloud24 = generic {

     

       59
       59
       +
           version = "24.0.0";

     

       60
       60
       +
           sha256 = "176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780";

     

       61
       61
       +
         };

     

       62
       62
       +
       

     

       57
       63
        
         # tip: get she sha with:

     

       58
       64
        
         # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

     

       59
       65
        
       }

+1 -1

pkgs/top-level/all-packages.nix

···

       8604
       8604
        
         grocy = callPackage ../servers/grocy { };

     

       8605
       8605
        
       

     

       8606
       8606
        
         inherit (callPackage ../servers/nextcloud {})

     

       8607
       8607
       -
           nextcloud21 nextcloud22 nextcloud23;

     

       8607
       8607
       +
           nextcloud21 nextcloud22 nextcloud23 nextcloud24;

     

       8608
       8608
        
       

     

       8609
       8609
        
         nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };

     

       8610
       8610