diff options
| author | Elis Hirwing <elis@hirwing.se> | 2021-06-13 11:29:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 11:29:40 +0200 |
| commit | 0b24426212b0820cba6ad74d15f914fc16d3b7c2 (patch) | |
| tree | 5d35713b8ba1574b0e7489e4579b4ddc4fe0079b /pkgs/development/libraries | |
| parent | bfde742b86160ac27362eeb39cbbdba1b2e1c832 (diff) | |
| parent | 2fc95948446d0b3ef0284956fc62b9e968dc9376 (diff) | |
| download | nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.tar nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.tar.gz nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.tar.bz2 nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.tar.lz nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.tar.xz nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.tar.zst nixpkgs-0b24426212b0820cba6ad74d15f914fc16d3b7c2.zip | |
Merge pull request #126351 from etu/php-extensions-updates
php.extensions: Updates to multiple extensions
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch | 36 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcouchbase/default.nix | 6 |
2 files changed, 2 insertions, 40 deletions
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 1c57757f855..00000000000 --- 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 9f75eafdf24..9cb83c5bf65 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; { |