imagemagick: 7.1.1-40 -> 7.1.1-43 (#357109)
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, pkg-config
|
||||
, libtool
|
||||
, bzip2Support ? true, bzip2
|
||||
@@ -51,22 +50,15 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-40";
|
||||
version = "7.1.1-43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E=";
|
||||
hash = "sha256-4JzCBKtXiKGLsZ29+7z5U+3aN3ppusQ7mz+sOZYpXGY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/ImageMagick/ImageMagick/commit/bf5650f0dd41b500102a129d6867cb568f4edee4.patch";
|
||||
hash = "sha256-nxvSTyNZ35DqjR41nM5uidWwRFWzd1e/LFE0n3fpbb8=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
outputMan = "out"; # it's tiny
|
||||
|
||||
|
||||
@@ -88,6 +88,28 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
|
||||
"test_miff_cmyk16"
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/205
|
||||
"test_miff_cmyk8"
|
||||
"test_miff_rgb8"
|
||||
"test_tiff_ccitt_lsb_m2l_white"
|
||||
"test_tiff_ccitt_msb_l2m_white"
|
||||
"test_tiff_ccitt_msb_m2l_white"
|
||||
"test_tiff_ccitt_nometa1"
|
||||
"test_tiff_ccitt_nometa2"
|
||||
"test_tiff_cmyk8"
|
||||
"test_tiff_cmyk16"
|
||||
"test_tiff_float"
|
||||
"test_tiff_gray1"
|
||||
"test_tiff_gray2"
|
||||
"test_tiff_gray4"
|
||||
"test_tiff_gray8"
|
||||
"test_tiff_gray16"
|
||||
"test_tiff_multipage"
|
||||
"test_tiff_palette8"
|
||||
"test_tiff_rgb8"
|
||||
"test_tiff_rgb12"
|
||||
"test_tiff_rgb14"
|
||||
"test_tiff_rgb16"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "img2pdf" ];
|
||||
|
||||
Reference in New Issue
Block a user