diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2018-11-18 11:29:22 -0500 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2018-11-20 15:38:21 -0500 |
commit | a92b26c11f90fcdb5a0a4f31926acfec7216e423 (patch) | |
tree | 6b3e8d9c800a48a0aad6d8e7b2ea5bffa0c4e7cf | |
parent | edc1fa747e2318ad8a02818410ea00dd258af974 (diff) | |
download | nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.tar nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.tar.gz nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.tar.bz2 nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.tar.lz nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.tar.xz nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.tar.zst nixpkgs-a92b26c11f90fcdb5a0a4f31926acfec7216e423.zip |
pythonPackages.magic-wormhole: 0.10.5 -> 0.11.2
-rw-r--r-- | pkgs/development/python-modules/magic-wormhole/default.nix | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 7d170345dbb..7f8241196e0 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,8 +1,6 @@ -{ lib +{ stdenv , buildPythonPackage , fetchPypi -, pythonAtLeast -, python , spake2 , pynacl , six @@ -14,49 +12,42 @@ , tqdm , click , humanize -, ipaddress , txtorcon , nettools -, glibc , glibcLocales , mock , magic-wormhole-transit-relay +, magic-wormhole-mailbox-server }: buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.10.5"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; + sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"; }; - checkInputs = [ mock magic-wormhole-transit-relay ]; - buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ]; + buildInputs = [ glibcLocales ]; + propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; + checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ]; 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_cli.py - - # magic-wormhole will attempt to find all available locales by running - # 'locale -a'. If we're building on Linux, then this may result in us - # running the system's locale binary instead of the one from Nix, so let's - # ensure we patch this. - sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py - '' + lib.optionalString (pythonAtLeast "3.3") '' - sed -i -e 's|"ipaddress",||' setup.py ''; - checkPhase = '' - export PATH="$PATH:$out/bin" + preCheck = '' + export PATH=$out/bin:$PATH export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - ${python.interpreter} -m wormhole.test.run_trial wormhole + substituteInPlace src/wormhole/test/test_cli.py \ + --replace 'getProcessOutputAndValue("locale", ["-a"])' 'getProcessOutputAndValue("locale", ["-a"], env=os.environ)' \ + --replace '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))' \ + --replace 'locale_env = dict(LC_ALL=locale, LANG=locale)' 'locale_env = dict(LC_ALL=locale, LANG=locale, LOCALE_ARCHIVE=os.getenv("LOCALE_ARCHIVE"))' ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Securely transfer data between computers"; homepage = https://github.com/warner/magic-wormhole; license = licenses.mit; |