Merge branch 'master' into patch-3

1 files changed, 27 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
new file mode 100644
index 000000000000..0e4ae14acd76
--- /dev/null
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "httpserver";
+  version = "1.1.0";
+
+  buildInputs = [ docopt ];
+
+  # Tests pull in lots of other dependencies to emulate different web
+  # drivers.
+  doCheck = false;
+
+  # Because it uses asyncio
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv";
+  };
+
+  meta = {
+    description = "Asyncio implementation of an HTTP server";
+    homepage = https://github.com/thomwiggers/httpserver;
+    license = with lib.licenses; [ bsd3 ];
+  };
+}