From c13f598fc2ac795fcff5c5f8315035b021b2f8aa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 00:27:15 -0400 Subject: pythonPackages.pygal: refactor move to python-modules --- pkgs/development/python-modules/pygal/default.nix | 36 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pygal/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix new file mode 100644 index 000000000000..d1a25caabbee --- /dev/null +++ b/pkgs/development/python-modules/pygal/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +, flask +, pyquery +, pytest +, cairosvg +, tinycss +, cssselect +, lxml +}: + +buildPythonPackage rec { + pname = "pygal"; + version = "2.3.1"; + + doCheck = !isPyPy; # one check fails with pypy + + src = fetchPypi { + inherit pname version; + sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667"; + }; + + buildInputs = [ flask pyquery pytest ]; + propagatedBuildInputs = [ cairosvg tinycss cssselect ] + ++ stdenv.lib.optionals (!isPyPy) [ lxml ]; + + meta = with stdenv.lib; { + description = "Sexy and simple python charting"; + homepage = http://www.pygal.org; + license = licenses.lgpl3; + maintainers = with maintainers; [ sjourdois ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20f84331efcc..f1fc2e63b897 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2873,28 +2873,7 @@ in { pint = callPackage ../development/python-modules/pint { }; - pygal = buildPythonPackage rec { - pname = "pygal"; - version = "2.3.1"; - name = "${pname}-${version}"; - - doCheck = !isPyPy; # one check fails with pypy - - src = fetchPypi { - inherit pname version; - sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667"; - }; - - buildInputs = with self; [ flask pyquery pytest ]; - propagatedBuildInputs = with self; [ cairosvg tinycss cssselect ] ++ optionals (!isPyPy) [ lxml ]; - - meta = { - description = "Sexy and simple python charting"; - homepage = http://www.pygal.org; - license = licenses.lgpl3; - maintainers = with maintainers; [ sjourdois ]; - }; - }; + pygal = callPackage ../development/python-modules/pygal { }; pytaglib = callPackage ../development/python-modules/pytaglib { }; -- cgit 1.4.1