Merge pull request #44159 from ajs124/biboumi_8_3

biboumi: 7.2 -> 8.3

pkgs/servers/xmpp/biboumi/catch.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -273,27 +273,6 @@ foreach(file ${source_all})
+@@ -303,27 +303,6 @@
  endforeach()
  
  #
@@ -19,7 +19,7 @@
 -ExternalProject_Get_Property(catch SOURCE_DIR)
 -if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
 -  target_include_directories(test_suite
--    PUBLIC "${SOURCE_DIR}/include/"
+-    PUBLIC "${SOURCE_DIR}/single_include/"
 -    )
 -  add_dependencies(test_suite catch)
 -endif()

pkgs/servers/xmpp/biboumi/default.nix

@@ -3,17 +3,17 @@
 
 stdenv.mkDerivation rec {
   name = "biboumi-${version}";
-  version = "7.2";
+  version = "8.3";
 
   src = fetchurl {
     url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz";
-    sha256 = "0gyr2lp2imrjm5hvijcq0s7k9fzkirfl70cprjy9r4yvq6mg1jvd";
+    sha256 = "0896f52nh8vd0idkdznv3gj6wqh1nqhjbwv0m560f0h62f01vm7k";
   };
 
   louiz_catch = fetchgit {
     url = https://lab.louiz.org/louiz/Catch.git;
-    rev = "35f510545d55a831372d3113747bf1314ff4f2ef";
-    sha256 = "1l5b32sgr9zc2hlfr445hwwxv18sh3cn5q1xmvf588z6jyf88g2g";
+    rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
+    sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
   };
 
   patches = [ ./catch.patch ];