Merge branch 'nixpkgs-unstable' into PR #111431

I'm not really sure about the conflicts in:
	pkgs/development/python-modules/psutil/default.nix

Hydra nixpkgs: ?compare=1666054

1 files changed, 37 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
new file mode 100644
index 000000000000..f790629a29cf
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, requests
+, werkzeug
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-httpserver";
+  version = "0.3.7";
+
+  src = fetchPypi {
+    pname = "pytest_httpserver";
+    inherit version;
+    sha256 = "sha256-YgTcrUlwh2jz0tJdMUgjm8RcqrtpJ/oUQm3SnxUc5Z4=";
+  };
+
+  propagatedBuildInputs = [ werkzeug ];
+
+  checkInputs = [
+    pytest-cov
+    pytestCheckHook
+    requests
+  ];
+
+  pythonImportsCheck = [ "pytest_httpserver" ];
+
+  meta = with lib; {
+    description = "HTTP server for pytest to test HTTP clients";
+    homepage = "https://www.github.com/csernazs/pytest-httpserver";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}