From ed40dba171076f270b4958ca7c9e0b0570882fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Jul 2022 15:40:57 +0000 Subject: [PATCH 1/3] python310Packages.jarowinkler: 1.0.5 -> 1.1.0 https://github.com/maxbachmann/JaroWinkler/releases/tag/v1.1.0 --- .../python-modules/jarowinkler/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 48b1385401d4..13b99050f020 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jarowinkler"; - version = "1.0.5"; + version = "1.1.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "v${version}"; - hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA="; + hash = "sha256-ilkslDrTOaq6mgg+nYMMqxrjvZHXMIcipu25wvV3+Mk="; }; nativeBuildInputs = [ @@ -41,6 +41,10 @@ buildPythonPackage rec { jarowinkler-cpp ]; + preBuild = '' + export JAROWINKLER_BUILD_EXTENSION=1 + ''; + dontUseCmakeConfigure = true; checkInputs = [ @@ -48,11 +52,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preCheck = '' - # import from $out - rm -r jarowinkler - ''; - pythonImportsCheck = [ "jarowinkler" ]; meta = with lib; { From 07f1d6bab7586bbdf0e1e94ebdfe031b32946724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Jul 2022 15:42:14 +0000 Subject: [PATCH 2/3] python310Packages.rapidfuzz: 2.1.0 -> 2.1.2 https://github.com/maxbachmann/RapidFuzz/blob/v2.1.2/CHANGELOG.md --- .../python-modules/rapidfuzz/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 5d718aadd6f0..ef76e2d8fa1e 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.1.0"; + version = "2.1.2"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ="; + hash = "sha256-7BP22Fon+7a3ZxTCS838uoLXABYdEexMEH2vZ0/KoRQ="; }; nativeBuildInputs = [ @@ -50,6 +50,10 @@ buildPythonPackage rec { taskflow ]; + preBuild = '' + export RAPIDFUZZ_BUILD_EXTENSION=1 + ''; + propagatedBuildInputs = [ jarowinkler numpy @@ -61,11 +65,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preCheck = '' - # import from $out - rm -r rapidfuzz - ''; - pythonImportsCheck = [ "rapidfuzz.fuzz" "rapidfuzz.string_metric" From ec9ce3c94bb763973bde1b860d217c1d16e3d5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Jul 2022 15:47:27 +0000 Subject: [PATCH 3/3] python310Packages.levenshtein: 0.18.1 -> 0.18.2 https://github.com/maxbachmann/Levenshtein/releases/tag/v0.18.2 --- .../python-modules/levenshtein/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index ebc1c5113753..658e3c3d5cad 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -6,12 +6,13 @@ , cython , pytestCheckHook , rapidfuzz +, rapidfuzz-cpp , scikit-build }: buildPythonPackage rec { pname = "levenshtein"; - version = "0.18.1"; + version = "0.18.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,9 +21,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "v${version}"; - # https://github.com/maxbachmann/Levenshtein/issues/22 - fetchSubmodules = true; - sha256 = "sha256-WREYdD5MFOpCzH4BSceRpzQZdpi3Xxxn0DpMvDsNlGo="; + hash = "sha256-FmEB0i235rzK6S1MV189iDNB+CYpcBvcdVE+kdclwmE="; }; nativeBuildInputs = [ @@ -33,6 +32,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + buildInputs = [ + rapidfuzz-cpp + ]; + propagatedBuildInputs = [ rapidfuzz ];