summary refs log tree commit diff
path: root/pkgs/top-level/php-packages.nix
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-01-08 19:43:53 +0100
committerThomas Gerbet <thomas@gerbet.me>2023-01-08 19:43:53 +0100
commit91f785d8683da0f290d7862172a9d9b5a807a871 (patch)
tree87e6b02987c8506775ee25e4a1de17ca44c3de29 /pkgs/top-level/php-packages.nix
parent041d551384b3d151bb8c484e172257270f389f7c (diff)
downloadnixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.tar
nixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.tar.gz
nixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.tar.bz2
nixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.tar.lz
nixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.tar.xz
nixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.tar.zst
nixpkgs-91f785d8683da0f290d7862172a9d9b5a807a871.zip
php81Extensions.opcache, php81Extensions.opcache: fix test
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
-rw-r--r--pkgs/top-level/php-packages.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 8b4463bde3b..70af04bd96a 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -137,8 +137,7 @@ lib.makeScope pkgs.newScope (self: with self; {
       checkPhase = ''
         runHook preCheck
 
-        NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test
-
+        NO_INTERACTION=yes SKIP_PERF_SENSITIVE=yes make test
         runHook postCheck
       '';
 
@@ -414,6 +413,14 @@ lib.makeScope pkgs.newScope (self: with self; {
             valgrind.dev
           ];
           zendExtension = true;
+          patches = [ ] ++ lib.optionals (lib.versionAtLeast php.version "8.1") [
+            (fetchpatch {
+              # See https://github.com/php/php-src/pull/10266
+              name = "avoid-opcache-test-failures.patch";
+              url = "https://github.com/PHP/php-src/commit/9216d14b3abfc727b0668592b48699440137aa74.patch";
+              sha256 = "sha256-/U6LMn/QGM8BXlh+Etl1z97v3qZFiWL2G3ZopNYShGU=";
+            })
+          ];
           # Tests launch the builtin webserver.
           __darwinAllowLocalNetworking = true;
         }