From 5eeca5bbd4fe6e75e3460c6335f2c852526e4f06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 05:07:17 +0200 Subject: [PATCH] python3Packages.scikit-learn: 1.4.2 -> 1.5.0 https://scikit-learn.org/stable/whats_new/v1.5.html#version-1-5-0 --- .../python-modules/scikit-learn/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 5f9105efbf40..717a732327f7 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -7,10 +7,9 @@ # build-system cython, gfortran, + meson-python, numpy, scipy, - setuptools, - wheel, # native dependencies glibcLocales, @@ -25,20 +24,24 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-2qHEcdlbrQgMbkS0lGyTkKSEKtwwglcsIOT4iE456Vk="; + pname = "scikit_learn"; + inherit version; + hash = "sha256-eJ49sBx1DtbUlvott9UGN4V7RR5XvK6GO/9wfBJHvvc="; }; - # Avoid build-system requirements causing failure - prePatch = '' + postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy==2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0.0rc2" "numpy" + + substituteInPlace meson.build --replace-fail \ + "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ + "'${version}'," ''; buildInputs = [ @@ -53,10 +56,9 @@ buildPythonPackage rec { build-system = [ cython + meson-python numpy scipy - setuptools - wheel ]; dependencies = [