mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
python312Packages.{ncclient, sshtunnel,docker}: fix missing dependency after paramiko changes (#344429)
This commit is contained in:
commit
efdcf895bb
@ -14,9 +14,8 @@
|
||||
requests,
|
||||
urllib3,
|
||||
|
||||
# optional-dependenices
|
||||
# optional-dependencies
|
||||
paramiko,
|
||||
pynacl, # optional in paramiko, required here
|
||||
websocket-client,
|
||||
|
||||
# tests
|
||||
@ -49,7 +48,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
ssh = [ paramiko ];
|
||||
ssh = [ paramiko paramiko.optional-dependencies.ed25519 ];
|
||||
tls = [];
|
||||
websockets = [ websocket-client ];
|
||||
};
|
||||
@ -58,10 +57,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
paramiko
|
||||
pynacl
|
||||
websocket-client
|
||||
];
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
pytestFlagsArray = [ "tests/unit" ];
|
||||
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
paramiko
|
||||
lxml
|
||||
six
|
||||
];
|
||||
] ++ paramiko.optional-dependencies.ed25519;
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
@ -5,19 +5,22 @@
|
||||
paramiko,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
pname = "sshtunnel";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ paramiko ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
Loading…
Reference in New Issue
Block a user