php.extensions.couchbase: 2.6.2 -> 3.1.2

2 files changed, 18 insertions, 27 deletions

diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix
index 0b34ffe780a..7e72af65a30 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 00000000000..cd08da781a2
--- /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)