From b86d7fc99b4c6fde61e8c31f5ce9ef99c81ae40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:13:13 +0000 Subject: [PATCH 1/4] jarowinkler-cpp: 1.0.1 -> 1.0.2 https://github.com/maxbachmann/jarowinkler-cpp/releases/tag/v1.0.2 --- pkgs/development/libraries/jarowinkler-cpp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix index 6ddb86299365..0cbfdcea6447 100644 --- a/pkgs/development/libraries/jarowinkler-cpp/default.nix +++ b/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jarowinkler-cpp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "jarowinkler-cpp"; rev = "v${version}"; - hash = "sha256-3/x0fyaDJTouBKbif0ALgMzht6HMEGHNw8g8zQlUcNk="; + hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw="; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast Jaro and Jaro-Winkler distance"; homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; + changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; From a27fe8a92f628e5cdc35375b8662df65ab71adb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:14:45 +0000 Subject: [PATCH 2/4] python310Packages.jarowinkler: 1.0.2 -> 1.0.4 https://github.com/maxbachmann/JaroWinkler/blob/v1.0.4/CHANGELOG.md --- .../python-modules/jarowinkler/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 3985a22d5bcb..de20ac26550e 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -3,32 +3,42 @@ , pythonOlder , fetchFromGitHub , cmake +, ninja , cython , rapidfuzz-capi , scikit-build +, setuptools +, jarowinkler-cpp , hypothesis , pytestCheckHook }: buildPythonPackage rec { pname = "jarowinkler"; - version = "1.0.2"; + version = "1.0.4"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-zVAcV6xxqyfXRUcyWo9PcOdagcexJc/D5k4g5ag3hbY="; + hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE="; }; nativeBuildInputs = [ cmake cython + ninja rapidfuzz-capi scikit-build + setuptools + ]; + + buildInputs = [ + jarowinkler-cpp ]; dontUseCmakeConfigure = true; @@ -48,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for fast approximate string matching using Jaro and Jaro-Winkler similarity"; homepage = "https://github.com/maxbachmann/JaroWinkler"; + changelog = "https://github.com/maxbachmann/JaroWinkler/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From ade62d2d44d2d722f9cfdd5aa7ba4f253e372a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:15:03 +0000 Subject: [PATCH 3/4] rapidfuzz-cpp: 1.0.2 -> 1.0.3 https://github.com/maxbachmann/rapidfuzz-cpp/releases/tag/v1.0.3 --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 99c3059c7a51..0831539dd570 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,24 +7,19 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g="; + hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8="; }; - patches = lib.optionals doCheck [ + patches = [ ./dont-fetch-project-options.patch ]; - postPatch = '' - substituteInPlace test/CMakeLists.txt \ - --replace WARNINGS_AS_ERRORS "" - ''; - nativeBuildInputs = [ cmake ]; @@ -42,6 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; + changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; From b3449fddb39c39dcd96f9dc0235a344092bd6052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:16:28 +0000 Subject: [PATCH 4/4] python310Packages.rapidfuzz: 2.0.11 -> 2.0.15 https://github.com/maxbachmann/RapidFuzz/blob/v2.0.15/CHANGELOG.md --- pkgs/development/python-modules/rapidfuzz/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 9012473f0645..f3c4b77a7095 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -7,6 +7,7 @@ , ninja , rapidfuzz-capi , scikit-build +, setuptools , jarowinkler , numpy , hypothesis @@ -19,15 +20,17 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.0.11"; + version = "2.0.15"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - hash = "sha256-npmdnUMrmbHgUgqMxKBytgtL1weWw6BjVNmBkYSKNMw="; + hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM="; }; nativeBuildInputs = [ @@ -36,6 +39,7 @@ buildPythonPackage rec { ninja rapidfuzz-capi scikit-build + setuptools ]; dontUseCmakeConfigure = true; @@ -72,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rapid fuzzy string matching"; homepage = "https://github.com/maxbachmann/RapidFuzz"; + changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; };