colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nextcloud21: remove

Browse Source 
EOLed by upstream in 2022-02[1].

[1] https://docs.nextcloud.com/server/23/admin_manual/release_schedule.html#older-versions
This commit is contained in:
Maximilian Bosch 2022-03-15 21:25:44 +01:00
parent 1df0b696b2
commit 15876a546c
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -153,7 +153,7 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
description = "Which package to use for the Nextcloud instance."; description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ]; relatedPackages = [ "nextcloud22" "nextcloud23" ];
}; };
phpPackage = mkOption { phpPackage = mkOption {
type = types.package; type = types.package;
@ -571,15 +571,6 @@ in {
nextcloud defined in an overlay, please set `services.nextcloud.package` to nextcloud defined in an overlay, please set `services.nextcloud.package` to
`pkgs.nextcloud`. `pkgs.nextcloud`.
'' ''
# 21.03 will not be an official release - it was instead 21.05.
# This versionOlder statement remains set to 21.03 for backwards compatibility.
# See https://github.com/NixOS/nixpkgs/pull/108899 and
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
# FIXME(@Ma27) remove this else-if as soon as 21.05 is EOL! This is only here
# to ensure that users who are on Nextcloud 19 with a stateVersion <21.05 with
# no explicit services.nextcloud.package don't upgrade to v21 by accident (
# 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 if versionOlder stateVersion "21.11" then nextcloud21
else if versionOlder stateVersion "22.05" then nextcloud22 else if versionOlder stateVersion "22.05" then nextcloud22
else nextcloud23 else nextcloud23

2
nixos/tests/nextcloud/default.nix
View File

@ -18,4 +18,4 @@ foldl
}; };
}) })
{ } { }
[ 21 22 23 ] [ 22 23 ]

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

@ -33,23 +33,18 @@ let
}; };
}; };
in { in {
nextcloud20 = throw '' nextcloud21 = throw ''
Nextcloud v20 has been removed from `nixpkgs` as the support for it was dropped Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped
by upstream in 2021-10. Please upgrade to at least Nextcloud v21 by declaring by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring
services.nextcloud.package = pkgs.nextcloud21; services.nextcloud.package = pkgs.nextcloud22;
in your NixOS config. in your NixOS config.
WARNING: if you were on Nextcloud 19 on NixOS 21.05 you have to upgrade to Nextcloud 20 WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21
first on 21.05 because Nextcloud doesn't support upgrades accross multiple major versions! first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions!
''; '';
nextcloud21 = generic {
version = "21.0.9";
sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE=";
};
nextcloud22 = generic { nextcloud22 = generic {
version = "22.2.5"; version = "22.2.5";
sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8=";

2
pkgs/top-level/all-packages.nix
View File

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