From 1db72d9afc00c9d4d55aff46811a1fbf7413ad04 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Thu, 3 Apr 2025 15:17:09 +0200 Subject: [PATCH] nixos/monica: add phpPackage option and pass it to phpfpm pool fixes nixosTests.monica failure --- nixos/modules/services/web-apps/monica.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/monica.nix b/nixos/modules/services/web-apps/monica.nix index 727eb6ea5028..2aec2d9f9109 100644 --- a/nixos/modules/services/web-apps/monica.nix +++ b/nixos/modules/services/web-apps/monica.nix @@ -16,7 +16,7 @@ let user = cfg.user; group = cfg.group; - php = lib.getExe pkgs.php83; + php = lib.getExe cfg.phpPackage; # shell script for local administration artisan = pkgs.writeScriptBin "monica" '' @@ -38,6 +38,8 @@ in options.services.monica = { enable = mkEnableOption "monica"; + phpPackage = mkPackageOption pkgs "php83" { }; + user = mkOption { default = "monica"; description = "User monica runs as."; @@ -342,6 +344,7 @@ in services.phpfpm.pools.monica = { inherit user group; + phpPackage = cfg.phpPackage; phpOptions = '' log_errors = on post_max_size = ${cfg.maxUploadSize}