From bc25df287a4ca20d78ae49e8236e9f0d7d3d168a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Feb 2018 17:11:50 +0100 Subject: [PATCH] pythonPackages.magic-wormhole: fix build Add magic-wormhole-transit-relay dependency and clean up expression. Order of the buildInputs was changed to match the one in setup.py. --- .../python-modules/magic-wormhole/default.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 9d2d80747a9..cef68a332cd 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,37 +2,38 @@ , buildPythonPackage , fetchPypi , pythonAtLeast +, python +, spake2 +, pynacl +, six +, attrs +, twisted +, autobahn +, automat +, hkdf +, tqdm +, click +, humanize +, ipaddress +, txtorcon , nettools , glibcLocales -, autobahn -, cffi -, click -, hkdf -, pynacl -, spake2 -, tqdm -, python , mock -, ipaddress -, humanize -, pyopenssl -, service-identity -, txtorcon +, magic-wormhole-transit-relay }: buildPythonPackage rec { pname = "magic-wormhole"; version = "0.10.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; }; - checkInputs = [ mock ]; + checkInputs = [ mock magic-wormhole-transit-relay ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; + propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py