Merge: php: 8.2.25 -> 8.2.26, 8.1.30 -> 8.1.31, 8.3.13 -> 8.3.14 (#358600)

pkgs/development/interpreters/php/8.1.nix

@@ -2,35 +2,8 @@
 
 let
   base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // {
-    version = "8.1.30";
+    version = "8.1.31";
-    hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4=";
+    hash = "sha256-CzmCizRRUcrxt5XZ9LkjyYhyMXdsMwdt/J2QpEOQ0Nw=";
-    extraPatches = [
-      # Fix build with libxml2 2.12+.
-      # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
-      (fetchpatch {
-        url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch";
-        hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0=";
-      })
-      # Fix tests with libxml2 2.12
-      (fetchpatch {
-        url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
-        hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
-        excludes = [
-          "NEWS"
-        ];
-      })
-      # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
-      # Required for libxml2 2.13 compatibility patch.
-      (fetchpatch {
-        url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
-        hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
-      })
-      # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
-      (fetchpatch {
-        url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
-        hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
-      })
-    ];
   });
 in
 base.withExtensions ({ all, ... }: with all; ([

pkgs/development/interpreters/php/8.2.nix

@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.2.25";
+    version = "8.2.26";
-    hash = "sha256-B7QcXpbGDAllEORfAvgYQU0RvdDV2htoQN26K6colAE=";
+    hash = "sha256-vlfDR9RRyQW8tDNoMqhk2ZKN0OIJibhycF/qC6ZHbGs=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([

pkgs/development/interpreters/php/8.3.nix

@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.3.13";
+    version = "8.3.14";
-    hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ=";
+    hash = "sha256-9W+mac5MAUUqKSH0ADTXedjCuX0HSUk61HgYE7kiHPg=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([

pkgs/top-level/php-packages.nix

@@ -395,29 +395,6 @@ in {
           configureFlags = [
             "--enable-dom"
           ];
-          # Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions.
-          patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
-            # Fix tests with libxml 2.12
-            # Part of 8.3.1RC1+, 8.2.14RC1+
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
-              hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
-              excludes = [
-                "NEWS"
-              ];
-            })
-          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.1") [
-            # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
-              hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
-            })
-            # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
-              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
-            })
-          ];
         }
         {
           name = "enchant";
@@ -625,27 +602,6 @@ in {
           configureFlags = [
             "--enable-simplexml"
           ];
-          patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
-            # Fix tests with libxml2 2.12
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
-              hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
-              excludes = [
-                "NEWS"
-              ];
-            })
-            # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
-            # Required for libxml2 2.13 compatibility patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
-              hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
-            })
-            # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
-              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
-            })
-          ];
         }
         {
           name = "snmp";
@@ -664,28 +620,7 @@ in {
           #   Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided
           doCheck = !stdenv.hostPlatform.isDarwin && lib.versionOlder php.version "8.4";
           internalDeps = [ php.extensions.session ];
-          patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
+          patches = lib.optionals (lib.versionAtLeast php.version "8.3" && lib.versionOlder php.version "8.4") [
-            # Fix tests with libxml2 2.12
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
-              hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
-              excludes = [
-                "NEWS"
-              ];
-            })
-            # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
-            # Required for libxml2 2.13 compatibility patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
-              hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
-            })
-            # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
-            (fetchpatch {
-              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";
@@ -724,27 +659,6 @@ in {
             "--enable-xml"
           ];
           doCheck = false;
-          patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
-            # Fix tests with libxml2 2.12
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
-              hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
-              excludes = [
-                "NEWS"
-              ];
-            })
-            # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
-            # Required for libxml2 2.13 compatibility patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
-              hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
-            })
-            # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
-              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
-            })
-          ];
         }
         {
           name = "xmlreader";
@@ -762,27 +676,6 @@ in {
           configureFlags = [
             "--enable-xmlwriter"
           ];
-          patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
-            # Fix tests with libxml2 2.12
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
-              hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
-              excludes = [
-                "NEWS"
-              ];
-            })
-            # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
-            # Required for libxml2 2.13 compatibility patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
-              hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
-            })
-            # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
-              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
-            })
-          ];
         }
         {
           name = "xsl";