python.pkgs.cairosvg1: remove

Make python2.pkgs.cairosvg refer to what previously was cairosvg1 instead. (cherry picked from commit f721655)
NixOS · Mar 13, 2019 · cdc714f · cdc714f
1 parent 3274b1d
commit cdc714f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage, python, tornado, pycrypto, pycurl, pytz
 , pillow, derpconf, python_magic, libthumbor, webcolors
 , piexif, futures, statsd, thumborPexif, fetchFromGitHub, isPy3k, lib
-, mock, raven, nose, yanc, remotecv, pyssim, cairosvg1, preggy, opencv3
+, mock, raven, nose, yanc, remotecv, pyssim, cairosvg, preggy, opencv3
 , pkgs, coreutils, substituteAll
 }:
 
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     webcolors
     piexif
     statsd
-    cairosvg1
+    cairosvg
   ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ];
 
   # Remove the source tree before running nosetests because otherwise nosetests

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -1289,9 +1289,10 @@ in {
     inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi_1_0 cairocffi_0_9;
   in if isPy3k then cairocffi_1_0 else cairocffi_0_9;
 
-  cairosvg1 = callPackage ../development/python-modules/cairosvg/1_x.nix {};
-
-  cairosvg = callPackage ../development/python-modules/cairosvg {};
+  cairosvg = if isPy3k then
+    callPackage ../development/python-modules/cairosvg {}
+  else
+    callPackage ../development/python-modules/cairosvg/1_x.nix {};
 
   carrot = callPackage ../development/python-modules/carrot {};