From b58bbfa37e2e597c03e7c7981a123c5edee875bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 1 Nov 2025 18:48:54 +0100 Subject: [PATCH] php84: 8.4.13 -> 8.4.14 ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.14 (cherry picked from commit efa1a8f4f59ceefb266971ce3f06338283cbdbc7) --- pkgs/development/interpreters/php/8.4.nix | 4 ++-- pkgs/top-level/php-packages.nix | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 87784a47966a..bc43493b9d1a 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.13"; - hash = "sha256-hRgd3Kez4D8UhSGwQ71iQRlQ1GjGZ9tkAEefGxCBIZQ="; + version = "8.4.14"; + hash = "sha256-8hOc5Mt6bFZD7pjKo05cMrqEHCuik+NKPQNX+qhLs+c="; } ); in diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ddecc10b0d0d..703b71da31cf 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -446,14 +446,6 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--enable-dom" ]; - patches = lib.optionals (lib.versionAtLeast php.version "8.4") [ - # Fix build of ext-dom. - # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14) - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch"; - hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA="; - }) - ]; } { name = "enchant";