pythonPackages.magic-wormhole: 0.10.5 -> 0.11.2

This commit is contained in:
Mario Rodas 2018-11-18 11:29:22 -05:00
parent edc1fa747e
commit a92b26c11f
1 changed files with 14 additions and 23 deletions

View File

@ -1,8 +1,6 @@
{ lib { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonAtLeast
, python
, spake2 , spake2
, pynacl , pynacl
, six , six
@ -14,49 +12,42 @@
, tqdm , tqdm
, click , click
, humanize , humanize
, ipaddress
, txtorcon , txtorcon
, nettools , nettools
, glibc
, glibcLocales , glibcLocales
, mock , mock
, magic-wormhole-transit-relay , magic-wormhole-transit-relay
, magic-wormhole-mailbox-server
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "magic-wormhole"; pname = "magic-wormhole";
version = "0.10.5"; version = "0.11.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf";
}; };
checkInputs = [ mock magic-wormhole-transit-relay ]; buildInputs = [ glibcLocales ];
buildInputs = [ nettools glibcLocales ]; propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ];
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ]; checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ];
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
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 = '' preCheck = ''
export PATH="$PATH:$out/bin" export PATH=$out/bin:$PATH
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
export LC_ALL="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"; description = "Securely transfer data between computers";
homepage = https://github.com/warner/magic-wormhole; homepage = https://github.com/warner/magic-wormhole;
license = licenses.mit; license = licenses.mit;