python313Packages.paho-mqtt: 1.6.1 -> 2.1.0 (#380736)

NixOS · Feb 10, 2025 · 2cddee3 · 2cddee3
2 parents acafb0e + 19f7ed2
commit 2cddee3
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 { };