From a4e774d3b066572b5e76055d04dd1e9ca5cee651 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 12:41:44 +0200
Subject: [PATCH 01/13] php.extensions.xdebug: 3.0.3 -> 3.0.4

---
 pkgs/development/php-packages/xdebug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index eaadb4b1f544..43387380ddac 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "xdebug";
 
-  version = "3.0.3";
-  sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI=";
+  version = "3.0.4";
+  sha256 = "1bvjmnx9bcfq4ikp02kiqg0f7ccgx4mkmz5d7g6v0d263x4r0wmj";
 
   doCheck = true;
   checkTarget = "test";

From 867a4d38d709853595f8472179df5c781b5d3135 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 12:46:26 +0200
Subject: [PATCH 02/13] php.extensions.redis: 5.3.3 -> 5.3.4

---
 pkgs/development/php-packages/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix
index 35e9a909b377..56e8a0a1fae5 100644
--- a/pkgs/development/php-packages/redis/default.nix
+++ b/pkgs/development/php-packages/redis/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "redis";
 
-  version = "5.3.3";
-  sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA=";
+  version = "5.3.4";
+  sha256 = "1k5l7xxb06rlwq9jbmbbr03pc74d75vgv7h5bqjkbwan6dphafab";
 
   internalDeps = with php.extensions; [
     session

From c79d977ca15016d3aafab6633b178ad042e696c2 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 12:50:40 +0200
Subject: [PATCH 03/13] php.extensions.protobuf: 3.14.0 -> 3.17.2

---
 .../php-packages/protobuf/default.nix         | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix
index 2112e84cffff..11db92e92e02 100644
--- a/pkgs/development/php-packages/protobuf/default.nix
+++ b/pkgs/development/php-packages/protobuf/default.nix
@@ -1,30 +1,13 @@
-{ buildPecl, lib, pcre2, fetchpatch }:
+{ buildPecl, lib, pcre2 }:
 
 buildPecl {
   pname = "protobuf";
 
-  version = "3.14.0";
-  sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";
+  version = "3.17.2";
+  sha256 = "0i4npj4sl8ihkzxc6m3vv3nlqk952z9bfwnrk90a9yakw5gfhlz5";
 
   buildInputs = [ pcre2 ];
 
-  patches = [
-    # TODO: remove with next update
-    (fetchpatch {
-      url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch";
-      sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s=";
-      stripLen = 4;
-      includes = [
-        "array.c"
-        "def.c"
-        "map.c"
-        "message.c"
-        "protobuf.h"
-        "wkt.inc"
-      ];
-    })
-  ];
-
   meta = with lib; {
     description = ''
       Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.

From 8a5d4b63280a8e08589c676a108fe1fd64885c0a Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 12:55:53 +0200
Subject: [PATCH 04/13] php.extensions.pcov: 1.0.8 -> 1.0.9

---
 pkgs/development/php-packages/pcov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix
index 8511ccbebc54..f0e3e75c71c3 100644
--- a/pkgs/development/php-packages/pcov/default.nix
+++ b/pkgs/development/php-packages/pcov/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "pcov";
 
-  version = "1.0.8";
-  sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ=";
+  version = "1.0.9";
+  sha256 = "0q2ig5lxzpwz3qgr05wcyh5jzhfxlygkv6nj6jagkhiialng2710";
 
   buildInputs = [ pcre2 ];
 

From 06ea32f7bf0153575fb03519c38a0bd9151c7e38 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 12:59:03 +0200
Subject: [PATCH 05/13] php.extensions.mongodb: 1.9.0 -> 1.9.1

---
 pkgs/development/php-packages/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index f8cd990d2670..bec701a7fc59 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -4,8 +4,8 @@
 buildPecl {
   pname = "mongodb";
 
-  version = "1.9.0";
-  sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
+  version = "1.9.1";
+  sha256 = "1mzyssy2a89grw7rwmh0x22lql377nmnqlcv9piam1c32qiwxlg9";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 8307e75f8056e72b89ee444bf20399982cbf3c76 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 13:05:28 +0200
Subject: [PATCH 06/13] php.extensions.igbinary: 3.2.1 -> 3.2.2

---
 pkgs/development/php-packages/igbinary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix
index 9e710f3c3d1e..caedac9acdfd 100644
--- a/pkgs/development/php-packages/igbinary/default.nix
+++ b/pkgs/development/php-packages/igbinary/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "igbinary";
 
-  version = "3.2.1";
-  sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s=";
+  version = "3.2.2";
+  sha256 = "0321pb0298fa67qwj5nhhabkjiaxna5mag15ljyrqzpivimvny92";
 
   configureFlags = [ "--enable-igbinary" ];
   makeFlags = [ "phpincludedir=$(dev)/include" ];

From 5e1ad948cf3469926b1a7292617309ed610a4c5b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 13:28:11 +0200
Subject: [PATCH 07/13] libcouchbase: 2.10.4 -> 3.1.3

---
 ...x-timeouts-in-libcouchbase-testsuite.patch | 36 -------------------
 .../libraries/libcouchbase/default.nix        |  6 ++--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch

diff --git a/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch b/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
deleted file mode 100644
index 1c57757f855c..000000000000
--- a/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 58237e64fa77ec5cdec658b3295f71ec899175fa Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Sat, 5 Oct 2019 13:47:59 +0200
-Subject: [PATCH] Fix timeouts in libcouchbase testsuite
-
-Nix-specific patch. Basically
-https://github.com/couchbase/libcouchbase/commit/b272f6ab88be523bbcf9d5c4252d07fccb023fe5, but
-rebased onto 2.10.4.
----
- src/ssl/ssl_e.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c
-index f4506cf..734a3e6 100644
---- a/src/ssl/ssl_e.c
-+++ b/src/ssl/ssl_e.c
-@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es)
-      * calls. While we could have done this inline with the send() call this
-      * would make future optimization more difficult. */
-     GT_WRITE_DONE:
-+#if !LCB_CAN_OPTIMIZE_SSL_BIO
-+    BIO_get_mem_ptr(es->wbio, &wmb);
-+#endif
-     while (wmb->length > (size_t)tmp_len) {
-         char dummy[4096];
-         unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy);
-         BIO_read(es->wbio, dummy, to_read);
-+#if !LCB_CAN_OPTIMIZE_SSL_BIO
-+        BIO_get_mem_ptr(es->wbio, &wmb);
-+#endif
-     }
-     BIO_clear_retry_flags(es->wbio);
-     return 0;
--- 
-2.23.0
-
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 9f75eafdf247..9cb83c5bf654 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcouchbase";
-  version = "2.10.4";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";
+    sha256 = "16mafxkdbns33yjyc2p3j2iajjpyq0zp66wpjir2qj1w3kgggcw8";
   };
 
   cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
   # Running tests in parallel does not work
   enableParallelChecking = false;
 
-  patches = [ ./0001-Fix-timeouts-in-libcouchbase-testsuite.patch ];
-
   doCheck = !stdenv.isDarwin;
 
   meta = with lib; {

From 565885bb4b82b7d953e3b2ab423df16882f1d7b1 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 8 Jun 2021 13:28:34 +0200
Subject: [PATCH 08/13] php.extensions.couchbase: 2.6.2 -> 3.1.2

---
 .../php-packages/couchbase/default.nix        | 34 ++++---------------
 .../php-packages/couchbase/libcouchbase.patch | 11 ++++++
 2 files changed, 18 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/php-packages/couchbase/libcouchbase.patch

diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix
index 0b34ffe780a8..7e72af65a305 100644
--- a/pkgs/development/php-packages/couchbase/default.nix
+++ b/pkgs/development/php-packages/couchbase/default.nix
@@ -1,7 +1,7 @@
-{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }:
+{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
 let
   pname = "couchbase";
-  version = "2.6.2";
+  version = "3.1.2";
 in
 buildPecl {
   inherit pname version;
@@ -10,38 +10,19 @@ buildPecl {
     owner = "couchbase";
     repo = "php-couchbase";
     rev = "v${version}";
-    sha256 = "0ymrymnz91qg9b2ns044qg46wc65dffhxx402wpx1b5cj2vr4ma3";
+    sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42";
   };
 
   configureFlags = [ "--with-couchbase" ];
 
   buildInputs = [ libcouchbase zlib ];
   internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
-  peclDeps = [ php.extensions.igbinary ];
 
   patches = [
-    (writeText "php-couchbase.patch" ''
-      --- a/config.m4
-      +++ b/config.m4
-      @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
-           LIBCOUCHBASE_DIR=$PHP_COUCHBASE
-         else
-           AC_MSG_CHECKING(for libcouchbase in default path)
-      -    for i in /usr/local /usr; do
-      +    for i in ${libcouchbase}; do
-             if test -r $i/include/libcouchbase/couchbase.h; then
-               LIBCOUCHBASE_DIR=$i
-               AC_MSG_RESULT(found in $i)
-      @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \
-           igbinary_inc_path="$phpincludedir"
-         elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then
-           igbinary_inc_path="$phpincludedir"
-      +  elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then
-      +    igbinary_inc_path="${php.extensions.igbinary.dev}/include"
-         fi
-         if test "$igbinary_inc_path" = ""; then
-           AC_MSG_WARN([Cannot find igbinary.h])
-    '')
+    (substituteAll {
+      src = ./libcouchbase.patch;
+      inherit libcouchbase;
+    })
   ];
 
   meta = with lib; {
@@ -49,6 +30,5 @@ buildPecl {
     license = licenses.asl20;
     homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
     maintainers = teams.php.members;
-    broken = versionAtLeast php.version "8.0";
   };
 }
diff --git a/pkgs/development/php-packages/couchbase/libcouchbase.patch b/pkgs/development/php-packages/couchbase/libcouchbase.patch
new file mode 100644
index 000000000000..cd08da781a26
--- /dev/null
+++ b/pkgs/development/php-packages/couchbase/libcouchbase.patch
@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -28,7 +28,7 @@ if test "$PHP_COUCHBASE" != "no"; then
+
+   dnl fallback on standard directory
+   else
+-    for i in /usr/local /usr; do
++    for i in @libcouchbase@; do
+       if test -r $i/include/libcouchbase/couchbase.h; then
+         LIBCOUCHBASE_DIR=$i
+         AC_MSG_RESULT(found in $i)

From c082df8e6284b668b2e19bb40e69d782f14afc7a Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jun 2021 08:18:44 +0200
Subject: [PATCH 09/13] php.extensions.ast: 1.0.10 -> 1.0.12

---
 pkgs/development/php-packages/ast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix
index 03cd439867a6..65e734e9254d 100644
--- a/pkgs/development/php-packages/ast/default.nix
+++ b/pkgs/development/php-packages/ast/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "ast";
 
-  version = "1.0.10";
-  sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30";
+  version = "1.0.12";
+  sha256 = "1mcfx989yrakixlsx2d8v6kyxawfwhig4mra9ccpjasfhad0d31x";
 
   meta = with lib; {
     description = "Exposes the abstract syntax tree generated by PHP";

From b169c6d5e8338b7d9ed4f2dc7bc83c7d5c184b7b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jun 2021 08:20:36 +0200
Subject: [PATCH 10/13] php.extensions.event: 3.0.2 -> 3.0.4

---
 pkgs/development/php-packages/event/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix
index 420f2385e544..727543e6ee63 100644
--- a/pkgs/development/php-packages/event/default.nix
+++ b/pkgs/development/php-packages/event/default.nix
@@ -2,8 +2,8 @@
 buildPecl {
   pname = "event";
 
-  version = "3.0.2";
-  sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
+  version = "3.0.4";
+  sha256 = "13yb3zvlx43cncawymiwbqyz8gzpq1g03vd0xjlw9vz75b4mwn1x";
 
   configureFlags = [
     "--with-event-libevent-dir=${libevent.dev}"

From 9e12aefc411d846b1fe2d909dff08d28bf24b5ee Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jun 2021 08:22:02 +0200
Subject: [PATCH 11/13] php.extensions.maxminddb: 1.10.0 -> 1.10.1

---
 pkgs/development/php-packages/maxminddb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index ae7ef3d0602f..eae232b6c017 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -1,7 +1,7 @@
 { buildPecl, lib, fetchFromGitHub, libmaxminddb }:
 let
   pname = "maxminddb";
-  version = "1.10.0";
+  version = "1.10.1";
 in
 buildPecl {
   inherit pname version;
@@ -10,7 +10,7 @@ buildPecl {
     owner = "maxmind";
     repo = "MaxMind-DB-Reader-php";
     rev = "v${version}";
-    sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
+    sha256 = "1m5y733x4ykldi1pym54mdahfwfnwy2r1n6fnndwi8jz9px9pa5k";
   };
 
   buildInputs = [ libmaxminddb ];

From 92ea0e7f42a61e5d640feb80de190252f16b5ee5 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jun 2021 08:45:07 +0200
Subject: [PATCH 12/13] php.extensions.pinba: 1.1.2-dev -> 1.1.2

---
 pkgs/development/php-packages/pinba/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix
index 0373e74d9fca..1649da7c6545 100644
--- a/pkgs/development/php-packages/pinba/default.nix
+++ b/pkgs/development/php-packages/pinba/default.nix
@@ -1,14 +1,14 @@
-{ buildPecl, lib, fetchFromGitHub, php }:
+{ buildPecl, lib, fetchFromGitHub }:
 
 buildPecl {
   pname = "pinba";
-  version = "1.1.2-dev";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "tony2001";
     repo = "pinba_extension";
-    rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e";
-    sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80";
+    rev = "RELEASE_1_1_2";
+    sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy";
   };
 
   meta = with lib; {

From 2fc95948446d0b3ef0284956fc62b9e968dc9376 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 10 Jun 2021 08:47:51 +0200
Subject: [PATCH 13/13] php.extensions.swoole: 4.6.4 -> 4.6.7

---
 pkgs/development/php-packages/swoole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index ef228c2ddc3e..c9ec1b3938f0 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "swoole";
 
-  version = "4.6.4";
-  sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31";
+  version = "4.6.7";
+  sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165";
 
   buildInputs = [ valgrind pcre2 ];
   internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];