From 58def163c0d1e98f5ab10485d0741c9adbc4de2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 26 Jul 2025 23:21:20 +0200 Subject: [PATCH] nixos/nextcloud: fix eval --- nixos/modules/services/web-apps/nextcloud.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index dcee09968bc1..e57d853bb8cf 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1058,24 +1058,22 @@ in ++ (lib.optional (lib.versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11")) ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05")); - services.nextcloud.package = - with pkgs; - lib.mkDefault ( - if pkgs ? nextcloud then - throw '' - The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default - nextcloud defined in an overlay, please set `services.nextcloud.package` to - `pkgs.nextcloud`. - '' - else if versionOlder stateVersion "24.05" then - nextcloud27 - else if versionOlder stateVersion "24.11" then - nextcloud29 - else if versionOlder stateVersion "25.05" then - nextcloud30 - else - nextcloud31 - ); + services.nextcloud.package = lib.mkDefault ( + if pkgs ? nextcloud then + throw '' + The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default + nextcloud defined in an overlay, please set `services.nextcloud.package` to + `pkgs.nextcloud`. + '' + else if lib.versionOlder stateVersion "24.05" then + pkgs.nextcloud27 + else if lib.versionOlder stateVersion "24.11" then + pkgs.nextcloud29 + else if lib.versionOlder stateVersion "25.05" then + pkgs.nextcloud30 + else + pkgs.nextcloud31 + ); services.nextcloud.phpOptions = mkMerge [ (lib.mapAttrs (lib.const lib.mkOptionDefault) defaultPHPSettings)