From 52cd85f1726c58f6c57b7eeb0be066ad7db603f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 3 May 2022 15:16:36 +0200 Subject: [PATCH 1/2] python310Packages.paramiko: adopt --- .../python-modules/paramiko/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c5680c5c8a3..d7de25bd47d 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -22,6 +22,15 @@ buildPythonPackage rec { sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo="; }; + patches = [ + # Fix usage of dsa keys + # https://github.com/paramiko/paramiko/pull/1606/ + (fetchpatch { + url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; + sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + }) + ]; + propagatedBuildInputs = [ bcrypt cryptography @@ -51,15 +60,6 @@ buildPythonPackage rec { "paramiko" ]; - patches = [ - # Fix usage of dsa keys - # https://github.com/paramiko/paramiko/pull/1606/ - (fetchpatch { - url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; - sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; - }) - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { @@ -72,6 +72,6 @@ buildPythonPackage rec { between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b534d7055e5f0a6fe1fd04e02b46808e787c6415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 3 May 2022 16:49:42 +0200 Subject: [PATCH 2/2] python310Packages.paramiko: 2.10.3 -> 2.10.4 --- pkgs/development/python-modules/paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index d7de25bd47d..421d53b5a88 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.10.3"; + version = "2.10.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo="; + sha256 = "sha256-PS5lC2gSzm0WCr/3AdbvRDTsl5NLE+lc8a09pw/7XFg="; }; patches = [