1 files changed, 36 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 8fc2d7919b7cc..0511fdd604b7e 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -2,12 +2,20 @@
   lib,
   bleak,
   buildPythonPackage,
+  dash-bootstrap-components,
   dotmap,
   fetchFromGitHub,
+  hypothesis,
   packaging,
+  parse,
   pexpect,
+  platformdirs,
+  poetry-core,
+  ppk2-api,
+  print-color,
   protobuf,
-  pygatt,
+  pyarrow,
+  pyparsing,
   pypubsub,
   pyqrcode,
   pyserial,
@@ -16,14 +24,16 @@
   pythonOlder,
   pyyaml,
   requests,
+  riden,
   setuptools,
   tabulate,
   timeago,
+  webencodings,
 }:
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.3.4";
+  version = "2.3.15";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,18 +42,28 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-WxiddF1n9lyxKkZk1MU40NzLh6goLVs81mbJZ3F33R8=";
+    hash = "sha256-mirEsGeEQuWtaJ+eCROV1g9Bm0mRvCeTKkxPQqCuwe4=";
   };
 
-  build-system = [ setuptools ];
+  pythonRelaxDeps = [
+    "bleak"
+    "protobuf"
+  ];
+
+  build-system = [ poetry-core ];
 
   dependencies = [
     bleak
     dotmap
     packaging
+    parse
     pexpect
+    platformdirs
+    ppk2-api
+    print-color
     protobuf
-    pygatt
+    pyarrow
+    pyparsing
     pypubsub
     pyqrcode
     pyserial
@@ -52,6 +72,7 @@ buildPythonPackage rec {
     setuptools
     tabulate
     timeago
+    webencodings
   ];
 
   passthru.optional-dependencies = {
@@ -59,9 +80,11 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    pytap2
+    dash-bootstrap-components
+    hypothesis
     pytestCheckHook
-  ];
+    riden
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   preCheck = ''
     export PATH="$PATH:$out/bin";
@@ -69,6 +92,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "meshtastic" ];
 
+  disabledTestPaths = [
+    # Circular import with dash-bootstrap-components
+    "meshtastic/tests/test_analysis.py"
+  ];
+
   disabledTests = [
     # TypeError
     "test_main_info_with_seriallog_output_txt"
@@ -79,6 +107,7 @@ buildPythonPackage rec {
     "test_main_support"
     "test_MeshInterface"
     "test_message_to_json_shows_all"
+    "test_node"
     "test_SerialInterface_single_port"
     "test_support_info"
     "test_TCPInterface"