Unverified Commit 177eb5dd authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #231826 from mweinelt/scikitimage-alias 

python310Packages.scikit-image: rename from scikitimage
parents 8c22ab65 cddb66d6

pkgs/applications/science/math/caffe/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/aplpy/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
, pytestCheckHook

, pythonOlder

, reproject

, scikitimage

, scikit-image

, shapely

}:
@@ -44,7 +44,7 @@ buildPythonPackage rec { 
    pyavm

    pyregion

    reproject

    scikitimage

    scikit-image

    shapely

  ];

pkgs/development/python-modules/batchgenerators/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/development/python-modules/boxx/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/bsuite/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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