Merge staging-next into staging

1 files changed, 28 insertions, 9 deletions

diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
index 9b65a6341ced..222933a85dd6 100644
--- a/pkgs/development/python-modules/httpserver/default.nix
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -1,30 +1,49 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
   docopt,
+  fetchPypi,
+  freezegun,
+  pytestCheckHook,
+  pythonOlder,
+  selenium,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "httpserver";
   version = "1.1.0";
-  format = "setuptools";
-
-  buildInputs = [ docopt ];
+  pyproject = true;
 
-  # Tests pull in lots of other dependencies to emulate different web
-  # drivers.
-  doCheck = false;
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv";
+    hash = "sha256-W8Pa+CUS8vCzEcymjY6no5GMdSDSZs4bhmDtRsR4wuA=";
   };
 
+  build-system = [ setuptools ];
+
+  dependencies = [ docopt ];
+
+  nativeCheckInputs = [
+    freezegun
+    selenium
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "httpserver" ];
+
+  disabledTestPaths = [
+    # Tests want driver for Firefox
+    "tests/test_selenium.py"
+  ];
+
   meta = {
     description = "Asyncio implementation of an HTTP server";
-    mainProgram = "httpserver";
     homepage = "https://github.com/thomwiggers/httpserver";
     license = with lib.licenses; [ bsd3 ];
+    maintainers = [ ];
+    mainProgram = "httpserver";
   };
 }