biboumi: 9.0 → 9.0-unstable-2025-10-27 (#457686)

This commit is contained in:
adisbladis
2025-11-11 07:20:15 +00:00
committed by GitHub
2 changed files with 4 additions and 56 deletions
-30
View File
@@ -1,30 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,27 +303,6 @@
endforeach()
#
-## Add a rule to download the catch unit test framework
-#
-include(ExternalProject)
-ExternalProject_Add(catch
- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
- PREFIX "external"
- UPDATE_COMMAND ""
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- )
-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
-ExternalProject_Get_Property(catch SOURCE_DIR)
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
- target_include_directories(test_suite
- PUBLIC "${SOURCE_DIR}/single_include/"
- )
- add_dependencies(test_suite catch)
-endif()
-
-#
## Add some custom rules to launch the tests
#
add_custom_target(check COMMAND "test_suite"
+4 -26
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitea,
fetchpatch,
cmake,
libuuid,
expat,
@@ -25,38 +24,18 @@ assert lib.assertMsg (
withPostgreSQL || withSQLite
) "At least one Biboumi database provider required";
let
catch = fetchFromGitea {
domain = "codeberg.org";
owner = "poezio";
repo = "catch";
tag = "v2.2.1";
hash = "sha256-dGUnB/KPONqPno1aO5cOSiE5N4lUiTbMUcH0X6HUoCk=";
};
pname = "biboumi";
version = "9.0";
in
stdenv.mkDerivation {
inherit pname version;
pname = "biboumi";
version = "9.0-unstable-2025-10-27";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "poezio";
repo = "biboumi";
tag = version;
hash = "sha256-yjh9WFuFjaoZLfXTfZajmdRO+3KZqJYBEd0HgqcC28A=";
rev = "61242c35bc825d58c9db4301b5696bc17428bf98";
hash = "sha256-BZTqu2Qvfqag9pwymlGrItLbOXQf3VMKQS2+3pxlJbE=";
};
patches = [
./catch.patch
(fetchpatch {
name = "update_botan_to_version_3.patch";
url = "https://codeberg.org/poezio/biboumi/commit/e4d32f939240ed726e9981e42c0dc251cd9879da.patch";
hash = "sha256-QUt2ZQtoouLHAeEUlJh+yfCYEmLboL/tk6O2TbHR67Q=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@@ -87,7 +66,6 @@ stdenv.mkDerivation {
preConfigure = ''
substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
cp ${catch}/single_include/catch.hpp tests/
'';
doCheck = true;