diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index 4804c9b56d646..249f279384a91 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -86,13 +86,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-15"; + version = "7.1.2-16"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-qL7CYq+aGCB3ZLgIcSBy2Dw69g0F68xGXxrE7xJhdNc="; + hash = "sha256-tuCJgns/ecbRbN0OwAZt3E65usA0ZyNLkIey4eQfzOg="; }; outputs = [ diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index a55258f573b82..8a4f89a2055ad 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -2,42 +2,37 @@ stdenv, lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, imagemagickBig, - py, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "wand"; - version = "0.6.13"; - format = "setuptools"; + version = "0.7.0"; + pyproject = true; - src = fetchPypi { - pname = "Wand"; - inherit version; - hash = "sha256-9QE0hOr3og6yLRghqu/mC1DMMpciNytfhWXUbUqq/Mo="; + src = fetchFromGitHub { + owner = "emcconville"; + repo = "wand"; + tag = version; + hash = "sha256-U4qxtOC72YSgo74OZdFmMG8W2s4wFI0ohJ7uJ4caabA="; }; postPatch = '' - substituteInPlace wand/api.py --replace \ + substituteInPlace wand/api.py --replace-fail \ "magick_home = os.environ.get('MAGICK_HOME')" \ "magick_home = '${imagemagickBig}'" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ - py pytestCheckHook ]; - disabledTests = [ - # https://github.com/emcconville/wand/issues/558 - "test_forward_fourier_transform" - "test_inverse_fourier_transform" - # our imagemagick doesn't set MagickReleaseDate - "test_configure_options" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: assert wand.color.Color('srgb(255,0,1.41553e-14)') == wand.color.Color('srgb(255,0,0)') "test_sparse_color" ];