From 0daefea0a251f235c0b6d7d66352d1c2ea098d66 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Jul 2023 15:40:39 +0200 Subject: php81: 8.1.20 -> 8.1.21 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 86d76fcbd76..1be51b03f1f 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -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 -- cgit 1.4.1 From 68f2af63778c8a1320090ec34fda09a99d69f8ae Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Jul 2023 15:41:28 +0200 Subject: php82: 8.2.7 -> 8.2.8 --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 02adffa6f35..b27d3539e65 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -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 -- cgit 1.4.1 From 06b79b17e4777c43fa51a31cef6974b0cdf117a8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Jul 2023 15:51:20 +0200 Subject: php83: 8.3.0alpha2 -> 8.3.0alpha3 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- .../interpreters/php/fix-fileinfo-ext-php83.patch | 14 -------------- pkgs/top-level/php-packages.nix | 15 --------------- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index b49c89050f8..b4995031a32 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -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 diff --git a/pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch b/pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch deleted file mode 100644 index fbd6a66dbd1..00000000000 --- a/pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch +++ /dev/null @@ -1,14 +0,0 @@ -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" diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 78833e89b13..536ff6a010c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -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"; } { -- cgit 1.4.1