From 81edb3c9865bbf6a6cbb98337ed0b2e69edfa099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Jul 2025 15:50:25 +0200 Subject: [PATCH] nixos/nextcloud: move phpPackage default into option This allows it to be accessed like options.services.nextcloud.phpPackage.default (cherry picked from commit 5a7afe0a331f97d7dbc65abe38f9a1807d2d753d) --- nixos/modules/services/web-apps/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 54cbd2f4a18e..1d0cd68a1b31 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -436,6 +436,7 @@ in ]; }; phpPackage = mkPackageOption pkgs "php" { + default = [ "php83" ]; example = "php82"; }; @@ -1072,8 +1073,6 @@ in nextcloud31 ); - services.nextcloud.phpPackage = pkgs.php83; - services.nextcloud.phpOptions = mkMerge [ (mapAttrs (const mkOptionDefault) defaultPHPSettings) {