From ecae7dc206a68d5d2517765f2b4ade25fb3aba7a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 27 Aug 2023 21:58:52 +0200 Subject: [PATCH] python3Packages.pyssim: unbreak after recent pillow bump `Image.LANCZOS` is a drop-in replacement for `Image.ANTIALIAS`. See https://pillow.readthedocs.io/en/stable/releasenotes/10.0.0.html#constants Pillow bump: bdf1a96570808dc9e11cfbb1ffa5b8a7ff001e2d https://hydra.nixos.org/build/230653960 Co-authored-by: tjni <3806110+tjni@users.noreply.github.com> --- pkgs/development/python-modules/pyssim/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 6b32660ad02db..b69bf47c96d76 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow, fetchpatch }: buildPythonPackage rec { pname = "pyssim"; @@ -14,6 +14,18 @@ buildPythonPackage rec { sha256 = "sha256-VvxQTvDTDms6Ccyclbf9P0HEQksl5atPPzHuH8yXTmc="; }; + patches = [ + # "Replace Image.ANTIALIAS with Image.LANCZOS" + # Image.ANTIALIAS has been removed in Pillow 10.0.0, + # the version currently in nixpkgs, + # and Image.LANCZOS is a drop-in since Pillow 2.7.0. + # https://github.com/jterrace/pyssim/pull/45 + (fetchpatch { + url = "https://github.com/jterrace/pyssim/commit/db4296c12ca9c027eb9cd61b52195a78dfcc6711.patch"; + hash = "sha256-wNp47EFtjXv6jIFX25IErXg83ksmGRNFKNeMFS+tP6s="; + }) + ]; + # Tests are copied from .travis.yml checkPhase = '' $out/bin/pyssim test-images/test1-1.png test-images/test1-1.png | grep 1