From 9097d1cb9a01ae5cbe2942c44810fbe99b149ede Mon Sep 17 00:00:00 2001
From: Nathan Regner <nathanregner@gmail.com>
Date: Sun, 17 Nov 2024 20:32:09 +0000
Subject: [PATCH] moonraker: 0.8.0-unstable-2023-12-27 ->
 0.9.3-unstable-2024-11-17

---
 pkgs/by-name/mo/moonraker/package.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix
index a6b3f3eb21e7f..1cd942a76e6b9 100644
--- a/pkgs/by-name/mo/moonraker/package.nix
+++ b/pkgs/by-name/mo/moonraker/package.nix
@@ -16,23 +16,33 @@ let
       zeroconf
       preprocess-cancellation
       jinja2
-      dbus-next
+      dbus-fast
       apprise
       python-periphery
       ldap3
+      importlib-metadata
     ]
   );
 in stdenvNoCC.mkDerivation rec {
   pname = "moonraker";
-  version = "0.8.0-unstable-2023-12-27";
+  version = "0.9.3-unstable-2024-11-17";
 
   src = fetchFromGitHub {
     owner = "Arksine";
     repo = "moonraker";
-    rev = "c226e9c1e44d65ff6ea400b81e3cedba7f637976";
-    sha256 = "sha256-wdf4uab8pJEWaX6PFN9Y9pykmylmxJ4Oo5pwSQcyjCc=";
+    rev = "ccfe32f2368a5ff6c2497478319909daeeeb8edf";
+    sha256 = "sha256-aCYE3EmflMRIHnGnkZ/0+zScVA5liHSbavScQ7XRf/4=";
   };
 
+  # TODO: remove once upstream moves to dbus-next: https://github.com/Arksine/moonraker/issues/921
+  postPatch = ''
+    substituteInPlace \
+      moonraker/components/dbus_manager.py \
+      moonraker/components/machine.py \
+      moonraker/components/update_manager/system_deploy.py \
+      --replace-fail 'dbus_next' 'dbus_fast'
+  '';
+
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''