diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-27 13:11:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-27 13:11:06 +0200 |
commit | 55e25f784038399823a6a0e462d1fe1144501290 (patch) | |
tree | 001c11ae431c8c9fd784de7005d9ae17a98c15eb /nixos/modules | |
parent | 76bbfe49ea452b3ab4fdb8ee52480247f021c17c (diff) | |
parent | 04fdff2517e398cfad4b951dfb8b7ffb02c81b78 (diff) |
Merge pull request #142800 from Ma27/drop-nextcloud-20
nextcloud20: drop
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 62ae763b69bcb..e6785d8d1835e 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 = [ "nextcloud20" "nextcloud21" "nextcloud22" ]; + relatedPackages = [ "nextcloud21" "nextcloud22" ]; }; phpPackage = mkOption { type = types.package; @@ -507,13 +507,7 @@ in { }; config = mkIf cfg.enable (mkMerge [ - { assertions = let acfg = cfg.config; in [ - { assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null; - message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!"; - } - ]; - - warnings = let + { warnings = let latest = 22; upgradeWarning = major: nixos: '' @@ -547,7 +541,6 @@ in { Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release. Please migrate your configuration to config.services.nextcloud.poolSettings. '') - ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05")) ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05")) ++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11")) ++ (optional isUnsupportedMariadb '' @@ -574,7 +567,11 @@ in { # 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. - else if versionOlder stateVersion "21.03" then nextcloud19 + # 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 nextcloud22 ); |