From a97420b26d3302913e5393e1cd888a069bd46089 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Fri, 23 Aug 2024 08:44:18 +0200
Subject: [PATCH] python3Packages.paramiko: 3.4.0 -> 3.4.1

---
 .../python-modules/paramiko/default.nix       | 21 ++++++-------------
 pkgs/tools/security/ssh-mitm/default.nix      |  2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index 248dc1f51318..27df85a4b768 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -12,17 +12,18 @@
   pyasn1,
   pynacl,
   pytestCheckHook,
+  pytest-relaxed,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "paramiko";
-  version = "3.4.0";
+  version = "3.4.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM=";
+    hash = "sha256-ixUwKHCvf2ZS8uA4l1wdKXPwYEbLXX1lNVZos+y+zgw=";
   };
 
   patches = [
@@ -32,19 +33,14 @@ 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 = [
+  dependencies = [
     bcrypt
     cryptography
     pyasn1
     six
-  ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update
+  ];
 
   passthru.optional-dependencies = {
     gssapi = [
@@ -62,14 +58,9 @@ buildPythonPackage rec {
     icecream
     mock
     pytestCheckHook
+    pytest-relaxed
   ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
-  disabledTestPaths = [
-    # disable tests that require pytest-relaxed, which is broken
-    "tests/test_client.py"
-    "tests/test_ssh_gss.py"
-  ];
-
   pythonImportsCheck = [ "paramiko" ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/tools/security/ssh-mitm/default.nix b/pkgs/tools/security/ssh-mitm/default.nix
index 6694a9edaae2..e1afacae84c7 100644
--- a/pkgs/tools/security/ssh-mitm/default.nix
+++ b/pkgs/tools/security/ssh-mitm/default.nix
@@ -25,7 +25,7 @@ let
           })
 
         ];
-        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.icecream ];
+        dependencies = oldAttrs.dependencies ++ [ python3.pkgs.icecream ];
       });
     };
   };