From 7ebe421fa0c4d64c238661a656ba024709eef05c Mon Sep 17 00:00:00 2001
From: ibizaman <ibizaman@tiserbox.com>
Date: Thu, 23 Oct 2025 02:12:29 +0200
Subject: [PATCH] nextcloud: bump default version from 30 to 31

---
 CHANGELOG.md                           |  6 ++++++
 modules/services/nextcloud-server.nix  |  4 ++--
 patches/nextcloudexternalstorage.patch | 12 +++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fc42e0..30b7271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,12 @@ Template:
 
 # Upcoming Release
 
+# v0.6.0
+
+## Breaking Changes
+
+- Removed Nextcloud 30, update to Nextcloud 31 then after to 32.
+
 # v0.5.1
 
 ## New Features
diff --git a/modules/services/nextcloud-server.nix b/modules/services/nextcloud-server.nix
index 032e34e..13110d5 100644
--- a/modules/services/nextcloud-server.nix
+++ b/modules/services/nextcloud-server.nix
@@ -71,8 +71,8 @@ in
 
     version = lib.mkOption {
       description = "Nextcloud version to choose from.";
-      type = lib.types.enum [ 30 31 ];
-      default = 30;
+      type = lib.types.enum [ 31 32 ];
+      default = 31;
     };
 
     dataDir = lib.mkOption {
diff --git a/patches/nextcloudexternalstorage.patch b/patches/nextcloudexternalstorage.patch
index d5550d2..2e47fb1 100644
--- a/patches/nextcloudexternalstorage.patch
+++ b/patches/nextcloudexternalstorage.patch
@@ -1,21 +1,23 @@
 diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
-index 8fec24996891f..57b2980f1a43f 100644
+index 260f9218a88..26e5a4172f7 100644
 --- a/lib/private/Files/Storage/Local.php
 +++ b/lib/private/Files/Storage/Local.php
-@@ -101,9 +101,13 @@ public function __construct($arguments) {
+@@ -66,9 +66,12 @@ class Local extends \OC\Files\Storage\Common {
  		$this->unlinkOnTruncate = $this->config->getSystemValueBool('localstorage.unlink_on_truncate', false);
  
- 		if (isset($arguments['isExternal']) && $arguments['isExternal'] && !$this->stat('')) {
+ 		if (isset($parameters['isExternal']) && $parameters['isExternal'] && !$this->stat('')) {
 -			// data dir not accessible or available, can happen when using an external storage of type Local
 -			// on an unmounted system mount point
 -			throw new StorageNotAvailableException('Local storage path does not exist "' . $this->getSourcePath('') . '"');
-+
 +            if (!$this->mkdir('')) {
 +                // data dir not accessible or available, can happen when using an external storage of type Local
 +                // on an unmounted system mount point
 +                throw new StorageNotAvailableException('Local storage path does not exist and could not create it "' . $this->getSourcePath('') . '"');
 +            }
-+            \OC::$server->get(LoggerInterface::class)->warning('created local storage path ' . $this->getSourcePath(''), ['app' => 'core']);
++            Server::get(LoggerInterface::class)->warning('created local storage path ' . $this->getSourcePath(''), ['app' => 'core']);
  		}
  	}
  
+-- 
+2.50.1
+