From f9bf71d5f1eef470c8c932058f5c879e113090f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Mar 2023 19:20:35 +0100 Subject: [PATCH 1/2] nextcloud24: 24.0.10 -> 24.0.11 Changes: https://github.com/nextcloud/server/compare/v24.0.10...v24.0.11 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index b98da0d064eb..fde9b389793e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -40,8 +40,8 @@ let }; in { nextcloud24 = generic { - version = "24.0.10"; - sha256 = "sha256-B6+0gO9wn39BpcR0IsIuMa81DH8TWuDOlTZR9O1qRbk="; + version = "24.0.11"; + sha256 = "sha256-ipsg4rulhRnatEW9VwUJLvOEtX5ZiK7MXK3AU8Q9qIo="; }; nextcloud25 = generic { From 8b4ba7023538316d77c0aa22084947c6553a21de Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Mar 2023 19:21:52 +0100 Subject: [PATCH 2/2] nextcloud25: 25.0.4 -> 25.0.5 Changes: https://github.com/nextcloud/server/compare/v25.0.4...v25.0.5 --- pkgs/servers/nextcloud/default.nix | 4 ++-- .../0001-Setup-remove-custom-dbuser-creation-behavior.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index fde9b389793e..c6385d6dd744 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -45,8 +45,8 @@ in { }; nextcloud25 = generic { - version = "25.0.4"; - sha256 = "sha256-wyUeAIOpQwPi1piLNS87Mwgqeacmsw/3RnCbD+hpoaY="; + version = "25.0.5"; + sha256 = "sha256-xtxjLYPGK9V0GvUzXcE7awzeYQZNPNmlHuDmtHeMqaU="; }; nextcloud26 = generic { diff --git a/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch index 5aa71c58bfec..f4f1f748d9f7 100644 --- a/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ b/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -138,7 +138,7 @@ index af816c7ad04..e49e5508e15 100644 - // Therefore we assume that the database is only used by one user/service which is Nextcloud - // Additional services should get installed in a separate database in order to stay secure - // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS -- $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO ' . addslashes($this->dbUser)); +- $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO "' . addslashes($this->dbUser) . '"'); - $connectionMainDatabase->close(); - }