From 084a9982efc12c3e9c1ef72d4ffbcc2569a52c4e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 7 May 2024 03:59:23 +0200 Subject: [PATCH] python312Packages.asyncssh: use pyproject = true --- .../python-modules/asyncssh/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 735e831c0324..993947d5d7ea 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , bcrypt , buildPythonPackage , cryptography @@ -15,13 +14,14 @@ , pytestCheckHook , python-pkcs11 , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "asyncssh"; version = "2.14.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -30,14 +30,19 @@ buildPythonPackage rec { hash = "sha256-6Va/iYjQega6MwX2YE4mH0ygFMSiMvCHPxx2kvvjz8I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography - libsodium nettle typing-extensions ]; - passthru.optional-dependencies = { + buildInputs = [ + libsodium + ]; + + optional-dependencies = { bcrypt = [ bcrypt ]; @@ -64,7 +69,7 @@ buildPythonPackage rec { openssh openssl pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); patches = [ # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730