From 44450c705d330555e4b56e283810d740fbbf5e9b Mon Sep 17 00:00:00 2001 From: "git@71rd.net" Date: Fri, 26 Sep 2025 02:41:29 +0000 Subject: [PATCH] biboumi: use botan3 and cleanup Switch to codeberg repos for biboumi sources as old source is broken. Apply patch from main branch to use botan3 instead of EOL botan2. --- pkgs/by-name/bi/biboumi/package.nix | 54 ++++++++++++++++++----------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix index 107c6e79c1a1..ea9b4688c9fa 100644 --- a/pkgs/by-name/bi/biboumi/package.nix +++ b/pkgs/by-name/bi/biboumi/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, - fetchurl, - fetchgit, + fetchFromGitea, + fetchpatch, cmake, libuuid, expat, libiconv, - botan2, + botan3, systemd, pkg-config, python3Packages, @@ -26,22 +26,36 @@ assert lib.assertMsg ( ) "At least one Biboumi database provider required"; let - louiz_catch = fetchgit { - url = "https://lab.louiz.org/louiz/Catch.git"; - rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 - sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; + catch = fetchFromGitea { + domain = "codeberg.org"; + owner = "poezio"; + repo = "catch"; + tag = "v2.2.1"; + hash = "sha256-dGUnB/KPONqPno1aO5cOSiE5N4lUiTbMUcH0X6HUoCk="; }; -in -stdenv.mkDerivation rec { + pname = "biboumi"; version = "9.0"; +in +stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; - sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "poezio"; + repo = "biboumi"; + tag = version; + hash = "sha256-yjh9WFuFjaoZLfXTfZajmdRO+3KZqJYBEd0HgqcC28A="; }; - patches = [ ./catch.patch ]; + 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 @@ -53,7 +67,7 @@ stdenv.mkDerivation rec { expat libiconv systemd - botan2 + botan3 ] ++ lib.optional withIDN libidn ++ lib.optional withPostgreSQL libpq @@ -67,17 +81,17 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - cp ${louiz_catch}/single_include/catch.hpp tests/ + cp ${catch}/single_include/catch.hpp tests/ ''; doCheck = true; - meta = with lib; { + meta = { description = "Modern XMPP IRC gateway"; mainProgram = "biboumi"; - platforms = platforms.unix; - homepage = "https://lab.louiz.org/louiz/biboumi"; - license = licenses.zlib; - maintainers = [ maintainers.woffs ]; + platforms = lib.platforms.unix; + homepage = "https://codeberg.org/poezio/biboumi"; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.woffs ]; }; }