From d295ab9fc6da19292242e34d1e64b5e61183d533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 15:25:14 -0800
Subject: [PATCH 1/2] python313Packages.ha-mqtt-discoverable: 0.16.4 -> 0.18.0

Diff: https://github.com/unixorn/ha-mqtt-discoverable/compare/refs/tags/v0.16.4...v0.18.0

Changelog: https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v0.18.0
---
 .../ha-mqtt-discoverable/default.nix               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
index 4e2275dba2d1..d977634f39e7 100644
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -8,12 +8,11 @@
   pyaml,
   pydantic,
   pythonOlder,
-  thelogrus,
 }:
 
 buildPythonPackage rec {
   pname = "ha-mqtt-discoverable";
-  version = "0.16.4";
+  version = "0.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,10 +21,14 @@ buildPythonPackage rec {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable";
     tag = "v${version}";
-    hash = "sha256-9JRgg2A/tcZyAkuddQ/v3Dhxe60O47Y4VZY3Yb6/49g=";
+    hash = "sha256-CO2XVYYQql8w+YYCxffDdqiKs0Aqc3rYtRM79IYmkzY=";
   };
 
-  pythonRelaxDeps = [ "pyaml" ];
+  pythonRelaxDeps = [
+    "paho-mqtt"
+    "pyaml"
+    "pydantic"
+  ];
 
   build-system = [ poetry-core ];
 
@@ -34,7 +37,6 @@ buildPythonPackage rec {
     paho-mqtt
     pyaml
     pydantic
-    thelogrus
   ];
 
   # Test require a running Mosquitto instance
@@ -43,8 +45,6 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "ha_mqtt_discoverable" ];
 
   meta = with lib; {
-    # https://github.com/unixorn/ha-mqtt-discoverable/pull/310
-    broken = lib.versionAtLeast paho-mqtt.version "2";
     description = "Python module to create MQTT entities that are automatically discovered by Home Assistant";
     homepage = "https://github.com/unixorn/ha-mqtt-discoverable";
     changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}";

From 3ed153068431ffa50cf53679ce81fa4e0ee8cdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 15:23:33 -0800
Subject: [PATCH 2/2] ha-mqtt-discoverable-cli: 0.16.4.1 -> 0.18.0

Diff: https://github.com/unixorn/ha-mqtt-discoverable-cli/compare/refs/tags/v0.16.4.1...v0.18.0

Changelog: https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v0.18.0
---
 .../ha/ha-mqtt-discoverable-cli/package.nix   | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
index 8007859bf840..c727bcde08c9 100644
--- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
+++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
@@ -4,32 +4,26 @@
   python3,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # https://github.com/unixorn/ha-mqtt-discoverable/pull/310
-      paho-mqtt = self.paho-mqtt_1;
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.16.4.1";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
     tag = "v${version}";
-    hash = "sha256-VjHsiF4HxGscG1pysxegPyM+Y18CWW06D3WezD+BLss=";
+    hash = "sha256-bPgVPj/ZfHznY0cY1ac0TlhCCdw3ZssL/E8yo0gACgQ=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];
 
-  build-system = with python.pkgs; [ poetry-core ];
+  build-system = with python3.pkgs; [ poetry-core ];
 
-  dependencies = with python.pkgs; [ ha-mqtt-discoverable ];
+  dependencies = with python3.pkgs; [
+    gitlike-commands
+    ha-mqtt-discoverable
+  ];
 
   # Project has no real tests
   doCheck = false;