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

Merge pull request #266748 from tu-maurice/unstable/fix-python-pynndescent 

fix python311Packages.pynndescent & .umap-learn
parents 02f05fce 22ab9cce

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

+3 −7
Original line number Diff line number Diff line
@@ -25,14 +25,10 @@ buildPythonPackage rec { 
  };



  patches = [

    # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207

    # https://github.com/lmcinnes/pynndescent/pull/224

    (fetchpatch {

      url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch";

      hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c=";

    })

    (fetchpatch {

      url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch";

      hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y=";

      url = "https://github.com/lmcinnes/pynndescent/commit/86e0d716a3a4d5f4e6a0a3c2952f6fe339524e96.patch";

      hash = "sha256-dfnT5P9Qsn/nSAr4Ysqo/olbLLfoZXvBRz33yzhN3J4=";

    })

  ];

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

+2 −33
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


buildPythonPackage rec {

  pname = "umap-learn";

  version = "0.5.3";

  version = "0.5.4";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -25,40 +25,9 @@ buildPythonPackage rec { 
    owner = "lmcinnes";

    repo = "umap";

    rev = version;

    hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";

    hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A=";

  };



  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=";

    })

    # Fix tests with numpy>=1.24

    # https://github.com/lmcinnes/umap/pull/952

    (fetchpatch {

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

      hash = "sha256-B50eyMs3CRuzOAq+jxz56XMJPdiUofUxCL0Vqolaafo=";

    })

    # https://github.com/lmcinnes/umap/pull/1010

    (fetchpatch {

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

      hash = "sha256-ir0Pxfr2c0oSuFGXQqHjkj7nzvlpTXCYbaI9qAiLun0=";

    })

    (fetchpatch {

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

      hash = "sha256-7Divrym05wIPa7evgrNYXGm44/EOWG8sIYV8fmtuzJ4=";

    })

  ];



  propagatedBuildInputs = [

    numba

    numpy