pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #181972 from yl3dy/scikit-image_0_19_1

authored by Sandro and committed by GitHub 2bd7266a d70ce02b

+8 -5
unified split
+3
pkgs/development/python-modules/imgaug/default.nix
··· 77 license = licenses.mit; 78 maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; 79 platforms = platforms.linux; 80 }; 81 }
··· 77 license = licenses.mit; 78 maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; 79 platforms = platforms.linux; 80 + # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 81 + # and https://github.com/scikit-image/scikit-image/issues/6093 82 + broken = lib.versionAtLeast scikitimage.version "0.19"; 83 }; 84 }
+5 -5
pkgs/development/python-modules/scikit-image/default.nix
··· 4 , buildPythonPackage 5 , python 6 , cython 7 , numpy 8 , scipy 9 , matplotlib ··· 16 , imageio 17 , tifffile 18 , pytestCheckHook 19 - , doCheck ? false 20 }: 21 22 let 23 installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; 24 self = buildPythonPackage rec { 25 pname = "scikit-image"; 26 - version = "0.18.3"; 27 28 src = fetchFromGitHub { 29 owner = pname; 30 repo = pname; 31 rev = "v${version}"; 32 - sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; 33 }; 34 35 patches = [ ./add-testing-data.patch ]; 36 37 - nativeBuildInputs = [ cython ]; 38 39 propagatedBuildInputs = [ 40 cloudpickle ··· 51 ]; 52 53 # test suite is very cpu intensive, move to passthru.tests 54 - inherit doCheck; 55 checkInputs = [ pytestCheckHook ]; 56 57 # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;
··· 4 , buildPythonPackage 5 , python 6 , cython 7 + , pythran 8 , numpy 9 , scipy 10 , matplotlib ··· 17 , imageio 18 , tifffile 19 , pytestCheckHook 20 }: 21 22 let 23 installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; 24 self = buildPythonPackage rec { 25 pname = "scikit-image"; 26 + version = "0.19.3"; 27 28 src = fetchFromGitHub { 29 owner = pname; 30 repo = pname; 31 rev = "v${version}"; 32 + sha256 = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk="; 33 }; 34 35 patches = [ ./add-testing-data.patch ]; 36 37 + nativeBuildInputs = [ cython pythran ]; 38 39 propagatedBuildInputs = [ 40 cloudpickle ··· 51 ]; 52 53 # test suite is very cpu intensive, move to passthru.tests 54 + doCheck = false; 55 checkInputs = [ pytestCheckHook ]; 56 57 # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;