From 9e6241ef692af5c85673b3052bc69f48fa8f4c64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 03:37:41 -0800 Subject: [PATCH 1/3] python37Packages.Wand: 0.4.5 -> 0.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-wand/versions --- pkgs/development/python-modules/Wand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 8108914814a..601a86ea2cf 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -14,11 +14,11 @@ let imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}"; in 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 ]; From 07c3f81aa600a5ba4f90f820659a0ba703384b47 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 28 Jan 2019 20:50:24 +0100 Subject: [PATCH 2/3] pythonPackages.Wand: Fix imagemagick path --- pkgs/development/python-modules/Wand/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 601a86ea2cf..cc958977b10 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -28,7 +28,9 @@ in buildPythonPackage rec { 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 = '${imagemagick}'" ''; # tests not included with pypi release From 4ba2d947ff0e82cb31ee15bb0a084a60f8db1b2c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 28 Jan 2019 23:34:28 +0100 Subject: [PATCH 3/3] pythonPackages.Wand: Clean up and switch to imagemagick7 http://docs.wand-py.org/en/0.5.0/whatsnew/0.5.html#imagemagick-7-support --- .../python-modules/Wand/default.nix | 25 +++---------------- pkgs/top-level/python-packages.nix | 4 +-- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index cc958977b10..c9dee418101 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -1,18 +1,10 @@ { 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.5.0"; @@ -21,16 +13,10 @@ in buildPythonPackage rec { sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj"; }; - checkInputs = [ pytest pytest_xdist memory_profiler psutil ]; - - buildInputs = [ imagemagick ]; - - inherit magick_wand_library imagemagick_library; - postPatch = '' substituteInPlace wand/api.py --replace \ "magick_home = os.environ.get('MAGICK_HOME')" \ - "magick_home = '${imagemagick}'" + "magick_home = '${imagemagick7Big}'" ''; # tests not included with pypi release @@ -40,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 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05618cc5fb7..1e5a3c65a28 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };