diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index ee326cc004ab..71be18913927 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -3,23 +3,24 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, + versioneer, # dependencies - spake2, - pynacl, - six, attrs, - twisted, autobahn, automat, - tqdm, click, + cryptography, humanize, iterable-io, + pynacl, + qrcode, + spake2, + tqdm, + twisted, txtorcon, zipstream-ng, @@ -36,25 +37,16 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; tag = version; - hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4="; + hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU="; }; - patches = [ - # TODO: drop patch for magic-wormhole > 0.17.0 - # fix test for twisted 24.10.0 (https://github.com/magic-wormhole/magic-wormhole/pull/554) - (fetchpatch { - name = "fix-twisted-24.10.0.patch"; - url = "https://github.com/magic-wormhole/magic-wormhole/commit/d7353cad6fe9d43620a0de33a634f395757d2e5c.patch"; - hash = "sha256-mvgVFW3Fa2I8/39ron0bYYsJNm2r97jnLFCfhtHSIP0="; - }) - ]; postPatch = # enable tests by fixing the location of the wormhole binary '' @@ -67,7 +59,10 @@ buildPythonPackage rec { sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; dependencies = [ @@ -75,10 +70,11 @@ buildPythonPackage rec { autobahn automat click + cryptography humanize iterable-io pynacl - six + qrcode spake2 tqdm twisted