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.
This commit is contained in:
Robert Schütz 2018-02-19 17:11:50 +01:00
parent ab544717bb
commit bc25df287a

View File

@ -2,37 +2,38 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonAtLeast , pythonAtLeast
, python
, spake2
, pynacl
, six
, attrs
, twisted
, autobahn
, automat
, hkdf
, tqdm
, click
, humanize
, ipaddress
, txtorcon
, nettools , nettools
, glibcLocales , glibcLocales
, autobahn
, cffi
, click
, hkdf
, pynacl
, spake2
, tqdm
, python
, mock , mock
, ipaddress , magic-wormhole-transit-relay
, humanize
, pyopenssl
, service-identity
, txtorcon
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "magic-wormhole"; pname = "magic-wormhole";
version = "0.10.5"; version = "0.10.5";
name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee";
}; };
checkInputs = [ mock ]; checkInputs = [ mock magic-wormhole-transit-relay ];
buildInputs = [ nettools glibcLocales ]; 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 = '' postPatch = ''
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py