Merge fort-nix/nix-bitcoin#544: joinmarket: 0.9.6 -> 0.9.7

b9d2a882a7 joinmarket: 0.9.6 -> 0.9.7 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK b9d2a882a7

Tree-SHA512: 48f65f829f35b2b20d6fb95bd829db66bf7f11fcf97aad0c9e1673544f6420168f10a40fe3748d50c1f582c1be2b4ea7917dbbabb3661fa85cfff828fb56c8f7
This commit is contained in:
Jonas Nick 2022-09-02 13:48:19 +00:00
commit 6fed9b25cd
No known key found for this signature in database
GPG Key ID: 4861DBF262123605

View File

@ -1,20 +1,10 @@
{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPythonPackageOverrides, pkgs }:
{ stdenv, lib, fetchurl, python3, nbPythonPackageOverrides, pkgs }:
let
version = "0.9.6";
src = applyPatches {
src = fetchurl {
url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
sha256 = "040qj3abqkk74zyi5yav1ijlh5cmd49wlymald2lzk35adnx804g";
};
patches = [
(fetchpatch {
# https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1264
name = "use-twisted-22.4.0";
url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1264.patch";
sha256 = "1nlyhc5myph9239d5zczsl4jan4qj4ggy0l1f39jv0ihjbjhcks5";
})
];
version = "0.9.7";
src = fetchurl {
url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
sha256 = "13bfr8ha6bka8wiai8m79ki43dn2r311lrfffr39ni2wy1v12l93";
};
pyPkgs = (python3.override {