git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #126351 from etu/php-extensions-updates

php.extensions: Updates to multiple extensions

commit0b24426212b0820cba6ad74d15f914fc16d3b7c2 authorElis Hirwing <elis@hirwing.se> dateSun 13 Jun 2021, 11:29 (5 years ago) parentbfde7422fc9594
15 files changed+45−109
pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch−36 pkgs/development/libraries/libcouchbase/default.nix+2−4 pkgs/development/php-packages/ast/default.nix+2−2 pkgs/development/php-packages/couchbase/default.nix+7−27 pkgs/development/php-packages/couchbase/libcouchbase.patch+11 pkgs/development/php-packages/event/default.nix+2−2 pkgs/development/php-packages/igbinary/default.nix+2−2 pkgs/development/php-packages/maxminddb/default.nix+2−2 pkgs/development/php-packages/mongodb/default.nix+2−2 pkgs/development/php-packages/pcov/default.nix+2−2 pkgs/development/php-packages/pinba/default.nix+4−4 pkgs/development/php-packages/protobuf/default.nix+3−20 pkgs/development/php-packages/redis/default.nix+2−2 pkgs/development/php-packages/swoole/default.nix+2−2 pkgs/development/php-packages/xdebug/default.nix+2−2
pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patchdeleted−36
@@ -1,36 +0,0 @@
1−From 58237e64fa77ec5cdec658b3295f71ec899175fa Mon Sep 17 00:00:00 2001
2−From: Maximilian Bosch <maximilian@mbosch.me>
3−Date: Sat, 5 Oct 2019 13:47:59 +0200
4−Subject: [PATCH] Fix timeouts in libcouchbase testsuite
5−
6−Nix-specific patch. Basically
7−https://github.com/couchbase/libcouchbase/commit/b272f6ab88be523bbcf9d5c4252d07fccb023fe5, but
8−rebased onto 2.10.4.
9−---
10− src/ssl/ssl_e.c | 6 ++++++
11− 1 file changed, 6 insertions(+)
12−
13−diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c
14−index f4506cf..734a3e6 100644
15−--- a/src/ssl/ssl_e.c
16−+++ b/src/ssl/ssl_e.c
17−@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es)
18− * calls. While we could have done this inline with the send() call this
19− * would make future optimization more difficult. */
20− GT_WRITE_DONE:
21−+#if !LCB_CAN_OPTIMIZE_SSL_BIO
22−+ BIO_get_mem_ptr(es->wbio, &wmb);
23−+#endif
24− while (wmb->length > (size_t)tmp_len) {
25− char dummy[4096];
26− unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy);
27− BIO_read(es->wbio, dummy, to_read);
28−+#if !LCB_CAN_OPTIMIZE_SSL_BIO
29−+ BIO_get_mem_ptr(es->wbio, &wmb);
30−+#endif
31− }
32− BIO_clear_retry_flags(es->wbio);
33− return 0;
34−--
35−2.23.0
36−
pkgs/development/libraries/libcouchbase/default.nix+2−4
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "libcouchbase";
5− version = "2.10.4";
5+ version = "3.1.3";
66
77 src = fetchFromGitHub {
88 owner = "couchbase";
99 repo = "libcouchbase";
1010 rev = version;
11− sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";
11+ sha256 = "16mafxkdbns33yjyc2p3j2iajjpyq0zp66wpjir2qj1w3kgggcw8";
1212 };
1313
1414 cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
1919 # Running tests in parallel does not work
2020 enableParallelChecking = false;
2121
22− patches = [ ./0001-Fix-timeouts-in-libcouchbase-testsuite.patch ];
23−
2422 doCheck = !stdenv.isDarwin;
2523
2624 meta = with lib; {
pkgs/development/php-packages/ast/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "ast";
55
6− version = "1.0.10";
7− sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30";
6+ version = "1.0.12";
7+ sha256 = "1mcfx989yrakixlsx2d8v6kyxawfwhig4mra9ccpjasfhad0d31x";
88
99 meta = with lib; {
1010 description = "Exposes the abstract syntax tree generated by PHP";
pkgs/development/php-packages/couchbase/default.nix+7−27
@@ -1,7 +1,7 @@
1−{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }:
1+{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
22let
33 pname = "couchbase";
4− version = "2.6.2";
4+ version = "3.1.2";
55in
66buildPecl {
77 inherit pname version;
@@ -10,38 +10,19 @@ buildPecl {
1010 owner = "couchbase";
1111 repo = "php-couchbase";
1212 rev = "v${version}";
13− sha256 = "0ymrymnz91qg9b2ns044qg46wc65dffhxx402wpx1b5cj2vr4ma3";
13+ sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42";
1414 };
1515
1616 configureFlags = [ "--with-couchbase" ];
1717
1818 buildInputs = [ libcouchbase zlib ];
1919 internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
20− peclDeps = [ php.extensions.igbinary ];
2120
2221 patches = [
23− (writeText "php-couchbase.patch" ''
24− --- a/config.m4
25− +++ b/config.m4
26− @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
27− LIBCOUCHBASE_DIR=$PHP_COUCHBASE
28− else
29− AC_MSG_CHECKING(for libcouchbase in default path)
30− - for i in /usr/local /usr; do
31− + for i in ${libcouchbase}; do
32− if test -r $i/include/libcouchbase/couchbase.h; then
33− LIBCOUCHBASE_DIR=$i
34− AC_MSG_RESULT(found in $i)
35− @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \
36− igbinary_inc_path="$phpincludedir"
37− elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then
38− igbinary_inc_path="$phpincludedir"
39− + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then
40− + igbinary_inc_path="${php.extensions.igbinary.dev}/include"
41− fi
42− if test "$igbinary_inc_path" = ""; then
43− AC_MSG_WARN([Cannot find igbinary.h])
44− '')
22+ (substituteAll {
23+ src = ./libcouchbase.patch;
24+ inherit libcouchbase;
25+ })
4526 ];
4627
4728 meta = with lib; {
@@ -49,6 +30,5 @@ buildPecl {
4930 license = licenses.asl20;
5031 homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
5132 maintainers = teams.php.members;
52− broken = versionAtLeast php.version "8.0";
5333 };
5434}
pkgs/development/php-packages/couchbase/libcouchbase.patchnew file+11
@@ -0,0 +1,11 @@
1+--- a/config.m4
2++++ b/config.m4
3+@@ -28,7 +28,7 @@ if test "$PHP_COUCHBASE" != "no"; then
4+
5+ dnl fallback on standard directory
6+ else
7+- for i in /usr/local /usr; do
8++ for i in @libcouchbase@; do
9+ if test -r $i/include/libcouchbase/couchbase.h; then
10+ LIBCOUCHBASE_DIR=$i
11+ AC_MSG_RESULT(found in $i)
pkgs/development/php-packages/event/default.nix+2−2
@@ -2,8 +2,8 @@
22buildPecl {
33 pname = "event";
44
5− version = "3.0.2";
6− sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
5+ version = "3.0.4";
6+ sha256 = "13yb3zvlx43cncawymiwbqyz8gzpq1g03vd0xjlw9vz75b4mwn1x";
77
88 configureFlags = [
99 "--with-event-libevent-dir=${libevent.dev}"
pkgs/development/php-packages/igbinary/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "igbinary";
55
6− version = "3.2.1";
7− sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s=";
6+ version = "3.2.2";
7+ sha256 = "0321pb0298fa67qwj5nhhabkjiaxna5mag15ljyrqzpivimvny92";
88
99 configureFlags = [ "--enable-igbinary" ];
1010 makeFlags = [ "phpincludedir=$(dev)/include" ];
pkgs/development/php-packages/maxminddb/default.nix+2−2
@@ -1,7 +1,7 @@
11{ buildPecl, lib, fetchFromGitHub, libmaxminddb }:
22let
33 pname = "maxminddb";
4− version = "1.10.0";
4+ version = "1.10.1";
55in
66buildPecl {
77 inherit pname version;
@@ -10,7 +10,7 @@ buildPecl {
1010 owner = "maxmind";
1111 repo = "MaxMind-DB-Reader-php";
1212 rev = "v${version}";
13− sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
13+ sha256 = "1m5y733x4ykldi1pym54mdahfwfnwy2r1n6fnndwi8jz9px9pa5k";
1414 };
1515
1616 buildInputs = [ libmaxminddb ];
pkgs/development/php-packages/mongodb/default.nix+2−2
@@ -4,8 +4,8 @@
44buildPecl {
55 pname = "mongodb";
66
7− version = "1.9.0";
8− sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
7+ version = "1.9.1";
8+ sha256 = "1mzyssy2a89grw7rwmh0x22lql377nmnqlcv9piam1c32qiwxlg9";
99
1010 nativeBuildInputs = [ pkg-config ];
1111 buildInputs = [
pkgs/development/php-packages/pcov/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "pcov";
55
6− version = "1.0.8";
7− sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ=";
6+ version = "1.0.9";
7+ sha256 = "0q2ig5lxzpwz3qgr05wcyh5jzhfxlygkv6nj6jagkhiialng2710";
88
99 buildInputs = [ pcre2 ];
1010
pkgs/development/php-packages/pinba/default.nix+4−4
@@ -1,14 +1,14 @@
1−{ buildPecl, lib, fetchFromGitHub, php }:
1+{ buildPecl, lib, fetchFromGitHub }:
22
33buildPecl {
44 pname = "pinba";
5− version = "1.1.2-dev";
5+ version = "1.1.2";
66
77 src = fetchFromGitHub {
88 owner = "tony2001";
99 repo = "pinba_extension";
10− rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e";
11− sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80";
10+ rev = "RELEASE_1_1_2";
11+ sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy";
1212 };
1313
1414 meta = with lib; {
pkgs/development/php-packages/protobuf/default.nix+3−20
@@ -1,30 +1,13 @@
1−{ buildPecl, lib, pcre2, fetchpatch }:
1+{ buildPecl, lib, pcre2 }:
22
33buildPecl {
44 pname = "protobuf";
55
6− version = "3.14.0";
7− sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";
6+ version = "3.17.2";
7+ sha256 = "0i4npj4sl8ihkzxc6m3vv3nlqk952z9bfwnrk90a9yakw5gfhlz5";
88
99 buildInputs = [ pcre2 ];
1010
11− patches = [
12− # TODO: remove with next update
13− (fetchpatch {
14− url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch";
15− sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s=";
16− stripLen = 4;
17− includes = [
18− "array.c"
19− "def.c"
20− "map.c"
21− "message.c"
22− "protobuf.h"
23− "wkt.inc"
24− ];
25− })
26− ];
27−
2811 meta = with lib; {
2912 description = ''
3013 Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.
pkgs/development/php-packages/redis/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "redis";
55
6− version = "5.3.3";
7− sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA=";
6+ version = "5.3.4";
7+ sha256 = "1k5l7xxb06rlwq9jbmbbr03pc74d75vgv7h5bqjkbwan6dphafab";
88
99 internalDeps = with php.extensions; [
1010 session
pkgs/development/php-packages/swoole/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "swoole";
55
6− version = "4.6.4";
7− sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31";
6+ version = "4.6.7";
7+ sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165";
88
99 buildInputs = [ valgrind pcre2 ];
1010 internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
pkgs/development/php-packages/xdebug/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "xdebug";
55
6− version = "3.0.3";
7− sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI=";
6+ version = "3.0.4";
7+ sha256 = "1bvjmnx9bcfq4ikp02kiqg0f7ccgx4mkmz5d7g6v0d263x4r0wmj";
88
99 doCheck = true;
1010 checkTarget = "test";