Unverified Commit efa1a8f4 authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

php84: 8.4.13 -> 8.4.14

parent 019f1706
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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
+10 −19
Original line number Diff line number Diff line
@@ -447,16 +447,7 @@ 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") [
              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";