Merge pull request NixOS#270361 from NixOS/backport-270243-to-release…

…-23.11 [Backport release-23.11] python311Packages.img2pdf: 0.5.0 -> 0.5.1
cmspam · Nov 27, 2023 · 42e452b · 42e452b
2 parents 2831b24 + 8a13231
commit 42e452b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pkgs/development/python-modules/img2pdf/default-icc-profile.patch b/pkgs/development/python-modules/img2pdf/default-icc-profile.patch
@@ -1,8 +1,8 @@
 diff --git a/src/img2pdf.py b/src/img2pdf.py
-index 036232b..d2e7829 100755
+index f89670b..01ec4d3 100755
 --- a/src/img2pdf.py
 +++ b/src/img2pdf.py
-@@ -3815,14 +3815,7 @@ def gui():
+@@ -3841,17 +3841,7 @@ def validate_icc(fname):
 
 
  def get_default_icc_profile():
@@ -11,8 +11,11 @@ index 036232b..d2e7829 100755
 -        "/usr/share/color/icc/OpenICC/sRGB.icc",
 -        "/usr/share/color/icc/colord/sRGB.icc",
 -    ]:
--        if os.path.exists(profile):
--            return profile
+-        if not os.path.exists(profile):
+-            continue
+-        if not file_is_icc(profile):
+-            continue
+-        return profile
 -    return "/usr/share/color/icc/sRGB.icc"
 +    return "@srgbProfile@"
 

diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "img2pdf";
-  version = "0.5.0";
+  version = "0.5.1";
   disabled = isPy27;
 
   pyproject = true;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "josch";
     repo = "img2pdf";
     rev = version;
-    hash = "sha256-k0GqBTS8PvYDmjzyLCSdQB7oBakrEQYJcQykDNrzgcA=";
+    hash = "sha256-mrNTc37GrHTc7NW0sYI1FlAOlnvXum02867enqHsAEQ=";
   };
 
   patches = [