python3Packages.twisted: use extras-require
This commit is contained in:
parent
c07476f4c5
commit
a2675e7e29
|
@ -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 ];
|
||||
|
||||
|
|
|
@ -122,7 +122,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
|
|||
threadpoolctl
|
||||
tika
|
||||
tqdm
|
||||
twisted.extras.tls
|
||||
twisted.extras-require.tls
|
||||
txaio
|
||||
tzlocal
|
||||
urllib3
|
||||
|
|
|
@ -53,7 +53,7 @@ let
|
|||
unidiff
|
||||
]
|
||||
# tls
|
||||
++ twisted.extras.tls;
|
||||
++ twisted.extras-require.tls;
|
||||
|
||||
checkInputs = [
|
||||
treq
|
||||
|
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
requests
|
||||
incremental
|
||||
twisted
|
||||
] ++ twisted.extras.tls;
|
||||
] ++ twisted.extras-require.tls;
|
||||
|
||||
checkInputs = [
|
||||
httpbin
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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 ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue