From c0f4b20db7e8f39f60da8c09686f013d955bbee1 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 2 Dec 2021 19:24:50 +0200 Subject: [PATCH] nextcloud23: init at 23.0.0 --- nixos/modules/services/web-apps/nextcloud.nix | 8 +++++--- nixos/modules/services/web-apps/nextcloud.xml | 2 +- nixos/tests/nextcloud/default.nix | 10 +++++----- pkgs/servers/nextcloud/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 04ec7888950d..b1a536e519db 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -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; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 9d9cb8dfb3f2..8f55086a2bd1 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -11,7 +11,7 @@ desktop client is packaged at pkgs.nextcloud-client. - The current default by NixOS is nextcloud22 which is also the latest + The current default by NixOS is nextcloud23 which is also the latest major version available.
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index bd7a7aacdc91..34d3c345354c 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -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 ] diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 348ffa0e37e0..5490b29090e0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -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' } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b264c9b828fd..a0f2cb13e0d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7909,7 +7909,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 { };