nextcloud24: init at 24.0.0

Added Nextcloud 23 and set it as the default Nextcloud version for the
NixOS module. Added PHP 8.1 as an option for phpPackage and default for
Nextcloud ≥ 24.
main
Colin Arnott 2 years ago
parent 2c501af791
commit ecd8d42397
No known key found for this signature in database
GPG Key ID: 0447A663F7F3E236
  1. 11
      nixos/modules/services/web-apps/nextcloud.nix
  2. 2
      nixos/modules/services/web-apps/nextcloud.xml
  3. 2
      nixos/tests/nextcloud/default.nix
  4. 6
      pkgs/servers/nextcloud/default.nix
  5. 2
      pkgs/top-level/all-packages.nix

@ -153,11 +153,11 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
description = "Which package to use for the Nextcloud instance."; description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud22" "nextcloud23" ]; relatedPackages = [ "nextcloud22" "nextcloud23" "nextcloud24"];
}; };
phpPackage = mkOption { phpPackage = mkOption {
type = types.package; type = types.package;
relatedPackages = [ "php74" "php80" ]; relatedPackages = [ "php74" "php80" "php81"];
defaultText = "pkgs.php"; defaultText = "pkgs.php";
description = '' description = ''
PHP package to use for Nextcloud. PHP package to use for Nextcloud.
@ -555,7 +555,7 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
{ warnings = let { warnings = let
latest = 23; latest = 24;
upgradeWarning = major: nixos: upgradeWarning = major: nixos:
'' ''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@ -613,14 +613,15 @@ in {
'' ''
else if versionOlder stateVersion "21.11" then nextcloud21 else if versionOlder stateVersion "21.11" then nextcloud21
else if versionOlder stateVersion "22.05" then nextcloud22 else if versionOlder stateVersion "22.05" then nextcloud22
else nextcloud23 else nextcloud24
); );
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home; services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
services.nextcloud.phpPackage = services.nextcloud.phpPackage =
if versionOlder cfg.package.version "21" then pkgs.php74 if versionOlder cfg.package.version "21" then pkgs.php74
else pkgs.php80; else if versionOlder cfg.package.version "24" then pkgs.php80
else pkgs.php81;
} }
{ assertions = [ { assertions = [

@ -11,7 +11,7 @@
desktop client is packaged at <literal>pkgs.nextcloud-client</literal>. desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
</para> </para>
<para> <para>
The current default by NixOS is <package>nextcloud23</package> which is also the latest The current default by NixOS is <package>nextcloud24</package> which is also the latest
major version available. major version available.
</para> </para>
<section xml:id="module-services-nextcloud-basic-usage"> <section xml:id="module-services-nextcloud-basic-usage">

@ -18,4 +18,4 @@ foldl
}; };
}) })
{ } { }
[ 22 23 ] [ 22 23 24 ]

@ -54,6 +54,12 @@ in {
version = "23.0.4"; version = "23.0.4";
sha256 = "67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a"; sha256 = "67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a";
}; };
nextcloud24 = generic {
version = "24.0.0";
sha256 = "176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780";
};
# tip: get she sha with: # tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
} }

@ -8600,7 +8600,7 @@ with pkgs;
grocy = callPackage ../servers/grocy { }; grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {}) inherit (callPackage ../servers/nextcloud {})
nextcloud21 nextcloud22 nextcloud23; nextcloud21 nextcloud22 nextcloud23 nextcloud24;
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };

Loading…
Cancel
Save