diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 9adfa1a9eb83..0b2c90f1200e 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,19 +7,15 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.10.1"; + version = "1.10.4"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-c9ESzsDcoUw5XAEZDHdG8jazjI5Oyqic1gaT0qGQsbI="; + hash = "sha256-I7MdeLs+J5a57ypgUJIW0/pSFPzK4nZA4ZrVRdKX7J4="; }; - patches = [ - ./dont-fetch-project-options.patch - ]; - nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch b/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch deleted file mode 100644 index ab88c530d400..000000000000 --- a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 5ba4464..ad72319 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -12,39 +12,10 @@ else() - FetchContent_MakeAvailable(Catch2) - endif() - --# include aminya & jason turner's C++ best practices recommended cmake project utilities --include(FetchContent) --FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip) --FetchContent_MakeAvailable(_project_options) --include(${_project_options_SOURCE_DIR}/Index.cmake) -- --project_options( -- # ENABLE_CACHE -- # ENABLE_CONAN -- WARNINGS_AS_ERRORS -- # ENABLE_CPPCHECK -- # ENABLE_CLANG_TIDY -- # ENABLE_INCLUDE_WHAT_YOU_USE -- # ENABLE_COVERAGE -- # ENABLE_PCH -- # PCH_HEADERS -- # ENABLE_DOXYGEN -- # ENABLE_IPO -- # ENABLE_USER_LINKER -- # ENABLE_BUILD_WITH_TIME_TRACE -- # ENABLE_UNITY -- # ENABLE_SANITIZER_ADDRESS -- # ENABLE_SANITIZER_LEAK -- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR -- # ENABLE_SANITIZER_THREAD -- # ENABLE_SANITIZER_MEMORY -- # CLANG_WARNINGS "-Weverything" --) -- - function(rapidfuzz_add_test test) - add_executable(test_${test} tests-${test}.cpp) - target_link_libraries(test_${test} ${PROJECT_NAME}) -- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) -+ target_link_libraries(test_${test} Catch2::Catch2WithMain) - add_test(NAME ${test} COMMAND test_${test}) - endfunction() - -diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt -index 2a70054..7a43c88 100644 ---- a/test/distance/CMakeLists.txt -+++ b/test/distance/CMakeLists.txt -@@ -1,7 +1,7 @@ - function(rapidfuzz_add_test test) - add_executable(test_${test} tests-${test}.cpp) - target_link_libraries(test_${test} ${PROJECT_NAME}) -- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) -+ target_link_libraries(test_${test} Catch2::Catch2WithMain) - add_test(NAME ${test} COMMAND test_${test}) - endfunction() -