diff options
author | Elis Hirwing <elis@hirwing.se> | 2021-01-09 14:35:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-09 14:35:55 +0100 |
commit | b305e4dd7e6a68d06796594ce9a746c64d74c388 (patch) | |
tree | 7e49a9f1e736d8f68dd129203d9f94205a2c5d72 /pkgs/top-level/php-packages.nix | |
parent | 9bbc36339ba2cd6a5da196f51fd7451621610b8c (diff) | |
parent | 0f04df98a2d92497274d33be85c60b247eba41bc (diff) |
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
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
-rw-r--r-- | pkgs/top-level/php-packages.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 425aff4854c31..02522a7630721 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 |