From ab6c0b73558fedfe7fed6e7205f4e4a701eb304f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 22 Nov 2024 17:51:55 +0100 Subject: [PATCH] phpExtensions.soap: re-add soap patch Closes #358188 But only for 8.3 since there's no release with this patch included. On PHP 8.4 it's already there. Partial revert of 080b8f1f576d278a58319cfa35a41813fbe4c244. --- pkgs/top-level/php-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5fbed020cacd..69661ef6f3c1 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -684,6 +684,13 @@ in { url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) + ] + ++ lib.optionals (lib.versionAtLeast php.version "8.3" && lib.versionOlder php.version "8.4") [ + # https://github.com/php/php-src/pull/16733 (fix soap test) + (fetchpatch { + url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch"; + hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM="; + }) ]; } {