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 fd753977bf87..5a2781659262 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -447,25 +447,16 @@ 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="; - }) - ] - ++ lib.optionals (lib.versionOlder php.version "8.3") [ - # Fix gh10234 test with libxml 2.15.0 - (fetchpatch { - url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch"; - hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic="; - includes = [ - "ext/dom/tests/gh10234.phpt" - ]; - }) - ]; + patches = lib.optionals (lib.versionOlder php.version "8.3") [ + # Fix gh10234 test with libxml 2.15.0 + (fetchpatch { + url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch"; + hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic="; + includes = [ + "ext/dom/tests/gh10234.phpt" + ]; + }) + ]; } { name = "enchant";