From 82f3fc0c83a7953c66b0e9331b3f633f62913f3f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 14 Oct 2018 12:48:33 -0500
Subject: [PATCH 1/2] pythonPackages.structlog: add six to
 propagatedBuildInputs

Move simplejson to checkInputs
---
 pkgs/development/python-modules/structlog/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 4dc9c3c79bc9..f667f17f77df 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -6,6 +6,7 @@
 , pretend
 , freezegun
 , simplejson
+, six
 }:
 
 buildPythonPackage rec {
@@ -25,8 +26,8 @@ buildPythonPackage rec {
     })
   ];
 
-  checkInputs = [ pytest pretend freezegun ];
-  propagatedBuildInputs = [ simplejson ];
+  checkInputs = [ pytest pretend freezegun simplejson ];
+  propagatedBuildInputs = [ six ];
 
   checkPhase = ''
     rm tests/test_twisted.py*

From d03f4390addccc727033102f7e773d1b6a12a00f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 14 Oct 2018 12:47:14 -0500
Subject: [PATCH 2/2] pythonPackages.nvchecker: init at 1.1

---
 .../python-modules/nvchecker/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/nvchecker/default.nix

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
new file mode 100644
index 000000000000..6e70f90e3705
--- /dev/null
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, pytest_xdist, flaky, tornado }:
+
+buildPythonPackage rec {
+  pname = "nvchecker";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nk9ff26s5r6v5v7w4l9110qi5kmhllvwk5kh20zyyhdvxv72m3i";
+  };
+
+  # tornado is not present in the tarball setup.py but is required by the executable
+  propagatedBuildInputs = [ setuptools structlog tornado ];
+  checkInputs = [ pytest pytest-asyncio pytest_xdist flaky ];
+
+  # Disable tests for now, because our version of pytest seems to be too new
+  # https://github.com/lilydjwg/nvchecker/commit/42a02efec84824a073601e1c2de30339d251e4c7
+  doCheck = false;
+
+  checkPhase = ''
+    py.test
+  '';
+
+  disabled = pythonOlder "3.5";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/lilydjwg/nvchecker;
+    description = "New version checker for software";
+    license = licenses.mit;
+    maintainers = with maintainers; [ marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2935c111943..116226428239 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -418,6 +418,8 @@ in {
 
   ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
 
+  nvchecker = callPackage ../development/python-modules/nvchecker { };
+
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };