From 90479ad3fad1a84aec21c02bc487b3355f98d6dc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 18 Nov 2023 12:58:51 +0100
Subject: [PATCH 1/4] python311Packages.yamllint: 1.32.0 -> 1.33.0

Diff: https://github.com/adrienverge/yamllint/compare/refs/tags/v1.32.0...v1.33.0

Changelog: https://github.com/adrienverge/yamllint/blob/v1.33.0/CHANGELOG.rst
---
 pkgs/development/python-modules/yamllint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 7db56a0d617a..c5664846dcfc 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "1.32.0";
+  version = "1.33.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "adrienverge";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-DtIQ/gUBFQBm0OOJC2c/ONn2ZKsMAzdwMx7FbUo+uIU=";
+    hash = "sha256-hWN5PhEAhckp250Dj7h5PpyH/E1jCi38O4VmMYgPtzE=";
   };
 
   nativeBuildInputs = [

From 8c9009a24a58f26997ed0e428920de68308aa54c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Nov 2023 19:54:56 +0100
Subject: [PATCH 2/4] python311Packages.napalm-hp-procurve: refactor

---
 .../python-modules/napalm/hp-procurve.nix     | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix
index 87dad04cf781..a949588acf60 100644
--- a/pkgs/development/python-modules/napalm/hp-procurve.nix
+++ b/pkgs/development/python-modules/napalm/hp-procurve.nix
@@ -5,6 +5,7 @@
 , netmiko
 , pip
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -12,32 +13,37 @@ buildPythonPackage rec {
   version = "0.7.0";
   format = "setuptools";
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "napalm-automation-community";
-    repo = pname;
-    rev = version;
+    repo = "napalm-hp-procurve";
+    rev = "refs/tags/${version}";
     hash = "sha256-cO4kxI90krj1knzixRKWxa77OAaxjO8dLTy02VpkV9M=";
   };
 
+  patchPhase = ''
+    # Dependency installation in setup.py doesn't work
+    echo -n > requirements.txt
+    substituteInPlace setup.cfg \
+      --replace "--cov=napalm_procurve --cov-report term-missing -vs --pylama" ""
+  '';
+
   nativeBuildInputs = [
     pip
   ];
 
-  # dependency installation in setup.py doesn't work
-  patchPhase = ''
-    echo -n > requirements.txt
-  '';
+  buildInputs = [
+    napalm
+  ];
 
-  buildInputs = [ napalm ];
+  propagatedBuildInputs = [
+    netmiko
+  ];
 
-  propagatedBuildInputs = [ netmiko ];
-
-  # setup.cfg seems to contain invalid pytest parameters
-  preCheck = ''
-    rm setup.cfg
-  '';
-
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   disabledTests = [
     # AssertionError: Some methods vary.
@@ -48,6 +54,10 @@ buildPythonPackage rec {
     "test_get_interfaces"
   ];
 
+  pythonImportsCheck = [
+    "napalm_procurve"
+  ];
+
   meta = with lib; {
     description = "HP ProCurve Driver for NAPALM automation frontend";
     homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve";

From a5ea86a0dcc6bc60463397430d92a5f0e56f688b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Nov 2023 19:55:14 +0100
Subject: [PATCH 3/4] python311Packages.napalm-hp-procurve: disable failing
 test

---
 pkgs/development/python-modules/napalm/hp-procurve.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix
index a949588acf60..6402005bed6e 100644
--- a/pkgs/development/python-modules/napalm/hp-procurve.nix
+++ b/pkgs/development/python-modules/napalm/hp-procurve.nix
@@ -52,6 +52,7 @@ buildPythonPackage rec {
     "test_get_config_filtered"
     # AssertionError
     "test_get_interfaces"
+    "test_get_facts"
   ];
 
   pythonImportsCheck = [

From d86e547133a97984256479f47421e28414370dd1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Nov 2023 20:21:29 +0100
Subject: [PATCH 4/4] python311Packages.netutils: remove napalm from
 propagatedBuildInputs

---
 pkgs/development/python-modules/netutils/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index 517c90b3f449..182485253875 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -15,13 +15,13 @@
 buildPythonPackage rec {
   pname = "netutils";
   version = "1.6.0";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "networktocode";
-    repo = pname;
+    repo = "netutils";
     rev = "refs/tags/v${version}";
     hash = "sha256-ocajE7E4xIatEmv58/9gEpWF2plJdiZXjk6ajD2vTzw=";
   };
@@ -32,7 +32,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jsonschema
-    napalm
   ];
 
   passthru.optional-dependencies.optionals = [