diff options
7 files changed, 29 insertions, 7 deletions
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4927bc51b232c..96420ff04de1c 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ twisted certifi ] - ++ twisted.extras.tls + ++ twisted.extras-require.tls ++ lib.optional enableGUI pyside2; nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index dce6869f36e42..17a1a56b769ae 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -122,7 +122,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { threadpoolctl tika tqdm - twisted.extras.tls + twisted.extras-require.tls txaio tzlocal urllib3 diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 743c9f2c4b117..2eff37314e83d 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -53,7 +53,7 @@ let unidiff ] # tls - ++ twisted.extras.tls; + ++ twisted.extras-require.tls; checkInputs = [ treq diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index c894d3103b9a8..1902a578ec2bb 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests incremental twisted - ] ++ twisted.extras.tls; + ] ++ twisted.extras-require.tls; checkInputs = [ httpbin diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 02a993fdf1398..8bc03b1e5cf97 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, pythonOlder , fetchPypi , python , zope_interface @@ -14,11 +15,24 @@ , setuptools , idna , typing-extensions +, pyasn1 +, cryptography +, appdirs +, bcrypt +, pynacl +, pyserial +, h2 +, priority +, contextvars }: buildPythonPackage rec { pname = "Twisted"; version = "22.4.0"; + disabled = pythonOlder "3.6"; + + format = "setuptools"; + src = fetchPypi { inherit pname version; extension = "tar.gz"; @@ -27,7 +41,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; - passthru.extras.tls = [ pyopenssl service-identity idna ]; + passthru.extras-require = rec { + tls = [ pyopenssl service-identity idna ]; + conch = [ pyasn1 cryptography appdirs bcrypt ]; + conch_nacl = conch ++ [ pynacl ]; + serial = [ pyserial ]; + http2 = [ h2 priority ]; + contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ]; + }; # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 167e090fca064..7196e88e8dd93 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ incremental twisted automat zope_interface - ] ++ twisted.extras.tls + ] ++ twisted.extras-require.tls ++ lib.optionals (!isPy3k) [ ipaddress ]; checkInputs = [ pytestCheckHook mock lsof GeoIP ]; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b0f4cd1f788a4..938bfa1dcd610 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -60,7 +60,8 @@ python3Packages.buildPythonApplication rec { html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec zope_interface - ]; + ] ++ twisted.extras-require.tls + ++ twisted.extras-require.conch; checkInputs = with python3Packages; [ mock hypothesis twisted ]; |