Merge pull request #148301 from Kranzes/nextcloud

nextcloud23: init at 23.0.0
This commit is contained in:
Maximilian Bosch 2021-12-04 14:54:25 +01:00 committed by GitHub
commit 5ffc828912
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions

View file

@ -153,7 +153,7 @@ in {
package = mkOption {
type = types.package;
description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud21" "nextcloud22" ];
relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ];
};
phpPackage = mkOption {
type = types.package;
@ -508,7 +508,7 @@ in {
config = mkIf cfg.enable (mkMerge [
{ warnings = let
latest = 22;
latest = 23;
upgradeWarning = major: nixos:
''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@ -543,6 +543,7 @@ in {
'')
++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05"))
++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11"))
++ (optional (versionOlder cfg.package.version "23") (upgradeWarning 22 "22.05"))
++ (optional isUnsupportedMariadb ''
You seem to be using MariaDB at an unsupported version (i.e. at least 10.6)!
Please note that this isn't supported officially by Nextcloud. You can either
@ -573,7 +574,8 @@ in {
# nextcloud20 throws an eval-error because it's dropped).
else if versionOlder stateVersion "21.03" then nextcloud20
else if versionOlder stateVersion "21.11" then nextcloud21
else nextcloud22
else if versionOlder stateVersion "22.05" then nextcloud22
else nextcloud23
);
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;

View file

@ -11,7 +11,7 @@
desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
</para>
<para>
The current default by NixOS is <package>nextcloud22</package> which is also the latest
The current default by NixOS is <package>nextcloud23</package> which is also the latest
major version available.
</para>
<section xml:id="module-services-nextcloud-basic-usage">

View file

@ -1,6 +1,6 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../../.. { inherit system config; }
{ system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../../.. { inherit system config; }
}:
with pkgs.lib;
@ -17,5 +17,5 @@ foldl
nextcloudVersion = ver;
};
})
{}
[ 21 22 ]
{ }
[ 21 22 23 ]

View file

@ -54,6 +54,11 @@ in {
version = "22.2.3";
sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo=";
};
nextcloud23 = generic {
version = "23.0.0";
sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw=";
};
# tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
}

View file

@ -7916,7 +7916,7 @@ with pkgs;
grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {})
nextcloud20 nextcloud21 nextcloud22;
nextcloud20 nextcloud21 nextcloud22 nextcloud23;
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };