diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index ed6836afbd9..a05a4984204 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals pythonSupport ( # requirements.txt let pp = python.pkgs; in ([ - pp.numpy pp.scipy pp.scikitimage pp.h5py + pp.numpy pp.scipy pp.scikit-image pp.h5py pp.matplotlib pp.ipython pp.networkx pp.nose pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 6254a902eea..ac00576cc29 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -14,7 +14,7 @@ , pytestCheckHook , pythonOlder , reproject -, scikitimage +, scikit-image , shapely }: @@ -44,7 +44,7 @@ buildPythonPackage rec { pyavm pyregion reproject - scikitimage + scikit-image shapely ]; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 9e0c8157044..a20598b61d0 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -9,7 +9,7 @@ , fetchpatch , scipy , scikit-learn -, scikitimage +, scikit-image , threadpoolctl }: @@ -33,7 +33,7 @@ buildPythonPackage rec { pillow scipy scikit-learn - scikitimage + scikit-image threadpoolctl ]; diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index cb1ef6a35ea..75bd3c2e561 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -4,7 +4,7 @@ , python , xvfb-run , matplotlib -, scikitimage +, scikit-image , numpy , pandas , imageio @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib - scikitimage + scikit-image numpy pandas imageio diff --git a/pkgs/development/python-modules/bsuite/default.nix b/pkgs/development/python-modules/bsuite/default.nix index 0a5f2251112..e039bf0fa07 100644 --- a/pkgs/development/python-modules/bsuite/default.nix +++ b/pkgs/development/python-modules/bsuite/default.nix @@ -10,7 +10,7 @@ , absl-py , dm-env , plotnine -, scikitimage +, scikit-image , dm-tree , patsy , tensorflow-probability @@ -45,7 +45,7 @@ let bsuite = buildPythonPackage rec { pandas patsy plotnine - scikitimage + scikit-image scipy statsmodels termcolor diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index b658a6e8dbe..3ae2278298a 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -7,7 +7,7 @@ , pims , pytestCheckHook , pythonOlder -, scikitimage +, scikit-image , scipy }: @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - scikitimage + scikit-image ]; postPatch = '' diff --git a/pkgs/development/python-modules/dm-haiku/tests.nix b/pkgs/development/python-modules/dm-haiku/tests.nix index a951323e5d8..208fb14e76b 100644 --- a/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/pkgs/development/python-modules/dm-haiku/tests.nix @@ -12,7 +12,7 @@ , bsuite , frozendict , dm-env -, scikitimage +, scikit-image , rlax , distrax , tensorflow-probability @@ -42,7 +42,7 @@ buildPythonPackage rec { pytestCheckHook optax rlax - scikitimage + scikit-image tensorflow tensorflow-probability ]; diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 2a5e82cc8e2..c94a0647ba4 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -9,7 +9,7 @@ , pyclipper , python-bidi , torch -, scikitimage +, scikit-image , scipy , shapely , torchvision @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - scikitimage + scikit-image hdf5 python-bidi numpy diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index ed19595cc6b..7774b3c5380 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -7,7 +7,7 @@ , openjpeg , pytestCheckHook , pythonOlder -, scikitimage +, scikit-image , setuptools }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ lxml pytestCheckHook - scikitimage + scikit-image ]; postConfigure = '' diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index a59f7e08b98..799f7888cfb 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikit-image }: buildPythonPackage { pname = "image-match"; @@ -14,7 +14,7 @@ buildPythonPackage { buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ - scikitimage + scikit-image ]; # remove elasticsearch requirement due to version incompatibility diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index ee1df820a40..f3450d7df17 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , numpy -, scikitimage +, scikit-image , lib , opencv3 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitimage + scikit-image opencv3 ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 1f91e41345e..c67f7fa5b94 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -5,7 +5,7 @@ , numpy , opencv3 , pytestCheckHook -, scikitimage +, scikit-image , scipy , shapely , six @@ -37,7 +37,7 @@ buildPythonPackage rec { imagecorruptions numpy opencv3 - scikitimage + scikit-image scipy shapely six @@ -79,6 +79,6 @@ buildPythonPackage rec { 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"; + broken = lib.versionAtLeast scikit-image.version "0.19"; }; } diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 0abbf3e3110..e325903bf43 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -7,7 +7,7 @@ , nibabel , numpy , scikit-fuzzy -, scikitimage +, scikit-image , scikit-learn , scipy , statsmodels @@ -31,7 +31,7 @@ buildPythonPackage rec { nibabel numpy scikit-fuzzy - scikitimage + scikit-image scikit-learn scipy statsmodels diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix index 337e7d27533..471b1fa61d4 100644 --- a/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/pkgs/development/python-modules/mask-rcnn/default.nix @@ -11,7 +11,7 @@ , numpy , opencv3 , pillow -, scikitimage +, scikit-image , scipy , tensorflow }: @@ -54,7 +54,7 @@ buildPythonPackage rec { numpy opencv3 pillow - scikitimage + scikit-image scipy tensorflow ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index a353816d252..ab4b97c2455 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -12,7 +12,7 @@ # Advanced image processing (triples size of output) , advancedProcessing ? false , opencv3 -, scikitimage +, scikit-image , scikit-learn , scipy , matplotlib @@ -48,7 +48,7 @@ buildPythonPackage rec { proglog ] ++ lib.optionals advancedProcessing [ opencv3 - scikitimage + scikit-image scikit-learn scipy matplotlib diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 0e419994703..769134bcd4e 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -22,7 +22,7 @@ , pillow , pythonOlder , pyyaml -, scikitimage +, scikit-image , scipy , setuptools-scm , sphinx @@ -84,7 +84,7 @@ mkDerivationWith buildPythonPackage rec { pydantic pyopengl pyyaml - scikitimage + scikit-image scipy sphinx superqt diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index b5be85bf115..d874935cf54 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -9,7 +9,7 @@ , fsspec , numpy , requests -, scikitimage +, scikit-image , s3fs , toolz , zarr @@ -44,7 +44,7 @@ buildPythonPackage rec { aiohttp requests s3fs - scikitimage + scikit-image toolz ]; diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 531cad0bc06..f92c44b9b03 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -5,7 +5,7 @@ , numpy , pytestCheckHook , pythonOlder -, scikitimage +, scikit-image , slicerator }: @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - scikitimage + scikit-image ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f0baddf628d..f1ef45d14c3 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -4,7 +4,7 @@ , pythonOlder , docopt , pillow -, scikitimage +, scikit-image , aggdraw , pytestCheckHook , ipython @@ -34,7 +34,7 @@ buildPythonPackage rec { docopt ipython pillow - scikitimage + scikit-image ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix index 0596ce02fe2..5d685d2496e 100644 --- a/pkgs/development/python-modules/pywick/default.nix +++ b/pkgs/development/python-modules/pywick/default.nix @@ -13,7 +13,7 @@ , pyyaml , scipy , requests -, scikitimage +, scikit-image , six , tabulate , torch @@ -52,7 +52,7 @@ buildPythonPackage rec { pyyaml scipy requests - scikitimage + scikit-image tabulate torch torchvision diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 1a55c4f9e86..711e6bd34f3 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -43,7 +43,7 @@ , pyyaml , redis , requests -, scikitimage +, scikit-image , scipy , setproctitle , smart-open @@ -103,7 +103,7 @@ buildPythonPackage rec { gym lz4 matplotlib - scikitimage + scikit-image pyyaml scipy ]; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 76d96346b26..47e3f58f581 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -8,7 +8,7 @@ , pathlib , numpy , requests -, scikitimage +, scikit-image , six , pytestCheckHook , isPy27 @@ -32,7 +32,7 @@ buildPythonPackage rec { packaging numpy requests - scikitimage + scikit-image six tifffile ] ++ lib.optionals isPy27 [ pathlib enum34 ]; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 3817856f01f..5bc0a4af75e 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -25,7 +25,7 @@ , pythonOlder , qdarkstyle , qimage2ndarray -, scikitimage +, scikit-image , scipy , tables }: @@ -57,7 +57,7 @@ buildPythonPackage rec { pandas tables git - scikitimage + scikit-image matplotlib qdarkstyle gitpython diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index fc4ccd28468..5d07c631fc5 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -21,7 +21,7 @@ , pytest-mock , python-dateutil , pythonOlder -, scikitimage +, scikit-image , scipy , setuptools-scm , sqlalchemy @@ -62,7 +62,7 @@ buildPythonPackage rec { sqlalchemy ]; image = [ - scikitimage + scikit-image scipy ]; net = [ diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 13777b7e76a..e1e19b02660 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -29,7 +29,7 @@ , pytest-xdist , pytestCheckHook , requests -, scikitimage +, scikit-image , scipy , six , tensorflow @@ -96,7 +96,7 @@ buildPythonPackage rec { pydub pytest-xdist pytestCheckHook - scikitimage + scikit-image scipy tensorflow tifffile diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 2fc9ace70c9..e3d51f7b551 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cloudpickle , scikit-learn -, scikitimage +, scikit-image , packaging , psutil , py-deprecate @@ -40,7 +40,7 @@ buildPythonPackage { nativeCheckInputs = [ pytorch-lightning scikit-learn - scikitimage + scikit-image cloudpickle psutil pytestCheckHook diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 7e9a4e5104f..ff6b0e933a7 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -15918,7 +15918,7 @@ "cython", "setuptools" ], - "scikitimage": [ + "scikit-image": [ "cython", "setuptools" ], diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d1652a947a6..ea049c89e67 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -264,6 +264,7 @@ mapAliases ({ ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03 sapi-python-client = kbcstorage; # added 2022-04-20 + scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b4fa24e413..6ef7b20e839 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10776,7 +10776,7 @@ self: super: with self; { scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { }; - scikitimage = callPackage ../development/python-modules/scikit-image { }; + scikit-image = callPackage ../development/python-modules/scikit-image { }; scikit-learn = callPackage ../development/python-modules/scikit-learn { inherit (pkgs) gfortran glibcLocales;