From 44713571fc1cf57973dcbb248fe395441c87c321 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:30:54 -0400 Subject: [PATCH] pythonPackages.sphinxcontrib_plantuml: refactor move to python-modules --- .../sphinxcontrib_plantuml/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix new file mode 100644 index 00000000000..3b9119d6651 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +, plantuml +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-plantuml"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv"; + }; + + # No tests included. + doCheck = false; + + propagatedBuildInputs = [ sphinx plantuml ]; + + meta = with stdenv.lib; { + description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; + homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + license = with licenses; [ bsd2 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19999b9fb82..4f006f0f556 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3888,25 +3888,7 @@ in { sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = buildPythonPackage (rec { - name = "sphinxcontrib-plantuml-0.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinxcontrib-plantuml/${name}.tar.gz"; - sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv"; - }; - - # No tests included. - doCheck = false; - - propagatedBuildInputs = with self; [sphinx plantuml]; - - meta = { - description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; - license = with licenses; [ bsd2 ]; - }; - }); + sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { }; sphinxcontrib-spelling = buildPythonPackage (rec { name = "${pname}-${version}";