aiolabs/nix-bitcoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

joinmarket: 0.8.1 -> 0.8.2

Browse source 
- add SNICKER to default config
- update package
- ob-watcher: copy vendorized js and css dependencies
- add missing dependency to jmbase
- use cryptography from pinned.nixpkgs-unstable
This commit is contained in:
nixbitcoin 2021-03-09 16:48:25 +00:00
parent 820de2e4c9
commit 5ead2a7075
No known key found for this signature in database
GPG key ID: B6044ECBA2DAE5D0
5 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/python-packages/default.nix
View file

@ -5,6 +5,8 @@ let
joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
in {
bencoderpyx = callPackage ./bencoderpyx {};
coincurve = callPackage ./coincurve {};
@ -13,6 +15,10 @@ in {
chromalog = callPackage ./chromalog {};
txzmq = callPackage ./txzmq {};
# cryptography 3.3.2, required by joinmarketdaemon
cryptography = callPackage "${unstable}/pkgs/development/python-modules/cryptography" {};
cryptography_vectors = callPackage "${unstable}/pkgs/development/python-modules/cryptography/vectors.nix" {};
joinmarketbase = joinmarketPkg ./jmbase;
joinmarketclient = joinmarketPkg ./jmclient;
joinmarketbitcoin = joinmarketPkg ./jmbitcoin;

4
pkgs/python-packages/jmbase/default.nix
View file

@ -1,4 +1,4 @@
{ version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog }:
{ version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog, txtorcon }:
buildPythonPackage rec {
pname = "joinmarketbase";
@ -6,7 +6,7 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/jmbase";
propagatedBuildInputs = [ future twisted service-identity chromalog ];
propagatedBuildInputs = [ future twisted service-identity chromalog txtorcon ];
meta = with lib; {
homepage = "https://github.com/Joinmarket-Org/joinmarket-clientserver";

4
pkgs/python-packages/jmdaemon/default.nix
View file

@ -1,4 +1,4 @@
{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, pyopenssl, libnacl, joinmarketbase }:
{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }:
buildPythonPackage rec {
pname = "joinmarketdaemon";
@ -6,7 +6,7 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/jmdaemon";
propagatedBuildInputs = [ future txtorcon pyopenssl libnacl joinmarketbase ];
propagatedBuildInputs = [ future txtorcon cryptography pyopenssl libnacl joinmarketbase ];
meta = with lib; {
description = "Client library for Bitcoin coinjoins";