From a693796eb0c2bf350a2c5932d4d7361a8f001a6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 07:50:37 +0000
Subject: [PATCH 1/2] python312Packages.meshtastic: 2.5.5 -> 2.5.6post1

---
 pkgs/development/python-modules/meshtastic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 18de6f4c4bb7..6e6a91298036 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.5";
+  version = "2.5.6post1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "Meshtastic-python";
-    rev = "refs/tags/${version}";
-    hash = "sha256-k+Hq3pIuh8lwyoCl1KyHLt2B3OrGzBC6XDauUfVEyd8=";
+    tag = version;
+    hash = "sha256-mt+6fPUAxyw3JFG9WyLdNbP00NJbDTeQc84EbccMt9I=";
   };
 
   pythonRelaxDeps = [

From d59220576b1e618040d55775a7e3b6f76a406fe7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 29 Dec 2024 12:22:39 +0100
Subject: [PATCH 2/2] python312Packages.meshtastic: 2.5.6post1 -> 2.5.9

Diff: https://github.com/meshtastic/Meshtastic-python/compare/None...2.5.9

Changelog: https://github.com/meshtastic/python/releases/tag/2.5.9
---
 .../python-modules/meshtastic/default.nix     | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 6e6a91298036..6bb0c67f39a2 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -1,21 +1,23 @@
 {
   lib,
+  argcomplete,
   bleak,
   buildPythonPackage,
   dash-bootstrap-components,
+  dash,
   dotmap,
   fetchFromGitHub,
   hypothesis,
   packaging,
+  pandas-stubs,
+  pandas,
   parse,
-  pexpect,
   platformdirs,
   poetry-core,
   ppk2-api,
   print-color,
   protobuf,
   pyarrow,
-  pyparsing,
   pypubsub,
   pyqrcode,
   pyserial,
@@ -27,22 +29,21 @@
   riden,
   setuptools,
   tabulate,
-  timeago,
-  webencodings,
+  wcwidth,
 }:
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.6post1";
+  version = "2.5.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     tag = version;
-    hash = "sha256-mt+6fPUAxyw3JFG9WyLdNbP00NJbDTeQc84EbccMt9I=";
+    hash = "sha256-q5hGAe3kJk1E/u2l8uCMyHHVuQmlwODkyZDiqxFn3Bo=";
   };
 
   pythonRelaxDeps = [
@@ -54,36 +55,43 @@ buildPythonPackage rec {
 
   dependencies = [
     bleak
-    dotmap
     packaging
-    parse
-    pexpect
-    platformdirs
-    ppk2-api
-    print-color
     protobuf
-    pyarrow
-    pyparsing
     pypubsub
-    pyqrcode
     pyserial
     pyyaml
     requests
     setuptools
     tabulate
-    timeago
-    webencodings
   ];
 
   optional-dependencies = {
+    analysis = [
+      dash
+      dash-bootstrap-components
+      pandas
+      pandas-stubs
+    ];
+    cli = [
+      argcomplete
+      dotmap
+      print-color
+      pyqrcode
+      wcwidth
+    ];
+    powermon = [
+      parse
+      platformdirs
+      ppk2-api
+      pyarrow
+      riden
+    ];
     tunnel = [ pytap2 ];
   };
 
   nativeCheckInputs = [
-    dash-bootstrap-components
     hypothesis
     pytestCheckHook
-    riden
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
@@ -117,7 +125,7 @@ buildPythonPackage rec {
     description = "Python API for talking to Meshtastic devices";
     homepage = "https://github.com/meshtastic/Meshtastic-python";
     changelog = "https://github.com/meshtastic/python/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }