From 2caa59c9574a2c45963c7adb0dc852a9f6b7321c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:32:44 -0400 Subject: [PATCH] pythonPackages.sphinxcontrib-spelling: refactor move to python-modules --- .../sphinxcontrib-spelling/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------- 2 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib-spelling/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix new file mode 100644 index 00000000000..4d9a4b2ba94 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +, pyenchant +, pbr +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-spelling"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f0fymrk4kvhqs0vj9gay4lhacxkfrlrpj4gvg0p4wjdczplxd3z"; + }; + + propagatedBuildInputs = [ sphinx pyenchant pbr ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Sphinx spelling extension"; + homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; + maintainers = with maintainers; [ nand0p ]; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f006f0f556..d3acc17aaed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3890,24 +3890,7 @@ in { sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { }; - sphinxcontrib-spelling = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "sphinxcontrib-spelling"; - version = "2.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "1f0fymrk4kvhqs0vj9gay4lhacxkfrlrpj4gvg0p4wjdczplxd3z"; - }; - propagatedBuildInputs = with self; [ sphinx pyenchant pbr ]; - # No tests included - doCheck = false; - meta = { - description = "Sphinx spelling extension"; - homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; - maintainers = with maintainers; [ nand0p ]; - license = licenses.bsd2; - }; - }); + sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };