From de42430fa79467ff2139cffb3c4442cdc6b1f97b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Aug 2022 00:32:09 +0200 Subject: [PATCH] home-assistant: 2022.8.1 -> 2022.8.2 https://github.com/home-assistant/core/releases/tag/2022.8.2 Pins pydeconz at 102 for yet another API change breaking the tests. --- .../home-assistant/component-packages.nix | 7 +++++-- pkgs/servers/home-assistant/default.nix | 21 ++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1472027b0cb3..addfa0bdc80e 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 = "2022.8.1"; + version = "2022.8.2"; components = { "abode" = ps: with ps; [ abodepy @@ -1048,7 +1048,9 @@ "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ + aiohttp-cors greeclimate + ifaddr ]; "greeneye_monitor" = ps: with ps; [ greeneye-monitor @@ -2235,7 +2237,8 @@ "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ - ]; # missing inputs: gpiozero pigpio + gpiozero + ]; # missing inputs: pigpio "renault" = ps: with ps; [ renault-api ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8cbc601b5a9a..884e6f9401d3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -112,9 +112,6 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -186,6 +183,20 @@ let }); }) + (self: super: { + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { + version = "102"; + src = fetchFromGitHub { + owner = "Kane610"; + repo = "deconz"; + rev = "refs/tags/v${version}"; + hash = "sha256-Dbhp/+xyyWhFcYp2VRnivn5d1JMR5hBctdArIzLKIjM="; + }; + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + }) + + (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; @@ -296,7 +307,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.1"; + hassVersion = "2022.8.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -314,7 +325,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-0QhWusJ7vSiudigJTo4KiXqO0OWgIlvqkSpiK5FFI+g="; + hash = "sha256-82UPZmaSJVO0kmlGuY08vS3y5ai0NtSQ7ntkiOcNc2A="; }; # leave this in, so users don't have to constantly update their downstream patch handling