From 462d460daecac7aa59be779a9e5491157edaee3f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 29 Mar 2022 19:31:01 +0100
Subject: [PATCH 1/2] libgcrypt: 1.9.4 -> 1.10.1

See https://mail.gnu.org/archive/html/info-gnu/2022-03/msg00007.html for
release information.

This release should fix build issues with MUSL libc which did prevent
1.10.0 from being merged.
---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index eb4e8e948629..56594620963c 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -15,11 +15,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   pname = "libgcrypt";
-  version = "1.9.4";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
-    sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a";
+    hash = "sha256-7xSuVGsAhM2EJZ9hpV4Ho4w7U6/A9Ua//O8vAbr/6d4=";
   };
 
   outputs = [ "out" "dev" "info" ];

From 494275558aca30b0afcc7967d700e658c6b2b10a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 29 Mar 2022 19:38:45 +0100
Subject: [PATCH 2/2] libotr: Fix build of tests/regression/client/client.c

Until this is fixed upstream, have a downstream fix so libotr can be
merged.
---
 pkgs/development/libraries/libotr/default.nix         |  2 ++
 .../libraries/libotr/fix-regtest-client.patch         | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/libotr/fix-regtest-client.patch

diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index bd8a521544c2..a9c1d2008af3 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
   };
 
+  patches = [ ./fix-regtest-client.patch ];
+
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/libotr/fix-regtest-client.patch b/pkgs/development/libraries/libotr/fix-regtest-client.patch
new file mode 100644
index 000000000000..bfd0007b9616
--- /dev/null
+++ b/pkgs/development/libraries/libotr/fix-regtest-client.patch
@@ -0,0 +1,11 @@
+diff -Nur a/tests/regression/client/client.c b/tests/regression/client/client.c
+--- a/tests/regression/client/client.c	2015-12-25 17:39:45.000000000 +0000
++++ b/tests/regression/client/client.c	2022-03-29 19:33:18.646398117 +0100
+@@ -27,6 +27,7 @@
+ #include <syscall.h>
+ #include <sys/epoll.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
+