From 51724c5b7d7c542d1d0fdee61d026c66b2d01640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Wed, 28 Oct 2015 18:54:45 +0100 Subject: [PATCH 1/4] python cairocffi: hardcode cairo library path --- pkgs/top-level/python-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c646a541351..ff8397aed95 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1873,7 +1873,12 @@ let md5 = "e26d06a8d8b16c7210414ce15d453636"; }; - propagatedBuildInputs = with self; [ cffi ]; + propagatedBuildInputs = with self; [ pkgs.cairo cffi ]; + + patchPhase = '' + # Hardcode cairo library path + sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py + ''; meta = { homepage = https://github.com/SimonSapin/cairocffi; From 5aba0536c75560956a5e8e62a7bc4802d47c8786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Wed, 28 Oct 2015 18:55:21 +0100 Subject: [PATCH 2/4] python cairosvg: init at 1.0.18 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff8397aed95..f3abf63ad7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1888,6 +1888,25 @@ let }; + cairosvg = buildPythonPackage rec { + version = "1.0.18"; + name = "cairosvg-${version}"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/C/CairoSVG/CairoSVG-${version}.tar.gz"; + sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1"; + }; + + propagatedBuildInputs = with self; [ cairocffi ]; + + meta = { + homepage = https://cairosvg.org; + license = licenses.lgpl3; + description = "SVG converter based on Cairo"; + }; + }; + + carrot = buildPythonPackage rec { name = "carrot-0.10.7"; From e6c6b4a765aed6c2fac53dd11f842641aec10631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Wed, 28 Oct 2015 18:55:59 +0100 Subject: [PATCH 3/4] python tinycss: init at 0.3 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3abf63ad7f..e2b5bc87db6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2999,6 +2999,24 @@ let }; }; + + tinycss = buildPythonPackage rec { + name = "tinycss-${version}"; + version = "0.3"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/t/tinycss/${name}.tar.gz"; + sha256 = "1pichqra4wk86142hqgvy9s5x6c5k5zhy8l9qxr0620pqk8spbd4"; + }; + + meta = { + description = "complete yet simple CSS parser for Python"; + license = licenses.bsd3; + homepage = http://pythonhosted.org/tinycss/; + }; + }; + + cssselect = buildPythonPackage rec { name = "cssselect-${version}"; version = "0.9.1"; From 810fc8dd70001229157d417cc35282ab8bacf423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Wed, 28 Oct 2015 18:56:23 +0100 Subject: [PATCH 4/4] python pygal: init at 2.0.8 --- pkgs/top-level/python-packages.nix | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2b5bc87db6..fa789ab2a9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9274,6 +9274,50 @@ let preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share"; }; + pygal = buildPythonPackage ( rec { + version = "2.0.8"; + name = "pygal-${version}"; + + patchPhase = '' + # Run tests in pygal dir + substituteInPlace setup.py \ + --replace "self.test_args = []" \ + "self.test_args = ['-x', 'build/lib/pygal']" + # Open unicode files during tests + substituteInPlace pygal/test/test_graph.py \ + --replace "import sys" \ + "import sys, io" + substituteInPlace pygal/test/test_graph.py \ + --replace "open(file_name)" \ + "io.open(file_name, encoding='utf-8')" + # Use explicit integers (for python 3.5) + substituteInPlace pygal/colors.py \ + --replace "'#%x%x%x' % (r / 17, g / 17, b / 17)" \ + "'#%x%x%x' % (r // 17, g // 17, b // 17)" + substituteInPlace pygal/colors.py \ + --replace "'#%x%x%x%x' % (r / 17, g / 17, b / 17, a * 15)" \ + "'#%x%x%x%x' % (r // 17, g // 17, b // 17, int(a * 15))" + substituteInPlace pygal/colors.py \ + --replace "'#%02x%02x%02x%02x' % (r, g, b, a * 255)" \ + "'#%02x%02x%02x%02x' % (r, g, b, int(a * 255))" + ''; + + src = pkgs.fetchurl { + url = "https://github.com/Kozea/pygal/archive/${version}.tar.gz"; + sha256 = "1lv8avn7pdlxks50sd58shpqnxybf3l79bggy32qnbqczk4j2s0b"; + }; + + 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; + }; + }); + + pymysql = buildPythonPackage rec { name = "pymysql-${version}"; version = "0.6.6";