ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

nextcloud25: 25.0.3 -> 25.0.4

Browse Source 
Changelog: https://nextcloud.com/changelog/#25-0-4
This commit is contained in:
Robert Schütz 2023-02-23 08:57:40 -08:00
parent aff767f7ea
commit 66164bded0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/nextcloud/default.nix
View File

@ -27,6 +27,7 @@ let
''; '';
meta = with lib; { meta = with lib; {
changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}";
description = "Sharing solution for files, calendars, contacts and more"; description = "Sharing solution for files, calendars, contacts and more";
homepage = "https://nextcloud.com"; homepage = "https://nextcloud.com";
maintainers = with maintainers; [ schneefux bachp globin ma27 ]; maintainers = with maintainers; [ schneefux bachp globin ma27 ];
@ -55,8 +56,8 @@ in {
}; };
nextcloud25 = generic { nextcloud25 = generic {
version = "25.0.3"; version = "25.0.4";
sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; sha256 = "sha256-wyUeAIOpQwPi1piLNS87Mwgqeacmsw/3RnCbD+hpoaY=";
}; };
# tip: get the sha with: # tip: get the sha with:

17
pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch
View File

@ -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> From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 10 Sep 2022 15:18:05 +0200 Date: Sat, 10 Sep 2022 15:18:05 +0200
Subject: [PATCH] Setup: remove custom dbuser creation behavior 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 [1] https://github.com/nextcloud/server/pull/33513
--- ---
lib/private/Setup/MySQL.php | 53 -------------------------------- lib/private/Setup/MySQL.php | 56 --------------------------------
lib/private/Setup/PostgreSQL.php | 37 ---------------------- lib/private/Setup/PostgreSQL.php | 37 ---------------------
2 files changed, 90 deletions(-) 2 files changed, 93 deletions(-)
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php 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 --- a/lib/private/Setup/MySQL.php
+++ b/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; $rootUser = $this->dbUser;
$rootPassword = $this->dbPassword; $rootPassword = $this->dbPassword;
@ -79,6 +79,9 @@ index e3004c269bc..bc958e84e44 100644
- $i++; - $i++;
- } - }
- } - }
- } else {
- // Reuse existing password if a database config is already present
- $this->dbPassword = $rootPassword;
- } - }
- } catch (\Exception $ex) { - } catch (\Exception $ex) {
- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ - $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([ $this->config->setValues([
'dbuser' => $this->dbUser, 'dbuser' => $this->dbUser,
-- --
2.38.1 2.39.1