From 69c26f338b1863dfc45819f693abfcb1de582c2d Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 29 Mar 2025 20:07:31 +0100 Subject: [PATCH] monica: pin php version to 8.3 --- nixos/modules/services/web-apps/monica.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/monica.nix b/nixos/modules/services/web-apps/monica.nix index 16263e70c2e8..00bb9bb7de2d 100644 --- a/nixos/modules/services/web-apps/monica.nix +++ b/nixos/modules/services/web-apps/monica.nix @@ -15,6 +15,8 @@ with lib; let user = cfg.user; group = cfg.group; + php = lib.getExe pkgs.php83; + # shell script for local administration artisan = pkgs.writeScriptBin "monica" '' #! ${pkgs.runtimeShell} @@ -26,7 +28,7 @@ with lib; let exec "$@" fi } - sudo ${pkgs.php}/bin/php artisan "$@" + sudo ${php} artisan "$@" ''; tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME; @@ -419,8 +421,8 @@ in { fi # migrate & seed db - ${pkgs.php}/bin/php artisan key:generate --force - ${pkgs.php}/bin/php artisan setup:production -v --force + ${php} artisan key:generate --force + ${php} artisan setup:production -v --force ''; }; @@ -432,7 +434,7 @@ in { Type = "oneshot"; User = user; WorkingDirectory = "${monica}"; - ExecStart = "${pkgs.php}/bin/php ${monica}/artisan schedule:run -v"; + ExecStart = "${php} ${monica}/artisan schedule:run -v"; }; }; @@ -465,4 +467,3 @@ in { }; }; } -