diff --git a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix index 42fdec694135..3df57342a13e 100644 --- a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix +++ b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-AuH0Vq0Le5T9vDCpEviEjfNpwJFnFtqj/taFJy+YoMY="; + hash = "sha256-uyOkp+a08V+4Hvwp1OY6XMMd37z5RI+W5G4URu6FQtU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 82f83e075713..2915bd0c893e 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -67,6 +67,10 @@ python.pkgs.buildPythonApplication rec { ${python.pythonOnBuildForHost.interpreter} manage.py compress ''; + pythonRelaxDeps = [ + "rapidfuzz" + ]; + dependencies = with python.pkgs; [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 9803f449dc97..c02cc8d93ac2 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, cmake, cython, ninja, @@ -18,30 +17,16 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.13.0"; + version = "3.14.0"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-vwAqlTq4HIbmCL1HsHcgfVWETImxdqTsnenmX2RGXw8="; + hash = "sha256-KPVv4WU6MC17QDvcdpV86FH+FUcS8RMHxzmN/Gx2Cx8="; }; - patches = [ - # https://github.com/rapidfuzz/RapidFuzz/pull/446 - (fetchpatch { - name = "support-taskflow-3.10.0.patch"; - url = "https://github.com/rapidfuzz/RapidFuzz/commit/bba3281cc61ecc4ab4affe5d2d50389a4f6d7556.patch"; - hash = "sha256-kAS6xsPY7eUTfKO+EAOW8bktY4cApvLEpRMciJEsPgk="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython >=3.0.12, <3.1.0" Cython - ''; - build-system = [ cmake cython @@ -76,11 +61,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # segfaults - "test_cdist" - ]; - pythonImportsCheck = [ "rapidfuzz.distance" "rapidfuzz.fuzz"