diff options
| author | Elis Hirwing <elis@hirwing.se> | 2023-01-09 09:14:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 09:14:28 +0100 |
| commit | b4cf26ea172c8a02f6757b347e40641dd9854c98 (patch) | |
| tree | f68496374efd056905e57b634453646916ccd062 | |
| parent | Merge pull request #209838 from NixOS/backport-209745-to-release-22.11 (diff) | |
| parent | php81Extensions.opcache, php81Extensions.opcache: fix test (diff) | |
| download | nixpkgs-b4cf26ea172c8a02f6757b347e40641dd9854c98.tar.gz | |
Merge pull request #209840 from NixOS/backport-208928-to-release-22.11
[Backport release-22.11] php interpreter: bumps
| -rw-r--r-- | pkgs/development/interpreters/php/8.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/8.1.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/8.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 11 |
4 files changed, 15 insertions, 8 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 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 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 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; } |