ebusd: update to 24.1 and add new log facility option ("device")

[bobrippling]

This updates ebusd to 24.1 - changelog available upstream, config changes now include the "device" log level.

🗒️ Will be away for a few days - wanted to get this ready, will test basic functionality on my return

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[bobrippling]

@nathan-gs do you have a way I can use for testing this from a github PR/patch? Other than that it's ready to go

for instance, this gives me errors with nix-shell, short of duplicating the whole lambda I think:

nix-shell -E '
let
  pkgs = import <nixpkgs> {};
  lib = pkgs.lib;
  stdenv = pkgs.stdenv;
  ebusd = import (pkgs.fetchurl {
    url = "https://raw.githubusercontent.com/NixOS/nixpkgs/91f58b6bb0a235331afd831e10f34e9e9fc542a5/pkgs/by-name/eb/ebusd/package.nix";
    sha256 = "sha256-Pbg8+qfJ6suqTguEoipCgb6HwqeXFTuUxs2sSmh25DI="; #pkgs.lib.fakeSha256;
  }) { inherit pkgs lib stdenv; };
in
pkgs.mkShell {
  buildInputs = [ ebusd ];
}
'

[nathan-gs]

for me it fails on the patch (copy & pasted the code into my local repo), unfortunately without the patch it fails the build with:

warning: Git tree '/etc/nixos/nix-conf' is dirty
building the system configuration...
warning: Git tree '/etc/nixos/nix-conf' is dirty
error: builder for '/nix/store/9s9x9gwdd83jaq6n6kfh4ls2frm304fj-ebusd-24.1.drv' failed with exit code 2;
       last 25 log lines:
       > [ 88%] Building CXX object src/ebusd/CMakeFiles/ebusd.dir/main_args.cpp.o
       > [ 90%] Building CXX object src/ebusd/CMakeFiles/ebusd.dir/mqtthandler.cpp.o
       > [ 93%] Building CXX object src/ebusd/CMakeFiles/ebusd.dir/mqttclient.cpp.o
       > [ 95%] Building CXX object src/ebusd/CMakeFiles/ebusd.dir/mqttclient_mosquitto.cpp.o
       > [ 97%] Building CXX object src/ebusd/CMakeFiles/ebusd.dir/knxhandler.cpp.o
       > [100%] Linking CXX executable ebusd
       > [100%] Built target ebusd
       > buildPhase completed in 31 seconds
       > Running phase: installPhase
       > install flags: -j2 SHELL=/nix/store/8vpg72ik2kgxfj05lc56hkqrdrfl8xi9-bash-5.2p37/bin/bash install
       > [  4%] Built target knx
       > [ 23%] Built target utils
       > [ 30%] Built target ebuscontrib
       > [ 58%] Built target ebus
       > [ 65%] Built target ebuspicloader
       > [ 69%] Built target ebusctl
       > [100%] Built target ebusd
       > Install the project...
       > -- Install configuration: "Release"
       > CMake Error at cmake_install.cmake:54 (file):
       >   file cannot create directory: /etc/ebusd.  Maybe need administrative
       >   privileges.
       >
       >
       > make: *** [Makefile:100: install] Error 1
       For full logs, run 'nix log /nix/store/9s9x9gwdd83jaq6n6kfh4ls2frm304fj-ebusd-24.1.drv'.
error: 1 dependencies of derivation '/nix/store/fmly7fl62f79k7r1qqr2qwc7dk43m8dg-system-path.drv' failed to build
error: 1 dependencies of derivation '/nix/store/92hnv1n64pba1np37wmkawvqag8k01si-unit-ebusd.service.drv' failed to build
error: 1 dependencies of derivation '/nix/store/xk96ga6cymffm5m6z0vga2f8whpmpyny-nixos-system-nhtpc-24.11.20250320.7105ae3.drv' failed to build

[nathan-gs]

The patch should be:

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,16 +179,11 @@
 add_subdirectory(src/lib/knx)
 add_subdirectory(src/tools)
 
-if(EXISTS "${ROOT}/etc/debian_version")
-  install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/default/ebusd DESTINATION /etc/default/)
-  install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/init.d/ebusd DESTINATION /etc/init.d/)
-  install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/)
-endif()
 if(HAVE_MQTT)
   FILE(GLOB MQTT_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg")
-  install(FILES ${MQTT_CFG_FILES} DESTINATION /etc/ebusd/)
+  install(FILES ${MQTT_CFG_FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ebusd/)
 endif(HAVE_MQTT)
 if(HAVE_KNX)
   FILE(GLOB KNX_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/knx*.cfg")
-  install(FILES ${KNX_CFG_FILES} DESTINATION /etc/ebusd/)
+  install(FILES ${KNX_CFG_FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ebusd/)
 endif(HAVE_KNX)

Then it builds and ebusd works for me

[bobrippling]

Sweet - so with that patch (same as the existing one, this PR just drops the gcc patch), then I think we're ok.

---

I haven't been able to build ebusd on my nix machine to test it - is this what you execute?

nix-shell -E '
let
  pkgs = import <nixpkgs> {};
  lib = pkgs.lib;
  stdenv = pkgs.stdenv;


  fetchFromGitHub = pkgs.fetchFromGitHub;
  fetchpatch = pkgs.fetchpatch;
  argparse = pkgs.python3Packages.argparse;
  mosquitto = pkgs.mosquitto;
  cmake = pkgs.cmake;
  autoconf = pkgs.autoconf;
  automake = pkgs.automake;
  libtool = pkgs.libtool;
  pkg-config = pkgs.pkg-config;
  openssl = pkgs.openssl;


  ebusd = import ./ebusd.nix {
    inherit lib stdenv pkgs fetchFromGitHub fetchpatch argparse mosquitto cmake autoconf automake libtool pkg-config openssl;
  };
in
  ebusd
'

as I receive an error about argparse (error: attribute 'argparse' missing)

[nathan-gs]

the patch is slightly different. I tested it by manually copying the changes to my local nix-conf (a bit cheating)

[nathan-gs]

nathan-gs/nix-conf@3aad271 is more or less how I got it working.

[bobrippling]

Thanks - that helped, got ebusd 24.1 running, tested with the new device log area and confirmed it still connects to my ebus setup, PR's ready to go

[nathan-gs]

@bobrippling can fix the patch? That one breaks on my side

[bobrippling]

Sure, how's that?

[nathan-gs]

@jleeuwes care to review this one? As it solves #380997

[jleeuwes]

@nathan-gs @wegank @happysalada could one of you review #380997 please? It changes the default configpath because the current one is set to stop working at some time soon.

[nathan-gs]

Thx @bobrippling for the contrib!

[bobrippling]

My pleasure, thanks for the review and guidance!