From 9960abcf8fa651a48a1d4f43fd2a5ea7a4dffa46 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Dec 2025 19:25:00 +0100
Subject: [PATCH] php82: 8.2.29 -> 8.2.30, fixes CVE-2025-14177,
 CVE-2025-14178, CVE-2025-14180, GHSA-www2-q4fc-65wf

ChangeLog: https://www.php.net/ChangeLog-8.php#8.2.30
---
 pkgs/development/interpreters/php/8.2.nix |  4 ++--
 pkgs/top-level/php-packages.nix           | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 6e33b3ba3c60..ecf54354a8b7 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.2.29";
-      hash = "sha256-UZeejRmMut4qrU/+n1PdPwT5YC0wieWXmYXgWK3kJnw=";
+      version = "8.2.30";
+      hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo=";
     }
   );
 in
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5a2781659262..bd805eef0f1b 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -447,16 +447,6 @@ lib.makeScope pkgs.newScope (
               configureFlags = [
                 "--enable-dom"
               ];
-              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";