ebusd: 23.3 -> 24.1

NixOS · Feb 10, 2025 · b4cc4d7 · b4cc4d7
1 parent ccc6765
commit b4cc4d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix
@@ -49,7 +49,7 @@ in
 
     configpath = lib.mkOption {
       type = lib.types.str;
-      default = "https://cfg.ebusd.eu/";
+      default = "https://ebus.github.io/";
       description = ''
         Directory to read CSV config files from. This can be a local folder or a URL.
       '';

diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ebusd";
-  version = "23.3";
+  version = "24.1";
 
   src = fetchFromGitHub {
     owner = "john30";
     repo = "ebusd";
     rev = version;
-    sha256 = "sha256-K3gZ5OudNA92S38U1+HndxjA7OVfh2ymYf8OetB646M=";
+    sha256 = "sha256-+3QOB7/yCgR4j2UGfhWQ5s5sldoNfWSzX7qa//FHeJ4=";
   };
 
   nativeBuildInputs = [
@@ -41,22 +41,20 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./patches/ebusd-cmake.patch
-    # Upstream patch for gcc-13 copmpatibility:
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/john30/ebusd/commit/3384f3780087bd6b94d46bf18cdad18201ad516c.patch";
-      hash = "sha256-+wZDHjGaIhBCqhy2zmIE8Ko3uAiw8kfKx64etCqRQjM=";
-    })
   ];
 
+  preInstall = ''
+    mkdir -p $out/usr/bin
+  '';
+
   cmakeFlags = [
     "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"
     "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin"
     "-DCMAKE_INSTALL_LOCALSTATEDIR=${placeholder "TMPDIR"}"
   ];
 
   postInstall = ''
-    mv $out/usr/bin $out
+    rmdir $out/usr/bin
     rmdir $out/usr
   '';