git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54689 from r-ryantm/auto-update/python3.7-Wand

python37Packages.Wand: 0.4.5 -> 0.5.0

commitd4ad10176ee02af65960173cf58b5d11818f7594 authorSilvan Mosberger <infinisil@icloud.com> dateMon 28 Jan 2019, 23:38 (8 years ago) parent55aab984ba2d94
2 files changed+9−26
pkgs/development/python-modules/Wand/default.nix+8−23 pkgs/top-level/python-packages.nix+1−3
pkgs/development/python-modules/Wand/default.nix+8−23
@@ -1,34 +1,22 @@
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";
17− version = "0.4.5";
9+ version = "0.5.0";
1810
1911 src = fetchPypi {
2012 inherit pname version;
21− sha256 = "b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65";
13+ 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 = ''
31− substituteAllInPlace wand/api.py
17+ substituteInPlace wand/api.py --replace \
18+ "magick_home = os.environ.get('MAGICK_HOME')" \
19+ "magick_home = '${imagemagick7Big}'"
3220 '';
3321
3422 # tests not included with pypi release
@@ -38,9 +26,6 @@ in buildPythonPackage rec {
3826 description = "Ctypes-based simple MagickWand API binding for Python";
3927 homepage = http://wand-py.org/;
4028 license = [ licenses.mit ];
41− };
42−
43− passthru = {
44− inherit imagemagick;
29+ maintainers = with maintainers; [ infinisil ];
4530 };
4631}
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