diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index eac293ac1e16..66329d3b0985 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,42 +4,33 @@ automat, buildPythonPackage, cryptography, - fetchpatch2, fetchPypi, geoip, - incremental, lsof, mock, pytestCheckHook, pythonOlder, + setuptools, twisted, zope-interface, }: buildPythonPackage rec { pname = "txtorcon"; - version = "23.11.0"; - format = "setuptools"; + version = "24.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cfha6T121yZRAFnJ7XTmCLxaXJ99EDhTtJ5BQoBAai8="; + hash = "sha256-vv4ZE42cjFMHtu5tT+RG0MIB/9HMQErrJl7ZAwmXitA="; }; - patches = [ - # https://github.com/meejah/txtorcon/pull/400 - (fetchpatch2 { - name = "twisted-24.7.0-fixes.patch"; - url = "https://github.com/meejah/txtorcon/commit/88b5dc2971514babd36d837c93550715dea44b09.patch"; - hash = "sha256-O7kFZw+y1PHJRcMdxCczy8UZd3ruLhjLMxh2tcawWI4="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography - incremental twisted automat zope-interface @@ -54,6 +45,8 @@ buildPythonPackage rec { doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); + pythonImportsCheck = [ "txtorcon" ]; + meta = with lib; { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; homepage = "https://github.com/meejah/txtorcon";