Merge pull request #172621 from SuperSandro2000/python310Packages.napalm

pkgs/development/python-modules/napalm/default.nix

@@ -1,23 +1,42 @@
-{ lib, buildPythonPackage, fetchFromGitHub, callPackage, setuptools, cffi
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi
 , paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko
 , junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock
-, pythonOlder, pythonAtLeast }:
+, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "napalm";
-  version = "3.3.1";
+  version = "3.4.1";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.9";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "napalm-automation";
     repo = "napalm";
     rev = version;
-    sha256 = "15h1h1a3avv48i14x96b8v7zkhmwg7dnzxycxr18f9530j237rq6";
+    sha256 = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8=";
   };
 
+  patches = [
+    # netmiko 4.0.0 support
+    (fetchpatch{
+      url = "https://github.com/napalm-automation/napalm/commit/4b8cc85db3236099a04f742cf71773e74d9dd70e.patch";
+      excludes = [ "requirements.txt" ];
+      sha256 = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98=";
+    })
+    (fetchpatch{
+      url = "https://github.com/napalm-automation/napalm/commit/4a8b5b1823335dd79aa5269c038a1f08ecd35cdd.patch";
+      sha256 = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "netmiko>=3.3.0,<4.0.0" "netmiko"
+  '';
+
   buildInputs = [ setuptools ];
+
   propagatedBuildInputs = [
     cffi
     paramiko

pkgs/development/python-modules/napalm/hp-procurve.nix

@@ -30,12 +30,14 @@ buildPythonPackage rec {
     "test_method_signatures"
     # AttributeError: 'PatchedProcurveDriver' object has no attribute 'platform'
     "test_get_config_filtered"
+    # AssertionError
+    "test_get_interfaces"
   ];
 
   meta = with lib; {
     description = "HP ProCurve Driver for NAPALM automation frontend";
-    homepage =
-      "https://github.com/napalm-automation-community/napalm-hp-procurve";
+    homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve";
     license = licenses.asl20;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/netmiko/default.nix

@@ -3,16 +3,15 @@
 
 buildPythonPackage rec {
   pname = "netmiko";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-fVhBkiO1JpqMIFl32xlwSjeCd7aObocXPAr069fKdmc=";
+    sha256 = "sha256-VwUZdHr82WsEprB7rk5d62AwaCxzngftDgjeBZW4OWQ=";
   };
 
   buildInputs = [ setuptools ];
-  propagatedBuildInputs =
-    [ paramiko scp tenacity textfsm ntc-templates pyserial ];
+  propagatedBuildInputs = [ paramiko scp tenacity pyyaml textfsm ntc-templates pyserial ];
 
   # tests require closed-source pyats and genie packages
   doCheck = false;