From 4fdcceb7798141c8e2e399c8c7519db338b2eaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 21 May 2026 20:55:41 +0200
Subject: [PATCH] python314Packages.scikit-image: update deps to match upstream

---
 .../python-modules/scikit-image/default.nix   | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 03cb2f7f66cd..fe4bd89a3e08 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   python,
   astropy,
-  cloudpickle,
   cython,
   dask,
   imageio,
@@ -24,10 +23,8 @@
   pywavelets,
   scikit-learn,
   scipy,
-  setuptools,
   simpleitk,
   tifffile,
-  wheel,
 }:
 
 let
@@ -51,25 +48,20 @@ let
         --replace-fail "version = version_from_init()" "version = \"${version}\""
     '';
 
-    nativeBuildInputs = [
+    build-system = [
       cython
       meson-python
       numpy
-      packaging
       pythran
-      setuptools
-      wheel
     ];
 
-    propagatedBuildInputs = [
+    dependencies = [
       imageio
       lazy-loader
-      matplotlib
       networkx
       numpy
       packaging
       pillow
-      pywavelets
       scipy
       tifffile
     ];
@@ -77,14 +69,17 @@ let
     optional-dependencies = {
       data = [ pooch ];
       optional = [
+        simpleitk
+        scikit-learn
+        pyamg
+      ]
+      ++ self.passthru.optional-dependencies.optional_free_threaded;
+      optional_free_threaded = [
         astropy
-        cloudpickle
         dask
         matplotlib
         pooch
-        pyamg
-        scikit-learn
-        simpleitk
+        pywavelets
       ]
       ++ dask.optional-dependencies.array;
     };
@@ -115,7 +110,7 @@ let
     ];
 
     disabledTestPaths = [
-      # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error).
+      # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is inaccessible, leading to a pytest collection error).
       "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py"
 
       # These tests require network access