Merge fort-nix/nix-bitcoin#468: joinmarket: 0.9.4 -> 0.9.5

4f74690292 joinmarket: 0.9.4 -> 0.9.5 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 4f74690292

Tree-SHA512: 69bb194682d57ec0f1852c13d89d86c479459d32860106746b7bcbf26de7f4d94bf01a6d2852884e02cba5ebd53569f1beb96410c6de12355ec2739a05925998

pkgs/joinmarket/default.nix

@@ -1,10 +1,20 @@
-{ stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }:
+{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPython3Packages, pkgs }:
 
 let
-  version = "0.9.4";
-  src = fetchurl {
-    url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
-    sha256 = "1xkz274g9lv5yif77h0mci1fsgam56sdc8m281q3a8hij9nmzmq1";
+  version = "0.9.5";
+  src = applyPatches {
+    src = fetchurl {
+      url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
+      sha256 = "0q8hfq4y7az5ly97brq1khhhvhnq6irzw0ginmz20fwn7w3yc5sn";
+    };
+    patches = [
+      (fetchpatch {
+        # https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1206
+        name = "ob-export-fix";
+        url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1206.patch";
+        sha256 = "0532gixjyc8r11sfmlf32v5iwy0rhkpa8rbvm4b7h509hnyycvhx";
+      })
+    ];
   };
 
   runtimePackages = with nbPython3Packages; [

pkgs/python-packages/python-bitcointx/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-bitcointx";
-  version = "1.1.1.post0";
+  version = "1.1.3";
 
   src = fetchurl {
     url = "https://github.com/Simplexum/${pname}/archive/${pname}-v${version}.tar.gz";
-    sha256 = "d12593b09785a7a4ce08cb1928815c2366e9f6e4fab317267462857bf83904b0";
+    sha256 = "f0f487c29619df0e94a04f6deb3dc950ff9954c072017bd3eda90f73c24f0953";
   };
 
   patchPhase = ''

pkgs/python-packages/python-bitcointx/get-sha256.sh

@@ -9,7 +9,7 @@ cd $TMPDIR
 echo "Fetching latest release"
 git clone https://github.com/simplexum/python-bitcointx 2> /dev/null
 cd python-bitcointx
-latest=python-bitcointx-v1.1.1.post0
+latest=python-bitcointx-v1.1.3
 echo "Latest release is ${latest}"
 
 # GPG verification