1 files changed, 36 insertions, 42 deletions

diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index 36bc0c793f7a..ca46a101158b 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -1,27 +1,29 @@
-{ lib
-, bcrypt
-, buildPythonPackage
-, cryptography
-, fetchpatch
-, fetchPypi
-, gssapi
-, icecream
-, invoke
-, mock
-, pyasn1
-, pynacl
-, pytestCheckHook
-, six
+{
+  lib,
+  bcrypt,
+  buildPythonPackage,
+  cryptography,
+  fetchpatch,
+  fetchPypi,
+  gssapi,
+  icecream,
+  invoke,
+  mock,
+  pyasn1,
+  pynacl,
+  pytest-relaxed,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "paramiko";
-  version = "3.4.0";
-  format = "setuptools";
+  version = "3.5.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM=";
+    hash = "sha256-rRHlQNpPVc7dpSkx8aP4Eqgjinr39ipg3lOM2AuygSQ=";
   };
 
   patches = [
@@ -31,23 +33,22 @@ buildPythonPackage rec {
       url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch";
       hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA=";
     })
-    (fetchpatch {
-      name = "paramiko-pytest8-compat.patch";
-      url = "https://github.com/paramiko/paramiko/commit/d71046151d9904df467ff72709585cde39cdd4ca.patch";
-      hash = "sha256-4CTIZ9BmzRdh+HOwxSzfM9wkUGJOnndctK5swqqsIvU=";
-    })
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     bcrypt
     cryptography
-    pyasn1
-    six
-  ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update
+    pynacl
+  ];
 
-  passthru.optional-dependencies = {
-    gssapi = [ pyasn1 gssapi ];
-    ed25519 = [ pynacl bcrypt ];
+  optional-dependencies = {
+    gssapi = [
+      pyasn1
+      gssapi
+    ];
+    ed25519 = [ ];
     invoke = [ invoke ];
   };
 
@@ -55,31 +56,24 @@ buildPythonPackage rec {
     icecream
     mock
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+    pytest-relaxed
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
-  disabledTestPaths = [
-    # disable tests that require pytest-relaxed, which is broken
-    "tests/test_client.py"
-    "tests/test_ssh_gss.py"
-  ];
-
-  pythonImportsCheck = [
-    "paramiko"
-  ];
+  pythonImportsCheck = [ "paramiko" ];
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/paramiko/paramiko/";
     changelog = "https://github.com/paramiko/paramiko/blob/${version}/sites/www/changelog.rst";
     description = "Native Python SSHv2 protocol library";
-    license = licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     longDescription = ''
       Library for making SSH2 connections (client or server). Emphasis is
       on using SSH2 as an alternative to SSL for making secure connections
       between python scripts. All major ciphers and hash methods are
       supported. SFTP client and server mode are both supported too.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = lib.teams.helsinki-systems.members;
   };
 }