nextcloud30: init at 30.0.0

(cherry picked from commit 1b121c1)
NixOS · Oct 1, 2024 · 17f9584 · 17f9584
1 parent 5809c97
commit 17f9584
Show file tree

Hide file tree

Showing 6 changed files with 268 additions and 6 deletions.
diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md
@@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using
 [services.nextcloud](#opt-services.nextcloud.enable). A
 desktop client is packaged at `pkgs.nextcloud-client`.
 
-The current default by NixOS is `nextcloud29` which is also the latest
+The current default by NixOS is `nextcloud30` which is also the latest
 major version available.
 
 ## Basic usage {#module-services-nextcloud-basic-usage}

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
@@ -291,7 +291,7 @@ in {
     package = mkOption {
       type = types.package;
       description = "Which package to use for the Nextcloud instance.";
-      relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ];
+      relatedPackages = [ "nextcloud27" "nextcloud28" "nextcloud29" "nextcloud30" ];
     };
     phpPackage = mkPackageOption pkgs "php" {
       example = "php82";
@@ -797,7 +797,7 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     { warnings = let
-        latest = 29;
+        latest = 30;
         upgradeWarning = major: nixos:
           ''
             A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.

diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
@@ -22,4 +22,4 @@ foldl
     };
   })
 { }
-  [ 27 28 29 ]
+  [ 27 28 29 30 ]
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
@@ -2,6 +2,7 @@
 , nextcloud27Packages
 , nextcloud28Packages
 , nextcloud29Packages
+, nextcloud30Packages
 }:
 
 let
@@ -14,7 +15,7 @@ let
     inherit version;
 
     src = fetchurl {
-      url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
+      url = "https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2";
       inherit hash;
     };
 
@@ -61,6 +62,12 @@ in {
     packages = nextcloud29Packages;
   };
 
+  nextcloud30 = generic {
+    version = "30.0.0";
+    hash = "sha256-GNeoCVe7U+lPsESS9rUhNDTdo+naEtn3iZl2h8hWTmA=";
+    packages = nextcloud30Packages;
+  };
+
   # tip: get the sha with:
   # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ foldl @@
         };
       })
     { }
-      [ 27 28 29 ]
+      [ 27 28 29 30 ]