From 1d143536d38e33f84184ee994297fca41796d750 Mon Sep 17 00:00:00 2001
From: Alexander Kiselyov <aleksandr.kiselyov@gmail.com>
Date: Sat, 20 Aug 2022 18:35:05 +0300
Subject: [PATCH] python310Packages.scikitimage: 0.18.3 -> 0.19.3

Also marked `python3Packages.imgaug` as broken.
---
 pkgs/development/python-modules/imgaug/default.nix     |  3 +++
 .../python-modules/scikit-image/default.nix            | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix
index 50faf89d600a..2c84f5c00c50 100644
--- a/pkgs/development/python-modules/imgaug/default.nix
+++ b/pkgs/development/python-modules/imgaug/default.nix
@@ -77,5 +77,8 @@ buildPythonPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
     platforms = platforms.linux;
+    # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0
+    # and https://github.com/scikit-image/scikit-image/issues/6093
+    broken = lib.versionAtLeast scikitimage.version "0.19";
   };
 }
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 45239f64fbef..9098724da42a 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -4,6 +4,7 @@
 , buildPythonPackage
 , python
 , cython
+, pythran
 , numpy
 , scipy
 , matplotlib
@@ -16,25 +17,24 @@
 , imageio
 , tifffile
 , pytestCheckHook
-, doCheck ? false
 }:
 
 let
   installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
   self = buildPythonPackage rec {
     pname = "scikit-image";
-    version = "0.18.3";
+    version = "0.19.3";
 
     src = fetchFromGitHub {
       owner = pname;
       repo = pname;
       rev = "v${version}";
-      sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh";
+      sha256 = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk=";
     };
 
     patches = [ ./add-testing-data.patch ];
 
-    nativeBuildInputs = [ cython ];
+    nativeBuildInputs = [ cython pythran ];
 
     propagatedBuildInputs = [
       cloudpickle
@@ -51,7 +51,7 @@ let
     ];
 
     # test suite is very cpu intensive, move to passthru.tests
-    inherit doCheck;
+    doCheck = false;
     checkInputs = [ pytestCheckHook ];
 
     # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;