git.iko.soy/typeable/nixpkgs
on master help sign in
pythonPackages.Wand: Clean up and switch to imagemagick7

http://docs.wand-py.org/en/0.5.0/whatsnew/0.5.html#imagemagick-7-support

commit4ba2d947ff0e82cb31ee15bb0a084a60f8db1b2c authorSilvan Mosberger <infinisil@icloud.com> dateMon 28 Jan 2019, 23:34 (8 years ago) parent07c3f81
2 files changed+5−24
pkgs/development/python-modules/Wand/default.nix+4−21 pkgs/top-level/python-packages.nix+1−3
pkgs/development/python-modules/Wand/default.nix+4−21
@@ -1,18 +1,10 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4−, imagemagick
5−, pytest
6−, psutil
7−, memory_profiler
8−, pytest_xdist
4+, imagemagick7Big
95}:
106
11−let
12− soext = stdenv.hostPlatform.extensions.sharedLibrary;
13− magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}";
14− imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
15−in buildPythonPackage rec {
7+buildPythonPackage rec {
168 pname = "Wand";
179 version = "0.5.0";
1810
@@ -21,16 +13,10 @@ in buildPythonPackage rec {
2113 sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
2214 };
2315
24− checkInputs = [ pytest pytest_xdist memory_profiler psutil ];
25−
26− buildInputs = [ imagemagick ];
27−
28− inherit magick_wand_library imagemagick_library;
29−
3016 postPatch = ''
3117 substituteInPlace wand/api.py --replace \
3218 "magick_home = os.environ.get('MAGICK_HOME')" \
33− "magick_home = '${imagemagick}'"
19+ "magick_home = '${imagemagick7Big}'"
3420 '';
3521
3622 # tests not included with pypi release
@@ -40,9 +26,6 @@ in buildPythonPackage rec {
4026 description = "Ctypes-based simple MagickWand API binding for Python";
4127 homepage = http://wand-py.org/;
4228 license = [ licenses.mit ];
43− };
44−
45− passthru = {
46− inherit imagemagick;
29+ maintainers = with maintainers; [ infinisil ];
4730 };
4831}
pkgs/top-level/python-packages.nix+1−3
@@ -4164,9 +4164,7 @@ in {
41644164
41654165 websockets = callPackage ../development/python-modules/websockets { };
41664166
4167− Wand = callPackage ../development/python-modules/Wand {
4168− imagemagick = pkgs.imagemagickBig;
4169− };
4167+ Wand = callPackage ../development/python-modules/Wand { };
41704168
41714169 wcwidth = callPackage ../development/python-modules/wcwidth { };
41724170