diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix index 30e26bf87a1..13b64e8cb6e 100644 --- a/pkgs/development/interpreters/php/7.3.nix +++ b/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.25"; - sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9"; + version = "7.3.26"; + sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index b45da1fb86c..9ee0c9c9e7c 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.13"; - sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm"; + version = "7.4.14"; + sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index ded661e5585..5779c836dd4 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.0"; - sha256 = "02cx3gvxqvkllp54jfvs83kl8bmpcqyzp9jf1d0l9x5bgv1jv0sy"; + version = "8.0.1"; + sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/fix-opcache-configure.patch b/pkgs/development/interpreters/php/fix-opcache-configure.patch deleted file mode 100644 index e67d2cc7bc7..00000000000 --- a/pkgs/development/interpreters/php/fix-opcache-configure.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 -index 726188597496..781e51d3e44c 100644 ---- a/Zend/Zend.m4 -+++ b/Zend/Zend.m4 -@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS - dnl - AC_DEFUN([LIBZEND_OTHER_CHECKS],[ - --AC_ARG_ENABLE([zts], -- [AS_HELP_STRING([--enable-zts], -- [Enable thread safety])], -- [ZEND_ZTS=$enableval], -- [ZEND_ZTS=no]) -- - AC_MSG_CHECKING(whether to enable thread-safety) - AC_MSG_RESULT($ZEND_ZTS) - -diff --git a/configure.ac b/configure.ac -index 8d6e922fa9bf..e07a75d19ac7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then - ZEND_DEBUG=yes - fi - -+AC_ARG_ENABLE([zts], -+ [AS_HELP_STRING([--enable-zts], -+ [Enable thread safety])], -+ [ZEND_ZTS=$enableval], -+ [ZEND_ZTS=no]) -+ -+if test "$ZEND_ZTS" = "yes"; then -+ AC_DEFINE(ZTS, 1,[ ]) -+ PHP_THREAD_SAFETY=yes -+else -+ PHP_THREAD_SAFETY=no -+fi -+ - PHP_ARG_ENABLE([rtld-now], - [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], - [AS_HELP_STRING([--enable-rtld-now], -@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS - LIBZEND_DLSYM_CHECK - LIBZEND_OTHER_CHECKS - --if test "$ZEND_ZTS" = "yes"; then -- AC_DEFINE(ZTS,1,[ ]) -- PHP_THREAD_SAFETY=yes --else -- PHP_THREAD_SAFETY=no --fi -- - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" - INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 054cd28c0247..93d72fb73d19 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then - esac - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - DASM_FLAGS="$DASM_FLAGS -D ZTS=1" - fi - -diff --git a/ext/session/config.m4 b/ext/session/config.m4 -index 7abc8813b72a..da31bbde86cc 100644 ---- a/ext/session/config.m4 -+++ b/ext/session/config.m4 -@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then - AC_MSG_ERROR(cannot find mm library) - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. - AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) - fi \ No newline at end of file diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 425aff4854c..02522a76307 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -390,10 +390,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; - # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is - # included from ZendAccelerator.h, but ZendAccelerator.h is - # included after the ifdef... - patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [ + patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c