From 67648e566f00916e3a9388ef79c424db5d18efe5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 10:09:54 +0200 Subject: [PATCH 1/2] python312Packages.levenshtein: 0.25.0 -> 0.25.1 Diff: https://github.com/maxbachmann/Levenshtein/compare/refs/tags/v0.25.0...v0.25.1 Changelog: https://github.com/maxbachmann/Levenshtein/blob/refs/tags/v0.25.1/HISTORY.md --- pkgs/development/python-modules/levenshtein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 453ec1be9052..16b539c6dfb9 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-MkzIwTZU8hqPDOlfN4qADCKjGJIQrNhhOmVRAnAfNK0="; + hash = "sha256-ye2XQL/ZQPlA4dy3tlr03WyGhfl7SaOXMt10cWHnW5o="; fetchSubmodules = true; ## for vendored `rapidfuzz-cpp` }; From 576b9e6eaf35ad4898988f861a92be1d42f4a93f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 10:11:03 +0200 Subject: [PATCH 2/2] python312Packages.levenshtein: format with nixfmt --- .../python-modules/levenshtein/default.nix | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 16b539c6dfb9..a7913fd5b097 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, buildPythonPackage -, cmake -, cython -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, rapidfuzz -, rapidfuzz-cpp -, scikit-build +{ + lib, + stdenv, + buildPythonPackage, + cmake, + cython, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + rapidfuzz, + rapidfuzz-cpp, + scikit-build, }: buildPythonPackage rec { @@ -23,7 +24,7 @@ buildPythonPackage rec { repo = "Levenshtein"; rev = "refs/tags/v${version}"; hash = "sha256-ye2XQL/ZQPlA4dy3tlr03WyGhfl7SaOXMt10cWHnW5o="; - fetchSubmodules = true; ## for vendored `rapidfuzz-cpp` + fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` }; nativeBuildInputs = [ @@ -34,25 +35,19 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ - rapidfuzz-cpp - ]; + buildInputs = [ rapidfuzz-cpp ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ - "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 - ]); + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ] + ); - propagatedBuildInputs = [ - rapidfuzz - ]; + dependencies = [ rapidfuzz ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "Levenshtein" - ]; + pythonImportsCheck = [ "Levenshtein" ]; meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity";