From 33c44a10310b6613e735c3596af776ed1f36622b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 21 May 2022 18:34:28 +0200 Subject: [PATCH] nextcloud22: drop Version 22 will be EOLed in July 2022[1] and we shouldn't have unsupported software in the soon-to-be-released NixOS 22.05, hence dropping it already. [1] https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule --- .../from_md/release-notes/rl-2205.section.xml | 13 +++++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 4 ++++ nixos/modules/services/web-apps/nextcloud.nix | 3 +-- nixos/tests/nextcloud/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 15 +++++---------- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 19aaf12f26a..aafa9b831b6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1645,6 +1645,19 @@ GnuTLS instead of OpenSSL by default for licensing reasons. + + + The default version of nextcloud is + nextcloud24. Please note + that it’s not possible to + upgrade nextcloud across multiple major + versions! This means it’s e.g. not possible to upgrade from + nextcloud22 to + nextcloud24 in a single deploy and most + 21.11 users will have to upgrade to + nextcloud23 first. + + pkgs.vimPlugins.onedark-nvim now refers to diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9261511e7b8..52bcc2e80d9 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -632,6 +632,10 @@ In addition to numerous new and upgraded packages, this release has the followin - The `vpnc` package has been changed to use GnuTLS instead of OpenSSL by default for licensing reasons. +- The default version of `nextcloud` is **nextcloud24**. Please note that it's **not** possible to upgrade + `nextcloud` across multiple major versions! This means it's e.g. not possible to upgrade from `nextcloud22` + to `nextcloud24` in a single deploy and most `21.11` users will have to upgrade to `nextcloud23` first. + - `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) (formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)). diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 52287a834c9..a58e8aa3abd 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 = [ "nextcloud22" "nextcloud23" "nextcloud24" ]; + relatedPackages = [ "nextcloud23" "nextcloud24" ]; }; phpPackage = mkOption { type = types.package; @@ -625,7 +625,6 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "21.11" then nextcloud21 else if versionOlder stateVersion "22.05" then nextcloud22 else nextcloud24 ); diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 76feac314d5..45165b04bf8 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -18,4 +18,4 @@ foldl }; }) { } - [ 22 23 24 ] + [ 23 24 ] diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6fc386f4646..94d69ad81dc 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,23 +33,18 @@ let }; }; in { - nextcloud21 = throw '' - Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped - by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring + nextcloud22 = throw '' + Nextcloud v22 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2022-07. Please upgrade to at least Nextcloud v23 by declaring - services.nextcloud.package = pkgs.nextcloud22; + services.nextcloud.package = pkgs.nextcloud23; in your NixOS config. - WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21 + WARNING: if you were on Nextcloud 21 on NixOS 21.11 you have to upgrade to Nextcloud 22 first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions! ''; - nextcloud22 = generic { - version = "22.2.8"; - sha256 = "061b8a118d0fa500058a04ff8476ba96d4c24cef56e5fe5e300cc7113ce13a18"; - }; - nextcloud23 = generic { version = "23.0.5"; sha256 = "3cf51a795f8439e5d34f0a521d939cefafbae38450cce64c6673016984195f29"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfe84795999..9b6fcf7046c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8621,7 +8621,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud21 nextcloud22 nextcloud23 nextcloud24; + nextcloud22 nextcloud23 nextcloud24; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };