From e028a52d6f26cc2b9aad598fd941717b1b2b125c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:07:55 +0100 Subject: [PATCH 1/4] php81: 8.1.26 -> 8.1.27 --- pkgs/development/interpreters/php/8.1.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 5f5be6b3d1d8..3082f8b85b62 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.26"; - hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA="; + version = "8.1.27"; + hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath From 9d236a8acee7227c25574b7bc8ee6c7f4cf50347 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:08:12 +0100 Subject: [PATCH 2/4] php82: 8.2.13 -> 8.2.14 --- pkgs/development/interpreters/php/8.2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 20aa6aaa0bc0..b934647d9b8c 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.13"; - hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o="; + version = "8.2.14"; + hash = "sha256-+HHhMTM9YK5sU3sa3dvCrqVMQ2xWKvmG+4MJwGAEC54="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath From ee3e7ac1800f08c8cdab393be0c7428b8555f298 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:08:26 +0100 Subject: [PATCH 3/4] php83: 8.3.0 -> 8.3.1 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 6327e23504a8..942507d7d355 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -1,9 +1,9 @@ -{ callPackage, fetchurl, ... }@_args: +{ callPackage, ... }@_args: let base = callPackage ./generic.nix (_args // { - version = "8.3.0"; - hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY="; + version = "8.3.1"; + hash = "sha256-xA+ukZf6aKUy9qBiwxba/jsExUUTa1S56tSTL8JsauE="; }); in base.withExtensions ({ all, ... }: with all; ([ From 2100a51ebdcf1373105e76f4e6b0e56f1083e53c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 25 Dec 2023 22:38:35 +0100 Subject: [PATCH 4/4] phpExtensions.apcu: remove obsolete patch --- pkgs/development/php-packages/apcu/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 737ef933a8f4..9aec7d660763 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,13 +13,6 @@ in buildPecl { sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ="; }; - patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ - (fetchpatch { - url = "https://github.com/krakjoe/apcu/commit/c9a29161c68c0faf71046e8f03f6a90900023ded.patch"; - hash = "sha256-B0ZKk9TJy2+sYGs7TEX2KxUiOVawIb+RXNgToU1Fz5I="; - }) - ]; - buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; @@ -30,8 +23,8 @@ in buildPecl { meta = with lib; { changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; description = "Userland cache for PHP"; - license = licenses.php301; homepage = "https://pecl.php.net/package/APCu"; + license = licenses.php301; maintainers = teams.php.members; }; }