From 56dfe057d24532d757450bb69843c6bc9d80bfff Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:27:21 -0400 Subject: [PATCH] pythonPackages.sphinxcontrib_httpdomain: refactor move to python-modules --- .../sphinxcontrib_httpdomain/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix new file mode 100644 index 00000000000..8416e9b3d8d --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-httpdomain"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a"; + }; + + propagatedBuildInputs = [ sphinx ]; + + # Check is disabled due to this issue: + # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype + doCheck = false; + + meta = with stdenv.lib; { + description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; + homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 602955278df..2baf62af4fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3882,28 +3882,7 @@ in { sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; - sphinxcontrib_httpdomain = buildPythonPackage (rec { - name = "sphinxcontrib-httpdomain-1.5.0"; - - # Check is disabled due to this issue: - # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinxcontrib-httpdomain/${name}.tar.gz"; - sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a"; - }; - - propagatedBuildInputs = with self; [sphinx]; - - meta = { - description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; - - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; - - license = "BSD"; - }; - }); + sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {};