From 902b64ec0375bfaa69b46978e42350d1a9adea23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Feb 2022 01:49:01 +0000
Subject: [PATCH 1/3] nvchecker: 2.6.1 -> 2.7

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

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 73819188c49c..f6dc00b4c1c3 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "2.6.1";
+  version = "2.7";
 
   # Tests not included in PyPI tarball
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Lfo/VzsklEbv/kiKV5GbzvycwekqykRLrZBhehC1MjY=";
+    sha256 = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";
   };
 
   nativeBuildInputs = [ installShellFiles docutils ];

From fe083e2bc1d331f6b745cc7f74d6aeae208b3903 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Feb 2022 11:54:26 +0100
Subject: [PATCH 2/3] python3Packages.nvchecker: add pythonImportsCheck

---
 .../python-modules/nvchecker/default.nix      | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index f6dc00b4c1c3..fbdc730f7145 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -21,20 +21,39 @@
 buildPythonPackage rec {
   pname = "nvchecker";
   version = "2.7";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
-  # Tests not included in PyPI tarball
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";
+    hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";
   };
 
-  nativeBuildInputs = [ installShellFiles docutils ];
-  propagatedBuildInputs = [ setuptools packaging tomli structlog appdirs tornado pycurl aiohttp ];
-  checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ];
+  nativeBuildInputs = [
+    installShellFiles
+    docutils
+  ];
+  
+  propagatedBuildInputs = [
+    setuptools
+    packaging
+    tomli
+    structlog
+    appdirs
+    tornado
+    pycurl
+    aiohttp
+  ];
 
-  disabled = pythonOlder "3.7";
+  checkInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    flaky
+    pytest-httpbin
+  ];
 
   postBuild = ''
     patchShebangs docs/myrst2man.py
@@ -45,7 +64,13 @@ buildPythonPackage rec {
     installManPage docs/_build/man/nvchecker.1
   '';
 
-  pytestFlagsArray = [ "-m 'not needs_net'" ];
+  pythonImportsCheck = [
+    "nvchecker"
+  ];
+
+  pytestFlagsArray = [
+    "-m 'not needs_net'"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/lilydjwg/nvchecker";

From 67fc717eb818a209c68876fe8836ec279488a825 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Feb 2022 11:59:14 +0100
Subject: [PATCH 3/3] python3Packages.nvchecker: update ordering

---
 .../python-modules/nvchecker/default.nix      | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index fbdc730f7145..d4d9cf1811e0 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,21 +1,21 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, pytestCheckHook
-, setuptools
-, packaging
-, tomli
-, structlog
-, appdirs
-, pytest-asyncio
-, flaky
-, tornado
-, pycurl
 , aiohttp
-, pytest-httpbin
+, appdirs
+, buildPythonPackage
 , docutils
+, fetchFromGitHub
+, flaky
 , installShellFiles
+, packaging
+, pycurl
+, pytest-asyncio
+, pytest-httpbin
+, pytestCheckHook
+, pythonOlder
+, setuptools
+, structlog
+, tomli
+, tornado
 }:
 
 buildPythonPackage rec {
@@ -33,26 +33,26 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    installShellFiles
     docutils
+    installShellFiles
   ];
-  
+
   propagatedBuildInputs = [
-    setuptools
-    packaging
-    tomli
-    structlog
-    appdirs
-    tornado
-    pycurl
     aiohttp
+    appdirs
+    packaging
+    pycurl
+    setuptools
+    structlog
+    tomli
+    tornado
   ];
 
   checkInputs = [
-    pytestCheckHook
-    pytest-asyncio
     flaky
+    pytest-asyncio
     pytest-httpbin
+    pytestCheckHook
   ];
 
   postBuild = ''