From 15d0312a8a5d430c148d39a829f24a379b2e187a Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 29 Mar 2025 19:25:44 +0100 Subject: [PATCH] icingaweb2: pin php version to 8.3 --- nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix | 2 +- pkgs/servers/icingaweb2/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 680257d23b21..880ae5f55994 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -192,7 +192,7 @@ in ) ); }; - phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled); + phpPackage = pkgs.php83.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled); phpOptions = '' date.timezone = "${cfg.timezone}" ''; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 8a948d00c94c..d36faa6e523e 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -3,7 +3,7 @@ lib, fetchFromGitHub, makeWrapper, - php, + php83, nixosTests, }: @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { cp -ra application bin etc library modules public $out cp -ra doc $out/share - wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}" + wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php83 ]}" ''; passthru.tests = { inherit (nixosTests) icingaweb2; };