diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-09-05 11:16:41 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-06 13:54:10 +0200 |
| commit | 67651d80bc8baaf09ab91fec8ea423e09107ed8f (patch) | |
| tree | 216a82ca309b80298039c2038160a22e94a1de6f /pkgs/development/python-modules/magic-wormhole | |
| parent | 036bafe0b94fb99ee9d1eb3d2fb902293a9f39a6 (diff) | |
| download | nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.gz nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.bz2 nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.lz nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.xz nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.zst nixlib-67651d80bc8baaf09ab91fec8ea423e09107ed8f.zip | |
Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
Diffstat (limited to 'pkgs/development/python-modules/magic-wormhole')
| -rw-r--r-- | pkgs/development/python-modules/magic-wormhole/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 7fedf4d48bbd..cc1e663209ec 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -17,6 +17,7 @@ , humanize , pyopenssl , service-identity +, txtorcon }: buildPythonPackage rec { @@ -31,14 +32,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ]; + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py - sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py - # XXX: disable one test due to warning: - # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py + sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; |