From 7605be6416e198af5f8d5134a72a467e1a07fc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jan 2024 00:08:43 -0800 Subject: [PATCH 1/5] python311Packages.python-homewizard-energy: 4.1.1 -> 4.2.2 Diff: https://github.com/DCSBL/python-homewizard-energy/compare/refs/tags/v4.1.1...v4.2.2 Changelog: https://github.com/homewizard/python-homewizard-energy/releases/tag/v4.2.0 https://github.com/homewizard/python-homewizard-energy/releases/tag/v4.2.1 https://github.com/homewizard/python-homewizard-energy/releases/tag/v4.2.2 --- .../python-modules/python-homewizard-energy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index ca6c2770db46..7ecd509f9b5d 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "4.1.1"; - format = "pyproject"; + version = "4.2.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-p7uwodjC+wTGrlKf4i4ZRTPg9Qh9krsmwPpWNdF6J4U="; + hash = "sha256-CNSZBH+D74Y71k7Ws0OlgN1/i/lWXlkz6MC3IXL5ycQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; nativeBuildInputs = [ From f4e83ac38d76dbf3a1eccdff0efe2efc794b14d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jan 2024 15:17:59 -0800 Subject: [PATCH 2/5] python311Packages.insteon-frontend-home-assistant: 0.3.5-1 -> 0.5.0 Changelog: https://github.com/pyinsteon/insteon-panel/releases/tag/0.4.0 https://github.com/pyinsteon/insteon-panel/releases/tag/0.5.0 --- .../default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 2a6e9f0556a9..7c8536e1466a 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -4,33 +4,22 @@ , fetchPypi , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.5-1"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-R+P4pgKbLvf0mwpSDoujCvlJe/yS+nvSJ7ewLVOOg/0="; + hash = "sha256-NZwnx8tlXnsVCk4nvNjOg3cjSr2CnjqWcZG7xFTC2wA="; }; - patches = [ - # https://github.com/pyinsteon/insteon-panel/pull/33 - (fetchpatch { - name = "unpin-setuptools.patch"; - url = "https://github.com/pyinsteon/insteon-panel/commit/2297eb05668907edd03633f244e5876990e340c7.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools - wheel ]; # upstream has no tests From d202100e935059bd929beaf210ca5c0cce248522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jan 2024 15:07:15 -0800 Subject: [PATCH 3/5] home-assistant: 2024.1.5 -> 2024.1.6 https://github.com/home-assistant/core/releases/tag/2024.1.6 --- .../home-assistant/component-packages.nix | 3 ++- pkgs/servers/home-assistant/default.nix | 24 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a00b6523d995..4c663a1ad9f8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.1.5"; + version = "2024.1.6"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -1676,6 +1676,7 @@ aiohttp-zlib-ng fnv-hash-fast gcal-sync + ical oauth2client psutil-home-assistant sqlalchemy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 17e142b6ab43..9585fa8c600b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -46,6 +46,24 @@ let ]; }); + aiohttp = super.aiohttp.overridePythonAttrs (old: rec { + version = "3.9.3"; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiohttp"; + rev = "refs/tags/v${version}"; + hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE="; + }; + nativeCheckInputs = with self; [ + freezegun + gunicorn + pytest-mock + pytestCheckHook + python-on-whales + re-assert + ]; + }); + aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec { version = "2023.05.5"; src = fetchFromGitHub { @@ -448,7 +466,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.1.5"; + hassVersion = "2024.1.6"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -466,13 +484,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-6HPHoUpS2WXbYx7Tbqp9LLo25DyNzNd/THpSo7Y43Jw="; + hash = "sha256-zCpdOl16ZkO9mr0nYZg1mlnGNaPaX0RALFEDRHGfKvM="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-cptN6NgB/1qnvz+/EqDBQiH2vSQsOeSljSVFZBFXR5Y="; + hash = "sha256-ipAw+vqePa5KA/Gqhl3WsQbzmzMXjmVx0NvbrM84SKg="; }; nativeBuildInputs = with python.pkgs; [ From 416e2ec40444e842d26d1464aa70017b8d2b5b68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 31 Jan 2024 17:12:05 +0100 Subject: [PATCH 4/5] python311Packages.homeassistant-stubs: 2024.1.5 -> 2024.1.6 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.1.6 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 8d49399e36f3..6638a50683c4 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.1.5"; + version = "2024.1.6"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-mS9GsJwscLQu+vApoxIWE1tZUcu3B3CTMFrcu96POEY="; + hash = "sha256-htFz3Cw5AvI1h2YvECOJdMA4N3JAQRRRhx1tfR4h5co="; }; nativeBuildInputs = [ From a6b3f287876a543dbdb2efe402dc7f7c445c07e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 31 Jan 2024 17:13:37 +0100 Subject: [PATCH 5/5] home-assistant-custom-lovelace-modules.mushroom: 3.2.4 -> 3.4.0 https://github.com/piitaya/lovelace-mushroom/releases/tag/v3.4.0 --- .../custom-lovelace-modules/mushroom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 6e8eab20b359..9c1df1db27db 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.2.4"; + version = "3.4.0"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-UV/kqeVslB1lc1a9uvj8ocQKeAVINwo3aH8oHC9GLBQ="; + hash = "sha256-XVi+VPOVHfYBlIY9xN7x9Qe1bVw/qS9p8bcRZb0ksE0="; }; - npmDepsHash = "sha256-p43ks6HM23LK3LOBOZA0uV+DTOj89/boBpjcXpbcw24="; + npmDepsHash = "sha256-XtSeO5+RaBCBLmq6paRX9KipkhcEdJhzrQeEDdysZE0="; installPhase = '' runHook preInstall