diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 48b1385401d..13b99050f02 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; { diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index ebc1c511375..658e3c3d5ca 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 ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 5d718aadd6f..ef76e2d8fa1 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"