From bafb6848e731c8585d33360240b29d3c895d60da Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 29 Mar 2025 19:44:20 +0100 Subject: [PATCH] agorakit: pin php version to 8.2 --- nixos/modules/services/web-apps/agorakit.nix | 9 +++++---- pkgs/by-name/ag/agorakit/package.nix | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/agorakit.nix b/nixos/modules/services/web-apps/agorakit.nix index 583f68ee5881..b7c86d7585dd 100644 --- a/nixos/modules/services/web-apps/agorakit.nix +++ b/nixos/modules/services/web-apps/agorakit.nix @@ -13,6 +13,7 @@ let user = cfg.user; group = cfg.group; + php = lib.getExe pkgs.php82; # shell script for local administration artisan = pkgs.writeScriptBin "agorakit" '' @@ -25,7 +26,7 @@ let exec "$@" fi } - sudo ${lib.getExe pkgs.php} artisan "$@" + sudo ${php} artisan "$@" ''; tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME; @@ -447,9 +448,9 @@ in fi # migrate & seed db - ${pkgs.php}/bin/php artisan key:generate --force - ${pkgs.php}/bin/php artisan migrate --force - ${pkgs.php}/bin/php artisan config:cache + ${php} artisan key:generate --force + ${php} artisan migrate --force + ${php} artisan config:cache ''; }; diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix index 0d23000df9fb..bbf42b287435 100644 --- a/pkgs/by-name/ag/agorakit/package.nix +++ b/pkgs/by-name/ag/agorakit/package.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, - php, + php82, dataDir ? "/var/lib/agorakit", }: -php.buildComposerProject2 (finalAttrs: { +php82.buildComposerProject2 (finalAttrs: { pname = "agorakit"; version = "1.9.3";