From ed480a35affaa1fd05905ae61ef952aa653331be Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Sun, 8 Aug 2021 10:58:47 +0200
Subject: [PATCH] joinmarket: 0.8.2 -> 0.8.3

Includes
- coincurve: 13.0.0 -> 15.0.0
- Update Darkscience Tor onion address
---
 modules/joinmarket-ob-watcher.nix          |  2 +-
 modules/joinmarket.nix                     |  2 +-
 pkgs/joinmarket/default.nix                |  4 ++--
 pkgs/python-packages/coincurve/default.nix | 14 ++++++--------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/joinmarket-ob-watcher.nix b/modules/joinmarket-ob-watcher.nix
index 62f670b..c668dde 100644
--- a/modules/joinmarket-ob-watcher.nix
+++ b/modules/joinmarket-ob-watcher.nix
@@ -11,7 +11,7 @@ let
     blockchain_source = no-blockchain
 
     [MESSAGING:server1]
-    host = darksci3bfoka7tw.onion
+    host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
     channel = joinmarket-pit
     port = 6697
     usessl = true
diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 8f46652..ca8fd29 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -30,7 +30,7 @@ let
     ${optionalString (cfg.rpcWalletFile != null) "rpc_wallet_file=${cfg.rpcWalletFile}"}
 
     [MESSAGING:server1]
-    host = darksci3bfoka7tw.onion
+    host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
     channel = joinmarket-pit
     port = 6697
     usessl = true
diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix
index 6a180ee..a94c691 100644
--- a/pkgs/joinmarket/default.nix
+++ b/pkgs/joinmarket/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }:
 
 let
-  version = "0.8.2";
+  version = "0.8.3";
   src = fetchurl {
     url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
-    sha256 = "0bi1d49kn57b0775cd8gzsc13dbiivvnhrc61d1xb4z1cr3ih8q2";
+    sha256 = "0kcgp8lsgnbaxfv13lrg6x7vcbdi5yj526lq9vmvbbidyw4km3r2";
   };
 
   runtimePackages = with nbPython3Packages; [
diff --git a/pkgs/python-packages/coincurve/default.nix b/pkgs/python-packages/coincurve/default.nix
index 67e9a57..042ac67 100644
--- a/pkgs/python-packages/coincurve/default.nix
+++ b/pkgs/python-packages/coincurve/default.nix
@@ -1,20 +1,18 @@
-{ lib, buildPythonPackage, fetchPypi, asn1crypto, cffi, pkg-config, libtool, libffi, requests, gmp }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, asn1crypto, cffi, pkg-config,
+autoconf, automake, libtool, libffi, requests }:
 
 buildPythonPackage rec {
   pname = "coincurve";
-  version = "13.0.0";
+  version = "15.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x8dpbq6bwswfyi1g4r421hnswp904l435rf7n6fj7y8q1yn51cr";
+    sha256 = "0ras7qb4ib9sik703fcb9f3jrgq7nx5wvdgx9k1pshmrxl8lnlh6";
   };
 
-  nativeBuildInputs = [ pkg-config libtool libffi gmp ];
-
-  propagatedBuildInputs = [ asn1crypto cffi requests ];
-
-  # enable when https://github.com/ofek/coincurve/issues/47 is resolved
   doCheck = false;
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
+  propagatedBuildInputs = [ asn1crypto cffi libffi requests ];
 
   meta = with lib; {
     description = "Cross-platform Python CFFI bindings for libsecp256k1";