Merge pull request #108666 from helsinki-systems/upd/php

php: 7.3.25 -> 7.3.26, 7.4.13 -> 7.4.14, 8.0.0 -> 8.0.1
This commit is contained in:
Elis Hirwing
2021-01-09 14:35:55 +01:00
committed by GitHub
5 changed files with 7 additions and 91 deletions
+1 -4
View File
@@ -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