Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e7caa11a4e32
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa746623d911
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 5, 2019

  1. libcouchbase: fix build 

    This applies an upstream fix from libcouchbase to fix a timeout issue
with openssl 1.1.

See also https://hydra.nixos.org/build/102495724

ZHF #68361
    @Ma27
    Ma27 committed Oct 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd41a33 View commit details

  2. Merge pull request #70455 from Ma27/fix-libcouchbase 

    libcouchbase: fix build
    @worldofpeace
    worldofpeace authored Oct 5, 2019
    Copy the full SHA
    fa74662 View commit details
36 changes: 36 additions & 0 deletions pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
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

2 changes: 2 additions & 0 deletions pkgs/development/libraries/libcouchbase/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ 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 stdenv.lib; {