From 91f785d8683da0f290d7862172a9d9b5a807a871 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 8 Jan 2023 19:43:53 +0100 Subject: [PATCH] php81Extensions.opcache, php81Extensions.opcache: fix test --- pkgs/top-level/php-packages.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8b4463bde3bc..70af04bd96af 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; }