Unverified Commit 9fdd065d authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #213242 from mweinelt/sklearn-1.2.1 

python3Packages.scikit-learn: 1.2.0 -> 1.2.1: python3Packages.umap-learn: Fix build
parents 6d781ea3 ba610e8a

pkgs/development/python-modules/scikit-learn/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 


buildPythonPackage rec {

  pname = "scikit-learn";

  version = "1.2.0";

  version = "1.2.1";

  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA=";

    sha256 = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs=";

  };



  buildInputs = [

pkgs/development/python-modules/umap-learn/default.nix

+17 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, fetchpatch

, keras

, numba

, numpy
@@ -27,6 +28,22 @@ buildPythonPackage rec { 
    hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";

  };



  patches = [

    # Fix tests with sklearn>=1.2.0

    (fetchpatch {

      url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch";

      hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs=";

    })

    (fetchpatch {

      url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch";

      hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y=";

    })

    (fetchpatch {

      url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch";

      hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0=";

    })

  ];



  propagatedBuildInputs = [

    numba

    numpy