From 08c47e8d91723f13e092cea2dd6e58499c0428c2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 Nov 2023 10:15:48 +0100 Subject: [PATCH] python311Packages.imageio: 2.32.0 -> 2.33.0 Changelog: https://github.com/imageio/imageio/releases/tag/v2.33.0 --- .../python-modules/imageio/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 7a5aaaf81e68..864f3d5ba017 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -2,8 +2,7 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi -, fetchpatch +, fetchFromGitHub , isPyPy , substituteAll @@ -32,24 +31,19 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.32.0"; + version = "2.33.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-5CWtNsYFMI2eptk+2nsJh5JgWbi4YiDhQqWZp5dRKN0="; + src = fetchFromGitHub { + owner = "imageio"; + repo = "imageio"; + rev = "refs/tags/v${version}"; + hash = "sha256-WoCycrJxo0vyV9LiWnEag1wbld3EJWu8mks8TnYt2+A="; }; - patches = [ - # pillow 10.1.0 compat - (fetchpatch { - name = "imageio-pillow-10.1.0-compat.patch"; - url = "https://github.com/imageio/imageio/commit/f58379c1ae7fbd1da8689937b39e499e2d225740.patch"; - hash = "sha256-jPSl/EUe69Dizkv8CqWpnm+TDPtF3VX2DkHOCEuYTLA="; - }) - ] ++ lib.optionals (!stdenv.isDarwin) [ + patches = lib.optionals (!stdenv.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";