From c1368113f58b1c1d7c79f5b476ec4c96392704df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Sep 2024 13:47:42 -0700 Subject: [PATCH 1/2] python312Packages.scikit-build-core: 0.10.5 -> 0.10.7 Diff: https://github.com/scikit-build/scikit-build-core/compare/refs/tags/v0.10.5...v0.10.7 Changelog: https://github.com/scikit-build/scikit-build-core/blob/v0.10.7/docs/changelog.md --- .../python-modules/scikit-build-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 3dafa8134d0f..782fb9a21d94 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.10.5"; + version = "0.10.7"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; rev = "refs/tags/v${version}"; - hash = "sha256-hpwXEWPofgMT4ua2tZI1mtGbaBkT2XPBd6QL8xTi1A0="; + hash = "sha256-R6/Y9brIYBA1P3YeG8zGaoPcxWFUDqZlqbZpWu3MIIw="; }; postPatch = lib.optionalString (pythonOlder "3.11") '' @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Next generation Python CMake adaptor and Python API for plugins"; homepage = "https://github.com/scikit-build/scikit-build-core"; - changelog = "https://github.com/scikit-build/scikit-build-core/releases/tag/v${version}"; + changelog = "https://github.com/scikit-build/scikit-build-core/blob/${src.rev}/docs/changelog.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; From 7f2e17c0d12aee3ee190c5dc08839a94ce519e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Sep 2024 13:44:14 -0700 Subject: [PATCH 2/2] python312Packages.rapidfuzz: 3.9.7 -> 3.10.0 Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v3.9.7...v3.10.0 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v3.10.0/CHANGELOG.rst --- .../python-modules/rapidfuzz/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 36bf7fdfc6af..4e11201befd4 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -7,7 +7,7 @@ cmake, cython, ninja, - scikit-build, + scikit-build-core, setuptools, numpy, hypothesis, @@ -19,21 +19,20 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.7"; + version = "3.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-hyjzY9ogroUa4nGSG8HOyr5FxifX9d7Hf8ezKq6zxVk="; + hash = "sha256-hLYidU09nCSOi42zgSh7dW83glxIjFY4C6BTmy/sf60="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "scikit-build~=0.18.0" "scikit-build" \ --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" ''; @@ -41,8 +40,7 @@ buildPythonPackage rec { cmake cython ninja - scikit-build - setuptools + scikit-build-core ]; dontUseCmakeConfigure = true; @@ -61,7 +59,7 @@ buildPythonPackage rec { ''; optional-dependencies = { - full = [ numpy ]; + all = [ numpy ]; }; preCheck = ''