JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python.pkgs.cairosvg1: remove

Browse Source 
Make python2.pkgs.cairosvg refer to what previously was cairosvg1 instead.
This commit is contained in:
Robert Schütz 2019-03-13 23:38:32 +01:00
parent 22877838fa
commit f721655455
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/thumbor/default.nix
View File

@ -1,7 +1,7 @@
{ buildPythonPackage, python, tornado, pycrypto, pycurl, pytz { buildPythonPackage, python, tornado, pycrypto, pycurl, pytz
, pillow, derpconf, python_magic, libthumbor, webcolors , pillow, derpconf, python_magic, libthumbor, webcolors
, piexif, futures, statsd, thumborPexif, fetchFromGitHub, isPy3k, lib , 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 , pkgs, coreutils, substituteAll
}: }:
@ -68,7 +68,7 @@ buildPythonPackage rec {
webcolors webcolors
piexif piexif
statsd statsd
cairosvg1 cairosvg
] ++ lib.optionals (!isPy3k) [ futures thumborPexif ]; ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ];
# Remove the source tree before running nosetests because otherwise nosetests # Remove the source tree before running nosetests because otherwise nosetests

7
pkgs/top-level/python-packages.nix
View File

@ -1321,9 +1321,10 @@ in {
inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi_1_0 cairocffi_0_9; inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi_1_0 cairocffi_0_9;
in if isPy3k then cairocffi_1_0 else cairocffi_0_9; in if isPy3k then cairocffi_1_0 else cairocffi_0_9;
cairosvg1 = callPackage ../development/python-modules/cairosvg/1_x.nix {}; cairosvg = if isPy3k then
callPackage ../development/python-modules/cairosvg {}
cairosvg = callPackage ../development/python-modules/cairosvg {}; else
callPackage ../development/python-modules/cairosvg/1_x.nix {};
carrot = callPackage ../development/python-modules/carrot {}; carrot = callPackage ../development/python-modules/carrot {};