about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-12-12 16:07:10 -0800
committerRobert Schütz <nix@dotlambda.de>2023-12-13 15:57:33 -0800
commitf6ea3f91b577921d9fbc48fb683b81445f9f150b (patch)
tree605ee5f11fc0c389031a2539f6205d49ac3c7b27 /nixos/modules
parentee2865e5ed2817707f80c32fd5d9a0e1c828d88c (diff)
downloadnixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.tar
nixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.tar.gz
nixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.tar.bz2
nixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.tar.lz
nixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.tar.xz
nixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.tar.zst
nixlib-f6ea3f91b577921d9fbc48fb683b81445f9f150b.zip
nextcloud28: init at 28.0.0
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index db6eacf30196..7c78abd087ed 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -28,6 +28,7 @@ let
   phpPackage = cfg.phpPackage.buildEnv {
     extensions = { enabled, all }:
       (with all; enabled
+        ++ [ bz2 intl sodium ] # recommended
         ++ optional cfg.enableImagemagick imagick
         # Optionally enabled depending on caching settings
         ++ optional cfg.caching.apcu apcu
@@ -190,7 +191,7 @@ in {
     package = mkOption {
       type = types.package;
       description = lib.mdDoc "Which package to use for the Nextcloud instance.";
-      relatedPackages = [ "nextcloud26" "nextcloud27" ];
+      relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ];
     };
     phpPackage = mkPackageOption pkgs "php" {
       example = "php82";
@@ -679,7 +680,7 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     { warnings = let
-        latest = 27;
+        latest = 28;
         upgradeWarning = major: nixos:
           ''
             A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@@ -700,7 +701,8 @@ in {
         '')
         ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11"))
         ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05"))
-        ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11"));
+        ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11"))
+        ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 26 "24.05"));
 
       services.nextcloud.package = with pkgs;
         mkDefault (
@@ -713,7 +715,8 @@ in {
           else if versionOlder stateVersion "22.11" then nextcloud24
           else if versionOlder stateVersion "23.05" then nextcloud25
           else if versionOlder stateVersion "23.11" then nextcloud26
-          else nextcloud27
+          else if versionOlder stateVersion "24.05" then nextcloud27
+          else nextcloud28
         );
 
       services.nextcloud.phpPackage =