From d7da2d4e2b47f0e5aed17b86566bd292e66b90d5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 10:18:43 -0400 Subject: [PATCH] pythonPackages.ndg-httpsclient: refactor move to python-modules --- .../ndg-httpsclient/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/ndg-httpsclient/default.nix 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..780f2c330860 --- /dev/null +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pyopenssl +}: + +buildPythonPackage rec { + version = "0.4.2"; + pname = "ndg-httpsclient"; + + propagatedBuildInputs = [ pyopenssl ]; + + src = fetchFromGitHub { + owner = "cedadev"; + repo = "ndg_httpsclient"; + rev = version; + sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h"; + }; + + # 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; [ ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b10b1161a5f7..9fdd828f47f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1988,29 +1988,7 @@ in { logfury = callPackage ../development/python-modules/logfury { }; - ndg-httpsclient = buildPythonPackage rec { - version = "0.4.2"; - name = "ndg-httpsclient-${version}"; - - propagatedBuildInputs = with self; [ pyopenssl ]; - - src = pkgs.fetchFromGitHub { - owner = "cedadev"; - repo = "ndg_httpsclient"; - rev = version; - sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h"; - }; - - # uses networking - doCheck = false; - - meta = { - homepage = https://github.com/cedadev/ndg_httpsclient/; - description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; - license = licenses.bsd2; - maintainers = with maintainers; [ ]; - }; - }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { };