git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #164313 from Ma27/drop-nextcloud21

nextcloud21: remove

commit5226029af8ec287b6b7f8420562443d8c0b629d3 authorMaximilian Bosch <maximilian@mbosch.me> dateWed 16 Mar 2022, 17:59 (5 years ago) parent3ed918315876a5
4 files changed+9−23
compare with master
unifiedsplit
nixos/modules/services/web-apps/nextcloud.nix+1−10 nixos/tests/nextcloud/default.nix+1−1 pkgs/servers/nextcloud/default.nix+6−11 pkgs/top-level/all-packages.nix+1−1
nixos/modules/services/web-apps/nextcloud.nix+1−10
@@ -153,7 +153,7 @@ in {
153153 package = mkOption {
154154 type = types.package;
155155 description = "Which package to use for the Nextcloud instance.";
156− relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ];
156+ relatedPackages = [ "nextcloud22" "nextcloud23" ];
157157 };
158158 phpPackage = mkOption {
159159 type = types.package;
@@ -571,15 +571,6 @@ in {
571571 nextcloud defined in an overlay, please set `services.nextcloud.package` to
572572 `pkgs.nextcloud`.
573573 ''
574− # 21.03 will not be an official release - it was instead 21.05.
575− # This versionOlder statement remains set to 21.03 for backwards compatibility.
576− # See https://github.com/NixOS/nixpkgs/pull/108899 and
577− # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
578− # FIXME(@Ma27) remove this else-if as soon as 21.05 is EOL! This is only here
579− # to ensure that users who are on Nextcloud 19 with a stateVersion <21.05 with
580− # no explicit services.nextcloud.package don't upgrade to v21 by accident (
581− # nextcloud20 throws an eval-error because it's dropped).
582− else if versionOlder stateVersion "21.03" then nextcloud20
583574 else if versionOlder stateVersion "21.11" then nextcloud21
584575 else if versionOlder stateVersion "22.05" then nextcloud22
585576 else nextcloud23
nixos/tests/nextcloud/default.nix+1−1
@@ -18,4 +18,4 @@ foldl
1818 };
1919 })
2020{ }
21− [ 21 22 23 ]
21+ [ 22 23 ]
pkgs/servers/nextcloud/default.nix+6−11
@@ -33,23 +33,18 @@ let
3333 };
3434 };
3535in {
36− nextcloud20 = throw ''
37− Nextcloud v20 has been removed from `nixpkgs` as the support for it was dropped
38− by upstream in 2021-10. Please upgrade to at least Nextcloud v21 by declaring
36+ nextcloud21 = throw ''
37+ Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped
38+ by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring
3939
40− services.nextcloud.package = pkgs.nextcloud21;
40+ services.nextcloud.package = pkgs.nextcloud22;
4141
4242 in your NixOS config.
4343
44− WARNING: if you were on Nextcloud 19 on NixOS 21.05 you have to upgrade to Nextcloud 20
45− first on 21.05 because Nextcloud doesn't support upgrades accross multiple major versions!
44+ WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21
45+ first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions!
4646 '';
4747
48− nextcloud21 = generic {
49− version = "21.0.9";
50− sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE=";
51− };
52−
5348 nextcloud22 = generic {
5449 version = "22.2.5";
5550 sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8=";
pkgs/top-level/all-packages.nix+1−1
@@ -8240,7 +8240,7 @@ with pkgs;
82408240 grocy = callPackage ../servers/grocy { };
82418241
82428242 inherit (callPackage ../servers/nextcloud {})
8243− nextcloud20 nextcloud21 nextcloud22 nextcloud23;
8243+ nextcloud21 nextcloud22 nextcloud23;
82448244
82458245 nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
82468246