diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-03-13 23:38:32 +0100 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-03-13 23:49:35 +0100 |
| commit | f721655455fb1868eb483d76873f56a53aa93a38 (patch) | |
| tree | 669806abd4895fd068a7da92868b32f5ae696959 | |
| parent | 22877838fa7bcf1d4bf9286a1ef96015c36a6158 (diff) | |
| download | nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.tar nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.tar.gz nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.tar.bz2 nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.tar.lz nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.tar.xz nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.tar.zst nixpkgs-f721655455fb1868eb483d76873f56a53aa93a38.zip | |
python.pkgs.cairosvg1: remove
Make python2.pkgs.cairosvg refer to what previously was cairosvg1 instead.
| -rw-r--r-- | pkgs/development/python-modules/thumbor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index fcba0a96861..720391772b5 100644 --- 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 index 45e8a3fbbf9..aaff85fc832 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1321,9 +1321,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 {}; |