Unverified Commit 0ed682c3 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #242068 from NixOS/php/bump-july-2023

php: bumps July 2023
parents 94c52940 06b79b17
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

let
  base = callPackage ./generic.nix (_args // {
    version = "8.1.20";
    hash = "sha256-VVeFh1FKJwdQD4UxnlfA1N+biAPNsmVmWVrEv0WdxN0=";
    version = "8.1.21";
    hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20=";
  });

in
+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

let
  base = callPackage ./generic.nix (_args // {
    version = "8.2.7";
    hash = "sha256-W/sqNcZ5Ib3K3VyQyykK11N9JNoROl6LwtZGsC3nSI8=";
    version = "8.2.8";
    hash = "sha256-mV7UAJx5F8li0xg3oaNljzbUr081e2c8l//b5kA/hRc=";
  });

in
+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@

let
  base = (callPackage ./generic.nix (_args // {
    version = "8.3.0alpha2";
    version = "8.3.0alpha3";
    hash = null;
  })).overrideAttrs (oldAttrs: {
    src = fetchurl {
      url = "https://downloads.php.net/~eric/php-8.3.0alpha2.tar.xz";
      hash = "sha256-YLCxgiDcsBisOmAodf0h8HyaCIh+4i1Q7QZw/h4KR5I=";
      url = "https://downloads.php.net/~jakub/php-8.3.0alpha3.tar.xz";
      hash = "sha256-Ko0SR5ZIsdMyEmeM65zFU4bCU7f7xpiDBMf0od/kv8k=";
    };
  });
in
+0 −14
Original line number Diff line number Diff line
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index a6f3e64db6..c3047233db 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -14,6 +14,9 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "php.h"

 #include "libmagic/magic.h"
+0 −15
Original line number Diff line number Diff line
@@ -339,12 +339,6 @@ lib.makeScope pkgs.newScope (self: with self; {
        {
          name = "fileinfo";
          buildInputs = [ pcre2 ];
          patches = lib.optionals (lib.versionAtLeast php.version "8.3") [
            # Fix the extension unable to be loaded due to missing `get_module` function.
            # `ZEND_GET_MODULE` macro that creates it is conditional on `COMPILE_DL_FILEINFO` being defined.
            # https://github.com/php/php-src/issues/11408#issuecomment-1602106200
            ../development/interpreters/php/fix-fileinfo-ext-php83.patch
          ];
        }
        { name = "filter"; buildInputs = [ pcre2 ]; }
        { name = "ftp"; buildInputs = [ openssl ]; }
@@ -534,15 +528,6 @@ lib.makeScope pkgs.newScope (self: with self; {
        }
        { name = "session";
          doCheck = false;
          patches = lib.optionals (lib.versionAtLeast php.version "8.3") [
            # Fix GH-11529: Crash after dealing with an Apache request
            # To be removed in next alpha
            # See https://github.com/php/php-src/issues/11529
            (fetchpatch {
              url = "https://github.com/php/php-src/commit/8d4370954ec610164a4503431bb0c52da6954aa7.patch";
              hash = "sha256-w1uF9lRdfhz9I0gux0J4cvMzNS93uSHL1fYG23VLDPc=";
            })
          ];
        }
        { name = "shmop"; }
        {