diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-03-16 17:59:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-16 17:59:53 +0100 |
| commit | 5226029af8ec287b6b7f8420562443d8c0b629d3 (patch) | |
| tree | 0ddc558d3fb78640e26cf3797e7c5f601787a183 /nixos | |
| parent | 3ed918339632e43224a4fa5247881b2ce21980bd (diff) | |
| parent | 15876a546cac865ef2c3041328d88e750931ee13 (diff) | |
| download | nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.tar nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.tar.gz nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.tar.bz2 nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.tar.lz nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.tar.xz nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.tar.zst nixpkgs-5226029af8ec287b6b7f8420562443d8c0b629d3.zip | |
Merge pull request #164313 from Ma27/drop-nextcloud21
nextcloud21: remove
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 11 | ||||
| -rw-r--r-- | nixos/tests/nextcloud/default.nix | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 141ab98e29b..b32220a5e57 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" "nextcloud23" ]; + relatedPackages = [ "nextcloud22" "nextcloud23" ]; }; phpPackage = mkOption { type = types.package; @@ -571,15 +571,6 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `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 "22.05" then nextcloud22 else nextcloud23 diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 34d3c345354..b7b1c5c6600 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -18,4 +18,4 @@ foldl }; }) { } - [ 21 22 23 ] + [ 22 23 ] |