diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix deleted file mode 100644 index 437f7899fad0..000000000000 --- a/pkgs/development/python-modules/paho-mqtt/1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - isPy3k, - pytestCheckHook, - mock, - six, -}: - -buildPythonPackage rec { - pname = "paho-mqtt"; - version = "1.6.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "eclipse"; - repo = "paho.mqtt.python"; - rev = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; - }; - - nativeCheckInputs = [ - pytestCheckHook - six - ] ++ lib.optionals (!isPy3k) [ mock ]; - - doCheck = !stdenv.hostPlatform.isDarwin; - - pythonImportsCheck = [ "paho.mqtt" ]; - - meta = with lib; { - description = "MQTT version 3.1.1 client class"; - homepage = "https://eclipse.org/paho"; - license = licenses.epl10; - maintainers = with maintainers; [ - mog - dotlambda - ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 23ae502df25c..1ddc78232539 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -433,6 +433,8 @@ mapAliases ({ opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 + paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05 + paho-mqtt_2 = paho-mqtt; # added 2025-03-05 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2245891d3c6..347b47bd98e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10164,9 +10164,7 @@ self: super: with self; { paginate = callPackage ../development/python-modules/paginate { }; - 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_2; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt/default.nix { }; paintcompiler = callPackage ../development/python-modules/paintcompiler { };