diff options
| author | Robert Schütz <nix@dotlambda.de> | 2023-02-23 08:57:40 -0800 |
|---|---|---|
| committer | Robert Schütz <nix@dotlambda.de> | 2023-02-23 09:35:29 -0800 |
| commit | 66164bded0b5420cb98b2071673f4ede4bb711cc (patch) | |
| tree | e122a2658b12302fe4ecf2eadb503c27d710832a /pkgs/servers | |
| parent | aff767f7eafd128672c2cfe5d33bec6d8d98e594 (diff) | |
| download | nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.tar nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.tar.gz nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.tar.bz2 nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.tar.lz nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.tar.xz nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.tar.zst nixpkgs-66164bded0b5420cb98b2071673f4ede4bb711cc.zip | |
nextcloud25: 25.0.3 -> 25.0.4
Changelog: https://nextcloud.com/changelog/#25-0-4
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nextcloud/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 391644379ef..c8f80dd233e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -27,6 +27,7 @@ let ''; meta = with lib; { + changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}"; description = "Sharing solution for files, calendars, contacts and more"; homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin ma27 ]; @@ -55,8 +56,8 @@ in { }; nextcloud25 = generic { - version = "25.0.3"; - sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; + version = "25.0.4"; + sha256 = "sha256-wyUeAIOpQwPi1piLNS87Mwgqeacmsw/3RnCbD+hpoaY="; }; # tip: get the sha with: 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 1d22c927f38..5aa71c58bfe 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 @@ -1,4 +1,4 @@ -From fc3e14155b3c4300b691ab46579830e725457a54 Mon Sep 17 00:00:00 2001 +From 1adc542ca1d7f60067febd692596eb6e8f334f9c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 10 Sep 2022 15:18:05 +0200 Subject: [PATCH] Setup: remove custom dbuser creation behavior @@ -25,15 +25,15 @@ user to operate Nextcloud (which is a good thing in fact). [1] https://github.com/nextcloud/server/pull/33513 --- - lib/private/Setup/MySQL.php | 53 -------------------------------- - lib/private/Setup/PostgreSQL.php | 37 ---------------------- - 2 files changed, 90 deletions(-) + lib/private/Setup/MySQL.php | 56 -------------------------------- + lib/private/Setup/PostgreSQL.php | 37 --------------------- + 2 files changed, 93 deletions(-) diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index e3004c269bc..bc958e84e44 100644 +index caa73edccec..bc958e84e44 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php -@@ -141,59 +141,6 @@ class MySQL extends AbstractDatabase { +@@ -141,62 +141,6 @@ class MySQL extends AbstractDatabase { $rootUser = $this->dbUser; $rootPassword = $this->dbPassword; @@ -79,6 +79,9 @@ index e3004c269bc..bc958e84e44 100644 - $i++; - } - } +- } else { +- // Reuse existing password if a database config is already present +- $this->dbPassword = $rootPassword; - } - } catch (\Exception $ex) { - $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ @@ -142,5 +145,5 @@ index af816c7ad04..e49e5508e15 100644 $this->config->setValues([ 'dbuser' => $this->dbUser, -- -2.38.1 +2.39.1 |