From 19e31cd67750b1b34486009d14ccd143414da942 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 3 Jan 2023 21:51:47 +0100 Subject: [PATCH 1/4] php80: 8.0.26 -> 8.0.27 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 3f05a546e23b..37277baae814 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.26"; - hash = "sha256-bfh6+W8nWnWIns5uP+ShOr2Tp2epmShjvcDpDx6Ifuc="; + version = "8.0.27"; + hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g="; }); in From 793d5252beb54471d34ea3656f113bda44f5b2a2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 3 Jan 2023 21:52:07 +0100 Subject: [PATCH 2/4] php82: 8.2.0 -> 8.2.1 --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 1ac48d7f0575..41627582dc83 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.0"; - hash = "sha256-G/T8pmP5PZ4LSQm9bq4Fg6HOOD5/Bd8Sbyjycvof1Ro="; + version = "8.2.1"; + hash = "sha256-ddb482WZPsDR2cYoHUVX5v7sWiYZSkaLiwFFnRd++yk="; }); in From 041d551384b3d151bb8c484e172257270f389f7c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Jan 2023 16:09:14 +0100 Subject: [PATCH 3/4] php81: 8.1.13 -> 8.1.14 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index dc1b8c8581ef..6cfda280d3ef 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.13"; - hash = "sha256-k/z9+qo9CUoP2xjOCNIPINUm7j8HoUaoqOyCzgCyN8o="; + version = "8.1.14"; + hash = "sha256-FMqZMz3WBKUEojaJRkhaw103nE2pbSjcUV1+tQLf+jI="; }); in From 91f785d8683da0f290d7862172a9d9b5a807a871 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 8 Jan 2023 19:43:53 +0100 Subject: [PATCH 4/4] 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; }