lol

rapidfuzz-cpp: 1.0.1 -> 1.0.2

https://github.com/maxbachmann/rapidfuzz-cpp/releases/tag/v1.0.2

authored by

Robert Schütz and committed by
Robert Schütz
87aef5e8 01fb64af

+72 -6
+14 -6
pkgs/development/libraries/rapidfuzz-cpp/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , cmake 5 - , catch2 5 + , catch2_3 6 6 }: 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "rapidfuzz-cpp"; 10 - version = "1.0.1"; 10 + version = "1.0.2"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "maxbachmann"; 14 14 repo = "rapidfuzz-cpp"; 15 15 rev = "v${version}"; 16 - hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y="; 16 + hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g="; 17 17 }; 18 18 19 + patches = lib.optionals doCheck [ 20 + ./dont-fetch-project-options.patch 21 + ]; 22 + 23 + postPatch = '' 24 + substituteInPlace test/CMakeLists.txt \ 25 + --replace WARNINGS_AS_ERRORS "" 26 + ''; 27 + 19 28 nativeBuildInputs = [ 20 29 cmake 21 30 ]; ··· 25 34 ]; 26 35 27 36 checkInputs = [ 28 - catch2 37 + catch2_3 29 38 ]; 30 39 31 - # uses unreleased Catch2 version 3 32 - doCheck = false; 40 + doCheck = true; 33 41 34 42 meta = { 35 43 description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
+58
pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch
··· 1 + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt 2 + index 5ba4464..ad72319 100644 3 + --- a/test/CMakeLists.txt 4 + +++ b/test/CMakeLists.txt 5 + @@ -12,39 +12,10 @@ else() 6 + FetchContent_MakeAvailable(Catch2) 7 + endif() 8 + 9 + -# include aminya & jason turner's C++ best practices recommended cmake project utilities 10 + -include(FetchContent) 11 + -FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip) 12 + -FetchContent_MakeAvailable(_project_options) 13 + -include(${_project_options_SOURCE_DIR}/Index.cmake) 14 + - 15 + -project_options( 16 + - # ENABLE_CACHE 17 + - # ENABLE_CONAN 18 + - WARNINGS_AS_ERRORS 19 + - # ENABLE_CPPCHECK 20 + - # ENABLE_CLANG_TIDY 21 + - # ENABLE_INCLUDE_WHAT_YOU_USE 22 + - # ENABLE_COVERAGE 23 + - # ENABLE_PCH 24 + - # PCH_HEADERS <Eigen/Dense> <fmt/core.h> <vector> <utility> <string> <string_view> 25 + - # ENABLE_DOXYGEN 26 + - # ENABLE_IPO 27 + - # ENABLE_USER_LINKER 28 + - # ENABLE_BUILD_WITH_TIME_TRACE 29 + - # ENABLE_UNITY 30 + - # ENABLE_SANITIZER_ADDRESS 31 + - # ENABLE_SANITIZER_LEAK 32 + - # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR 33 + - # ENABLE_SANITIZER_THREAD 34 + - # ENABLE_SANITIZER_MEMORY 35 + - # CLANG_WARNINGS "-Weverything" 36 + -) 37 + - 38 + function(rapidfuzz_add_test test) 39 + add_executable(test_${test} tests-${test}.cpp) 40 + target_link_libraries(test_${test} ${PROJECT_NAME}) 41 + - target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) 42 + + target_link_libraries(test_${test} Catch2::Catch2WithMain) 43 + add_test(NAME ${test} COMMAND test_${test}) 44 + endfunction() 45 + 46 + diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt 47 + index 2a70054..7a43c88 100644 48 + --- a/test/distance/CMakeLists.txt 49 + +++ b/test/distance/CMakeLists.txt 50 + @@ -1,7 +1,7 @@ 51 + function(rapidfuzz_add_test test) 52 + add_executable(test_${test} tests-${test}.cpp) 53 + target_link_libraries(test_${test} ${PROJECT_NAME}) 54 + - target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) 55 + + target_link_libraries(test_${test} Catch2::Catch2WithMain) 56 + add_test(NAME ${test} COMMAND test_${test}) 57 + endfunction() 58 +