Merge branch 'master' into release-docs

It's been a very long time, so I think a merge will be better than
a rebase.  There was only one simple conflict.

1 files changed, 30 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix
new file mode 100644
index 000000000000..d9c7e41c576f
--- /dev/null
+++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pyopenssl
+}:
+
+buildPythonPackage rec {
+  version = "0.5.1";
+  pname = "ndg-httpsclient";
+
+  propagatedBuildInputs = [ pyopenssl ];
+
+  src = fetchFromGitHub {
+    owner = "cedadev";
+    repo = "ndg_httpsclient";
+    rev = version;
+    sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz";
+  };
+
+  # uses networking
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/cedadev/ndg_httpsclient/;
+    description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ ];
+  };
+
+}