From 2d50bdc0afdf47043ee65c1ddb8c96e87b48aba0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Nov 2024 07:52:27 +0100 Subject: [PATCH 1/2] python312Packages.pylamarzocco: 1.2.3 -> 1.2.11 Changelog: https://github.com/zweckj/pylamarzocco/releases/tag/v1.2.11 Renamed from lmcloud --- .../python-modules/{lmcloud => pylamarzocco}/default.nix | 8 ++++---- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{lmcloud => pylamarzocco}/default.nix (89%) diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix similarity index 89% rename from pkgs/development/python-modules/lmcloud/default.nix rename to pkgs/development/python-modules/pylamarzocco/default.nix index ce50a769ced9..c749212aa0b9 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -14,8 +14,8 @@ }: buildPythonPackage rec { - pname = "lmcloud"; - version = "1.2.3"; + pname = "pylamarzocco"; + version = "1.2.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zweckj"; repo = "pylamarzocco"; - rev = "refs/tags/v.${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw="; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with La Marzocco's cloud"; homepage = "https://github.com/zweckj/pylamarzocco"; - changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v.${version}"; + changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1eff1b03fab4..7c18c3d69dd2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -325,6 +325,7 @@ mapAliases ({ linear_operator = linear-operator; # added 2024-01-07 livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 + lmcloud = pylamarzocco; # added 2024-11-26 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b493f35e4161..136c94c73d82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7583,8 +7583,6 @@ self: super: with self; { lm-format-enforcer = callPackage ../development/python-modules/lm-format-enforcer { }; - lmcloud = callPackage ../development/python-modules/lmcloud { }; - lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; }; @@ -11836,6 +11834,8 @@ self: super: with self; { pylama = callPackage ../development/python-modules/pylama { }; + pylamarzocco = callPackage ../development/python-modules/pylamarzocco { }; + pylast = callPackage ../development/python-modules/pylast { }; pylatex = callPackage ../development/python-modules/pylatex { }; From 9b260257ff2bd75531188161e368a7749cea5b27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 00:18:04 +0100 Subject: [PATCH 2/2] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fafe4e209d66..af28371ac6d1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2299,14 +2299,13 @@ hassil home-assistant-intents ifaddr - lmcloud mutagen pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; + ]; # missing inputs: lmcloud "lametric" = ps: with ps; [ demetriek ]; @@ -5458,7 +5457,6 @@ "kostal_plenticore" "kraken" "kulersky" - "lamarzocco" "lametric" "landisgyr_heat_meter" "lastfm"