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

Merge pull request #54689 from r-ryantm/auto-update/python3.7-Wand

Browse Source 
python37Packages.Wand: 0.4.5 -> 0.5.0
This commit is contained in:
Silvan Mosberger 2019-01-28 23:38:53 +01:00 committed by GitHub
commit d4ad10176e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/python-modules/Wand/default.nix
View File

@ -1,34 +1,22 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, imagemagick
, pytest
, psutil
, memory_profiler
, pytest_xdist
, imagemagick7Big
}:
let
soext = stdenv.hostPlatform.extensions.sharedLibrary;
magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}";
imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
in buildPythonPackage rec {
buildPythonPackage rec {
pname = "Wand";
version = "0.4.5";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65";
sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
};
checkInputs = [ pytest pytest_xdist memory_profiler psutil ];
buildInputs = [ imagemagick ];
inherit magick_wand_library imagemagick_library;
postPatch = ''
substituteAllInPlace wand/api.py
substituteInPlace wand/api.py --replace \
"magick_home = os.environ.get('MAGICK_HOME')" \
"magick_home = '${imagemagick7Big}'"
'';
# tests not included with pypi release
@ -38,9 +26,6 @@ in buildPythonPackage rec {
description = "Ctypes-based simple MagickWand API binding for Python";
homepage = http://wand-py.org/;
license = [ licenses.mit ];
};
passthru = {
inherit imagemagick;
maintainers = with maintainers; [ infinisil ];
};
}

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

@ -4164,9 +4164,7 @@ in {
websockets = callPackage ../development/python-modules/websockets { };
Wand = callPackage ../development/python-modules/Wand {
imagemagick = pkgs.imagemagickBig;
};
Wand = callPackage ../development/python-modules/Wand { };
wcwidth = callPackage ../development/python-modules/wcwidth { };