From e8bfc317fdbb2e45d4ad66f7361d0a7dc8d132cb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:41:08 -0500
Subject: [PATCH 1/3] pythonPackages.svgwrite: 1.1.6 -> 1.2.1

---
 .../development/python-modules/svgwrite/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix
index 79e03acd3599..1772e8794ffd 100644
--- a/pkgs/development/python-modules/svgwrite/default.nix
+++ b/pkgs/development/python-modules/svgwrite/default.nix
@@ -3,23 +3,30 @@
 , fetchPypi
 , setuptools
 , pyparsing
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "svgwrite";
-  version = "1.1.6";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
+    extension = "zip";
+    sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e";
   };
 
   buildInputs = [ setuptools ];
   propagatedBuildInputs = [ pyparsing ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     description = "A Python library to create SVG drawings";
-    homepage = https://bitbucket.org/mozman/svgwrite;
+    homepage = https://github.com/mozman/svgwrite;
     license = licenses.mit;
   };
 

From c564ca83ee52855b93308a63d0da4228a5d2f212 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:21:43 -0500
Subject: [PATCH 2/3] pythonPackages.CairoSVG: 2.1.3 -> 2.2.1

---
 .../python-modules/cairosvg/default.nix          | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 68b1924e5a86..abaabb24b4d9 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
 , cairocffi, cssselect2, defusedxml, pillow, tinycss2
 , pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
 
 buildPythonPackage rec {
   pname = "CairoSVG";
-  version = "2.1.3";
+  version = "2.2.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9";
+    sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
   };
 
+  patches = [
+    # Fix tests. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch;
+      sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26";
+    })
+  ];
+
+  LC_ALL="en_US.UTF-8";
+
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
 
   checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ];

From e728f2dab57375548ab52188c5801221a8251c87 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:23:34 -0500
Subject: [PATCH 3/3] pythonPackages.qasm2image: fix build

---
 pkgs/development/python-modules/qasm2image/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 429159d05d7d..39c7b2055c1b 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
     ${python.interpreter} tests/launch_tests.py
   '';
 
+  LC_ALL="en_US.UTF-8";
+
   meta = {
     description = "A Python module to visualise quantum circuit";
     homepage    = https://github.com/nelimeee/qasm2image;