From 1c6e207082e427c6b80a47b4270de3b71da506c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sat, 7 Nov 2015 15:20:49 +0100
Subject: [PATCH 1/2] =?UTF-8?q?maintainers:=20add=20St=C3=A9phane=20Jourdo?=
 =?UTF-8?q?is=20<sjourdois@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a0b6031ae857..bf054ef7fd59 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -264,6 +264,7 @@
   simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
   sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
+  sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";

From 7639a564d3aee5f1b83906f821638d1e6bcc4d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sun, 8 Nov 2015 22:50:28 +0100
Subject: [PATCH 2/2] pygal: 2.0.8 -> 2.0.10

---
 pkgs/top-level/python-packages.nix | 40 ++++++++----------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 344e857090d4..174cead8eed3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9477,37 +9477,17 @@ let
     preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share";
   };
 
-  pygal = buildPythonPackage ( rec {
-    version = "2.0.8";
+  pygal = buildPythonPackage rec {
+    version = "2.0.10";
     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))"
-    '';
+    doCheck = !isPyPy;  # one check fails with pypy
 
-    src = pkgs.fetchurl {
-      url = "https://github.com/Kozea/pygal/archive/${version}.tar.gz";
-      sha256 = "1lv8avn7pdlxks50sd58shpqnxybf3l79bggy32qnbqczk4j2s0b";
+    src = pkgs.fetchFromGitHub {
+      owner = "Kozea";
+      repo = "pygal";
+      rev = version;
+      sha256 = "1j7qjgraapvfc80yp8xcbddqrw8379gqi7pwkvfml3qcqm0z0d33";
     };
 
     buildInputs = with self; [ flask pyquery pytest ];
@@ -9517,9 +9497,9 @@ let
       description = "Sexy and simple python charting";
       homepage = http://www.pygal.org;
       license = licenses.lgpl3;
+      maintainers = with maintainers; [ sjourdois ];
     };
-  });
-
+  };
 
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";