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 2087a5f41038..b3f2528ce2a2 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -1,39 +1,38 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; - version = "0.2.1"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "unixorn"; repo = "ha-mqtt-discoverable-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-miFlrBmxVuIJjpsyYnbQt+QAGSrS4sHlJpCmxouM2Wc="; + hash = "sha256-rGRsB5kAtzI5KP4tMiQqLJQZs7z5k657V8Di0OzB6F8="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; - propagatedBuildInputs = with python3.pkgs; [ - ha-mqtt-discoverable - ]; + build-system = with python3.pkgs; [ poetry-core ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + dependencies = with python3.pkgs; [ ha-mqtt-discoverable ]; # Project has no real tests doCheck = false; - pythonImportsCheck = [ - "ha_mqtt_discoverable_cli" - ]; + pythonImportsCheck = [ "ha_mqtt_discoverable_cli" ]; meta = with lib; { description = "CLI for creating Home Assistant compatible MQTT entities that will be automatically discovered"; homepage = "https://github.com/unixorn/ha-mqtt-discoverable-cli"; - changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v0.2.1"; + changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "hmd"; diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 1420362dc622..40c61f8a7dc9 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -1,18 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gitlike-commands -, paho-mqtt -, poetry-core -, pyaml -, pydantic -, pythonOlder -, thelogrus +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gitlike-commands, + paho-mqtt, + poetry-core, + pyaml, + pydantic, + pythonOlder, + pythonRelaxDepsHook, + thelogrus, }: buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,14 +23,16 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; rev = "refs/tags/v${version}"; - hash = "sha256-Ue8az6Q7uU02IJJyyHk64Ji4J6sf/bShvTeHhN9U92Y="; + hash = "sha256-vL4EzeU+8nUPyLR22MJtLhknWF4DWMo49EKvkIqIWhA="; }; - nativeBuildInputs = [ - poetry-core - ]; + pythonRelaxDeps = [ "pyaml" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ gitlike-commands paho-mqtt pyaml @@ -39,9 +43,7 @@ buildPythonPackage rec { # Test require a running Mosquitto instance doCheck = false; - pythonImportsCheck = [ - "ha_mqtt_discoverable" - ]; + pythonImportsCheck = [ "ha_mqtt_discoverable" ]; meta = with lib; { description = "Python module to create MQTT entities that are automatically discovered by Home Assistant"; @@ -49,6 +51,5 @@ buildPythonPackage rec { changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; }