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; }; }; 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; 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 ]; diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 5f0bc3fbbacf..f019474e89b4 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 = [ @@ -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 = '' 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; 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}"; 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}"; 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; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adb25a2e7497..ec5ae8649b27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10046,7 +10046,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 { };