From ca834cce8416c3a031c27f2bb5064d45cc4ee774 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 5 May 2022 20:43:08 +0200 Subject: [PATCH] joinmarket: simplify pkgs Remove unused dependencies. --- pkgs/python-packages/jmbitcoin/default.nix | 4 ++-- pkgs/python-packages/jmclient/default.nix | 7 +++---- pkgs/python-packages/jmdaemon/default.nix | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/python-packages/jmbitcoin/default.nix b/pkgs/python-packages/jmbitcoin/default.nix index c092436..fcc1751 100644 --- a/pkgs/python-packages/jmbitcoin/default.nix +++ b/pkgs/python-packages/jmbitcoin/default.nix @@ -1,4 +1,4 @@ -{ version, src, lib, buildPythonPackage, fetchurl, future, coincurve, urldecode, pyaes, python-bitcointx, joinmarketbase }: +{ version, src, lib, buildPythonPackage, fetchurl, urldecode, pyaes, python-bitcointx, joinmarketbase }: buildPythonPackage rec { pname = "joinmarketbitcoin"; @@ -6,7 +6,7 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/jmbitcoin"; - propagatedBuildInputs = [ future coincurve urldecode pyaes python-bitcointx ]; + propagatedBuildInputs = [ urldecode pyaes python-bitcointx ]; checkInputs = [ joinmarketbase ]; diff --git a/pkgs/python-packages/jmclient/default.nix b/pkgs/python-packages/jmclient/default.nix index 6b9d8ef..dde369b 100644 --- a/pkgs/python-packages/jmclient/default.nix +++ b/pkgs/python-packages/jmclient/default.nix @@ -1,4 +1,4 @@ -{ version, src, lib, buildPythonPackage, fetchurl, future, configparser, joinmarketbase, joinmarketdaemon, mnemonic, argon2_cffi, bencoderpyx, pyaes, joinmarketbitcoin, txtorcon, klein, pyjwt, autobahn, cryptography }: +{ version, src, lib, buildPythonPackage, fetchurl, future, configparser, joinmarketbase, joinmarketdaemon, mnemonic, argon2_cffi, bencoderpyx, pyaes, joinmarketbitcoin, klein, pyjwt, autobahn }: buildPythonPackage rec { pname = "joinmarketclient"; @@ -6,10 +6,9 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/jmclient"; - checkInputs = [ joinmarketbitcoin joinmarketdaemon txtorcon ]; + checkInputs = [ joinmarketbitcoin joinmarketdaemon ]; - # configparser may need to be compiled with python_version<"3.2" - propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes klein pyjwt autobahn cryptography ]; + propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes klein pyjwt autobahn ]; patchPhase = '' substituteInPlace setup.py \ diff --git a/pkgs/python-packages/jmdaemon/default.nix b/pkgs/python-packages/jmdaemon/default.nix index 5dd5a7c..c643f94 100644 --- a/pkgs/python-packages/jmdaemon/default.nix +++ b/pkgs/python-packages/jmdaemon/default.nix @@ -1,4 +1,4 @@ -{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }: +{ version, src, lib, buildPythonPackage, fetchurl, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }: buildPythonPackage rec { pname = "joinmarketdaemon"; @@ -6,7 +6,7 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/jmdaemon"; - propagatedBuildInputs = [ future txtorcon cryptography pyopenssl libnacl joinmarketbase ]; + propagatedBuildInputs = [ txtorcon cryptography pyopenssl libnacl joinmarketbase ]; meta = with lib; { description = "Client library for Bitcoin coinjoins";