From 60d63205def2ae3268f42e239cc58d594244e4eb Mon Sep 17 00:00:00 2001
From: Andrew Bruce <me@andrewbruce.net>
Date: Fri, 2 May 2025 16:23:26 +0100
Subject: [PATCH] klipperscreen: 0.4.4 -> 0.4.5, fix Network panel

Add sdbus and sdbus-network-manager Python libraries, required for
enabling the Network panel of KlipperScreen.
---
 pkgs/by-name/kl/klipperscreen/package.nix     |  5 +++--
 .../sdbus-networkmanager/default.nix          | 20 +++++++++++++++++
 .../python-modules/sdbus/default.nix          | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/sdbus-networkmanager/default.nix
 create mode 100644 pkgs/development/python-modules/sdbus/default.nix

diff --git a/pkgs/by-name/kl/klipperscreen/package.nix b/pkgs/by-name/kl/klipperscreen/package.nix
index 3a242ab34729..31593b21b9be 100644
--- a/pkgs/by-name/kl/klipperscreen/package.nix
+++ b/pkgs/by-name/kl/klipperscreen/package.nix
@@ -8,14 +8,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "KlipperScreen";
-  version = "0.4.4";
+  version = "0.4.5";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "KlipperScreen";
     repo = "KlipperScreen";
     rev = "v${version}";
-    hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8=";
+    hash = "sha256-lKGMz5N4lKSqA614wjJiUfP5fUY+WqFDPxeX/Iyp2TQ=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec {
     mpv
     six
     dbus-python
+    sdbus-networkmanager
   ];
 
   dontWrapGApps = true;
diff --git a/pkgs/development/python-modules/sdbus-networkmanager/default.nix b/pkgs/development/python-modules/sdbus-networkmanager/default.nix
new file mode 100644
index 000000000000..e00c15665d21
--- /dev/null
+++ b/pkgs/development/python-modules/sdbus-networkmanager/default.nix
@@ -0,0 +1,20 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  sdbus,
+}:
+
+let
+  pname = "sdbus-networkmanager";
+  version = "2.0.0";
+in
+buildPythonPackage {
+  inherit pname version;
+
+  propagatedBuildInputs = [ sdbus ];
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-NXKsOoGJxoPsBBassUh2F3Oo8Iga09eLbW9oZO/5xQs=";
+  };
+}
diff --git a/pkgs/development/python-modules/sdbus/default.nix b/pkgs/development/python-modules/sdbus/default.nix
new file mode 100644
index 000000000000..a51f3cd84360
--- /dev/null
+++ b/pkgs/development/python-modules/sdbus/default.nix
@@ -0,0 +1,22 @@
+{
+  pkgs,
+  buildPythonPackage,
+  fetchPypi,
+  pkg-config,
+}:
+
+let
+  pname = "sdbus";
+  version = "0.14.0";
+in
+buildPythonPackage {
+  inherit pname version;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ pkgs.systemd ];
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-QdYbdswFqepB0Q1woR6fmobtlfQPcTYwxeGDQODkx28=";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e9491af636c..bfb8c27718d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15568,6 +15568,10 @@ self: super: with self; {
 
   scspell = callPackage ../development/python-modules/scspell { };
 
+  sdbus = callPackage ../development/python-modules/sdbus { };
+
+  sdbus-networkmanager = callPackage ../development/python-modules/sdbus-networkmanager { };
+
   sdds = callPackage ../development/python-modules/sdds { };
 
   sdjson = callPackage ../development/python-modules/sdjson { };