From e202a213b03bb86f000b5ed9f170f22f272a48c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 15 Aug 2024 08:55:05 +0200
Subject: [PATCH] python312Packages.meshtastic: 2.3.11 -> 2.3.15

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index e7ce8351b1b3..0511fdd604b7 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -2,6 +2,7 @@
   lib,
   bleak,
   buildPythonPackage,
+  dash-bootstrap-components,
   dotmap,
   fetchFromGitHub,
   hypothesis,
@@ -9,6 +10,7 @@
   parse,
   pexpect,
   platformdirs,
+  poetry-core,
   ppk2-api,
   print-color,
   protobuf,
@@ -22,6 +24,7 @@
   pythonOlder,
   pyyaml,
   requests,
+  riden,
   setuptools,
   tabulate,
   timeago,
@@ -30,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.3.11";
+  version = "2.3.15";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -39,12 +42,15 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-s56apVx7+EXkdw3FUjyGKGFjP+IVbO0/VDB4urXEtXQ=";
+    hash = "sha256-mirEsGeEQuWtaJ+eCROV1g9Bm0mRvCeTKkxPQqCuwe4=";
   };
 
-  pythonRelaxDeps = [ "protobuf" ];
+  pythonRelaxDeps = [
+    "bleak"
+    "protobuf"
+  ];
 
-  build-system = [ setuptools ];
+  build-system = [ poetry-core ];
 
   dependencies = [
     bleak
@@ -74,8 +80,10 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    dash-bootstrap-components
     hypothesis
     pytestCheckHook
+    riden
   ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   preCheck = ''
@@ -84,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"