diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2023-01-08 19:43:53 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-01-09 07:23:54 +0000 |
| commit | 23bf3096b78541e2a914ae59ac153df73180a6f0 (patch) | |
| tree | 03a746234723b938c2c672e6a2362f98b48cf442 | |
| parent | c907f5c169ed6e23497c6c843907d29b8b763bce (diff) | |
php81Extensions.opcache, php81Extensions.opcache: fix test
(cherry picked from commit 91f785d8683da0f290d7862172a9d9b5a807a871)
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 53f29b00ac5c..c40f7bfaa003 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -133,8 +133,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 ''; @@ -408,6 +407,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; } |