From 05f423eb0002ec86489dacc96b44e9616b284f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:21:19 -0800 Subject: [PATCH 01/10] python313Packages.paho-mqtt: 1.6.1 -> 2.1.0 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..d3105799d860 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10040,7 +10040,7 @@ self: super: with self; { paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { }; paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { }; - paho-mqtt = paho-mqtt_1; + paho-mqtt = paho-mqtt_2; paintcompiler = callPackage ../development/python-modules/paintcompiler { }; From d7d9a5982f39aeeddfa41474829701b70c07687b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:24:53 -0800 Subject: [PATCH 02/10] frigate: unpin paho-mqtt --- pkgs/by-name/fr/frigate/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 590a483444a0..c9219a2e5a91 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -26,7 +26,6 @@ let python = python312.override { self = python; packageOverrides = self: super: { - paho-mqtt = super.paho-mqtt_2; }; }; From 369074d4bd2f601fc6ea1ea5eeaf1a1aeb147bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:25:36 -0800 Subject: [PATCH 03/10] python313Packages.weconnect-mqtt: unpin paho-mqtt --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 19a2cd2fb32b..2c7b5045cf83 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - paho-mqtt_2, + paho-mqtt, pytest-cov-stub, pytestCheckHook, python-dateutil, @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - paho-mqtt_2 + paho-mqtt python-dateutil weconnect ] ++ weconnect.optional-dependencies.Images; From f37ff3af3ea38672553f40070a433d82563d4345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:26:09 -0800 Subject: [PATCH 04/10] mqtt-exporter: unpin paho-mqtt --- pkgs/by-name/mq/mqtt-exporter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix index 01715b67d838..47464ffe1f9a 100644 --- a/pkgs/by-name/mq/mqtt-exporter/package.nix +++ b/pkgs/by-name/mq/mqtt-exporter/package.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ - paho-mqtt_2 + paho-mqtt prometheus-client ]; From 430baeedba5ab4eaca3030a74941cf3b777ac4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:40:31 -0800 Subject: [PATCH 05/10] python313Packages.ha-mqtt-discoverable: mark broken with paho-mqtt v2 --- .../development/python-modules/ha-mqtt-discoverable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 911a852655ae..4e2275dba2d1 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -43,6 +43,8 @@ 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 c45a2f9d7568acfe876ea32f88939120e15049b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:42:00 -0800 Subject: [PATCH 06/10] ha-mqtt-discoverable-cli: pin paho-mqtt to v1 --- .../ha/ha-mqtt-discoverable-cli/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 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 dfa7b6f4cc2e..8007859bf840 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -4,7 +4,16 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +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 { pname = "ha-mqtt-discoverable-cli"; version = "0.16.4.1"; pyproject = true; @@ -18,9 +27,9 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with python.pkgs; [ poetry-core ]; - dependencies = with python3.pkgs; [ ha-mqtt-discoverable ]; + dependencies = with python.pkgs; [ ha-mqtt-discoverable ]; # Project has no real tests doCheck = false; From ab15130c1a8a76cea8fd5bf8ee4728d209bedbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:58:13 -0800 Subject: [PATCH 07/10] python313Packages.azure-iot-device: mark broken with paho-mqtt v2 --- pkgs/development/python-modules/azure-iot-device/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-iot-device/default.nix b/pkgs/development/python-modules/azure-iot-device/default.nix index cae7ceb73efc..08928f7bcba1 100644 --- a/pkgs/development/python-modules/azure-iot-device/default.nix +++ b/pkgs/development/python-modules/azure-iot-device/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { ]; meta = with lib; { + # https://github.com/Azure/azure-iot-sdk-python/issues/1196 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Microsoft Azure IoT Device Library for Python"; homepage = "https://github.com/Azure/azure-iot-sdk-python"; license = licenses.mit; From 8cd3dc02231177b62d137b103615b0d08e46f658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:00:04 -0800 Subject: [PATCH 08/10] Revert "python3Packages.amshan: 2.1.1 -> 2021.12.1" This reverts commit 96ab7ef710c74c081abb9a986e5524260ea1b391. --- pkgs/development/python-modules/amshan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 5f0bc3fbbacf..82eaa056d876 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amshan"; - version = "2021.12.1"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "toreamun"; repo = "amshan"; - tag = version; - hash = "sha256-eL8YzQB6Vj4l3cYFgWve88vLojvcxMtr2xvTUKT+Ekk="; + rev = version; + hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0="; }; build-system = [ From 24b53d053ecf1bd358328aca8b6d15be1b772734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:01:19 -0800 Subject: [PATCH 09/10] python313Packages.amshan: skip bulk update --- pkgs/development/python-modules/amshan/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 82eaa056d876..f019474e89b4 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "han" ]; + # 2021.12.1 is an older version + passthru.skipBulkUpdate = true; + meta = { description = "Decode smart power meter data stream of Cosem HDLC frames used by MBUS"; longDescription = '' From 19f7ed2c2c9ea4268ec2af4b3910ab568d786a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:04:24 -0800 Subject: [PATCH 10/10] python313Packages.meross-iot: mark broken with paho-mqtt v2 --- pkgs/development/python-modules/meross-iot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 5f037426b477..02f953c0ac8a 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "meross_iot" ]; meta = with lib; { + # https://github.com/albertogeniola/MerossIot/pull/413 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python library to interact with Meross devices"; homepage = "https://github.com/albertogeniola/MerossIot"; changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}";