From ae17cd6616004933cc743963899d1d0ae3ff5389 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 26 Jul 2024 19:37:00 -0400 Subject: [PATCH] php{83,83}Extensions.soap: apply upstream patch for libxml2 2.13 compatibility --- pkgs/top-level/php-packages.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d2d2aca21755..7cb0709405c9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -645,8 +645,20 @@ in { configureFlags = [ "--enable-soap" ]; - doCheck = false; internalDeps = [ php.extensions.session ]; + patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ + # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+ + (fetchpatch { + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; + hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; + }) + ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ + (fetchpatch { + url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; + hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; + excludes = [ "NEWS" ]; + }) + ]; } { name = "sockets";