Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

2 files changed, 13 insertions, 72 deletions

diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix
index 3e3ab72d2720..2333b63057e2 100644
--- a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix
@@ -5,41 +5,40 @@
 , catch2_3
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rapidfuzz-cpp";
-  version = "1.1.1";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "rapidfuzz-cpp";
-    rev = "v${version}";
-    hash = "sha256-ogj8eFkiDtjFcBb3Yip909gKBIeALsoH3LnRIjQmLMA=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-Qqdw5dy+JUBSDpbWEh3Ap3+3h+CcNdfBL+rloRzWGEQ=";
   };
 
-  patches = [
-    ./dont-fetch-project-options.patch
-  ];
-
   nativeBuildInputs = [
     cmake
   ];
 
-  cmakeFlags = lib.optionals doCheck [
+  cmakeFlags = lib.optionals finalAttrs.finalPackage.doCheck [
     "-DRAPIDFUZZ_BUILD_TESTING=ON"
   ];
 
-  checkInputs = [
-    catch2_3
+  CXXFLAGS = lib.optionals stdenv.cc.isClang [
+    # error: no member named 'fill' in namespace 'std'
+    "-include algorithm"
   ];
 
-  doCheck = true;
+  nativeCheckInputs = [
+    catch2_3
+  ];
 
   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";
+    changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch
deleted file mode 100644
index ab88c530d400..000000000000
--- a/nixpkgs/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 <Eigen/Dense> <fmt/core.h> <vector> <utility> <string> <string_view>
--        # 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()
-