Merge pull request #128962 from fabaff/bump-asyncssh
This commit is contained in:
commit
dc4d3016fa
|
@ -1,18 +1,49 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, pythonOlder
|
||||||
, cryptography
|
, cryptography
|
||||||
, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
|
, bcrypt
|
||||||
, openssl, openssh, pytestCheckHook }:
|
, gssapi
|
||||||
|
, fido2
|
||||||
|
, libnacl
|
||||||
|
, libsodium
|
||||||
|
, nettle
|
||||||
|
, python-pkcs11
|
||||||
|
, pyopenssl
|
||||||
|
, openssl
|
||||||
|
, openssh
|
||||||
|
, pytestCheckHook
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "asyncssh";
|
pname = "asyncssh";
|
||||||
version = "2.6.0";
|
version = "2.7.0";
|
||||||
disabled = pythonOlder "3.4";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "20f0ef553a1e64a7d38db86ba3a2f3907e72f1e81f3dfec5edb191383783c7d1";
|
sha256 = "sha256-GFAT2OZ3R8PA8BtyQWuL14QX2h30jHH3baU8YH71QbY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
bcrypt
|
||||||
|
cryptography
|
||||||
|
fido2
|
||||||
|
gssapi
|
||||||
|
libnacl
|
||||||
|
libsodium
|
||||||
|
nettle
|
||||||
|
python-pkcs11
|
||||||
|
pyopenssl
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
openssh
|
||||||
|
openssl
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
|
# Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
|
||||||
#
|
#
|
||||||
|
@ -23,32 +54,16 @@ buildPythonPackage rec {
|
||||||
./fix-sftp-chmod-test-nixos.patch
|
./fix-sftp-chmod-test-nixos.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
disabledTestPaths = [
|
||||||
# Disables windows specific test (specifically the GSSAPI wrapper for Windows)
|
# Disables windows specific test (specifically the GSSAPI wrapper for Windows)
|
||||||
postPatch = ''
|
"tests/sspi_stub.py"
|
||||||
rm tests/sspi_stub.py
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
bcrypt
|
|
||||||
cryptography
|
|
||||||
gssapi
|
|
||||||
libnacl
|
|
||||||
libsodium
|
|
||||||
nettle
|
|
||||||
pyopenssl
|
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
pythonImportsCheck = [ "asyncssh" ];
|
||||||
openssh
|
|
||||||
openssl
|
|
||||||
pytestCheckHook
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTests = [ "test_expired_root" "test_confirm" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
|
description = "Asynchronous SSHv2 Python client and server library";
|
||||||
homepage = "https://asyncssh.readthedocs.io/en/latest";
|
homepage = "https://asyncssh.readthedocs.io/";
|
||||||
license = licenses.epl20;
|
license = licenses.epl20;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
|
|
44
pkgs/development/python-modules/python-pkcs11/default.nix
Normal file
44
pkgs/development/python-modules/python-pkcs11/default.nix
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
{ lib
|
||||||
|
, asn1crypto
|
||||||
|
, buildPythonPackage
|
||||||
|
, cached-property
|
||||||
|
, cython
|
||||||
|
, fetchFromGitHub
|
||||||
|
, setuptools-scm
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "python-pkcs11";
|
||||||
|
version = "0.7.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "danni";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv";
|
||||||
|
};
|
||||||
|
|
||||||
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cython
|
||||||
|
setuptools-scm
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
cached-property
|
||||||
|
asn1crypto
|
||||||
|
];
|
||||||
|
|
||||||
|
# Test require additional setup
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "pkcs11" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "PKCS#11/Cryptoki support for Python";
|
||||||
|
homepage = "https://github.com/danni/python-pkcs11";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -7063,6 +7063,8 @@ in {
|
||||||
|
|
||||||
python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
|
python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
|
||||||
|
|
||||||
|
python-pkcs11 = callPackage ../development/python-modules/python-pkcs11 { };
|
||||||
|
|
||||||
python-prctl = callPackage ../development/python-modules/python-prctl { };
|
python-prctl = callPackage ../development/python-modules/python-prctl { };
|
||||||
|
|
||||||
python-ptrace = callPackage ../development/python-modules/python-ptrace { };
|
python-ptrace = callPackage ../development/python-modules/python-ptrace { };
|
||||||
|
|
Loading…
Reference in a new issue