summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-02-04 21:06:59 -0800
committerGitHub <noreply@github.com>2023-02-04 21:06:59 -0800
commit5a0de6c16cf34302f2e987cc565d6d3439a18ebb (patch)
tree44da1d4e5917dc0c68d54c3f991cab4e5fcef392 /pkgs
parent10b0320b5bbf621260dcaf593cb1df5d2f29411b (diff)
parent22a71e2ab698e3898f06054e003370e90771d081 (diff)
Merge pull request #214665 from dotlambda/img2pdf-fix
python310Packages.img2pdf: skip failing tests
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix7
-rw-r--r--pkgs/development/python-modules/img2pdf/default.nix1
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 021426b25113..7b820c0e98a4 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -30,6 +30,7 @@
, Foundation
, testers
, imagemagick
+, python3
}:
assert libXtSupport -> libX11Support;
@@ -122,8 +123,10 @@ stdenv.mkDerivation rec {
done
'';
- passthru.tests.version =
- testers.testVersion { package = imagemagick; };
+ passthru.tests = {
+ version = testers.testVersion { package = imagemagick; };
+ inherit (python3.pkgs) img2pdf;
+ };
meta = with lib; {
homepage = "http://www.imagemagick.org/";
diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index 93cc6453f978..0450dee30b46 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -61,6 +61,7 @@ buildPythonPackage rec {
disabledTests = [
"test_tiff_rgb"
+ "test_png_gray1" # https://gitlab.mister-muffin.de/josch/img2pdf/issues/154
];
pythonImportsCheck = [ "img2pdf" ];