From f2cc5866e8566db380d34af8a7bcdd394fa03210 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Oct 2022 01:24:46 +0200 Subject: home-assistant: 2022.10.3 -> 2022.10.4 https://github.com/home-assistant/core/releases/tag/2022.10.4 --- pkgs/servers/home-assistant/component-packages.nix | 10 ++-- pkgs/servers/home-assistant/default.nix | 57 ++++++++-------------- pkgs/servers/home-assistant/parse-requirements.py | 5 +- 3 files changed, 28 insertions(+), 44 deletions(-) (limited to 'pkgs/servers/home-assistant') diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 67b74bcbe44bf..813300b1bd8c1 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.10.3"; + version = "2022.10.4"; components = { "abode" = ps: with ps; [ abodepy @@ -635,10 +635,10 @@ zeroconf ]; "dlib_face_detect" = ps: with ps; [ - face_recognition + face-recognition ]; "dlib_face_identify" = ps: with ps; [ - face_recognition + face-recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -1276,12 +1276,12 @@ sqlalchemy ]; "homekit" = ps: with ps; [ - hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash + hap-python ha-ffmpeg ifaddr zeroconf @@ -2369,7 +2369,7 @@ aiohttp-cors ]; "pushbullet" = ps: with ps; [ - pushbullet + pushbullet-py ]; "pushover" = ps: with ps; [ pushover-complete diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 118701d24529f..58fe884f7746a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -40,9 +40,7 @@ let hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; }; }); - }) - (self: super: { bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { version = "0.5.0"; postPatch = null; @@ -54,9 +52,7 @@ let hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; }; }); - }) - (self: super: { blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { version = "2.0.2"; src = fetchFromGitHub { @@ -66,9 +62,7 @@ let hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; }; }); - }) - (self: super: { gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { version = "4.0.0"; src = fetchFromGitHub { @@ -78,10 +72,19 @@ let hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; }; }); - }) - # pytest-aiohttp>0.3.0 breaks home-assistant tests - (self: super: { + hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec { + pname = "ha-hap-python"; + version = "4.5.2"; + src = fetchFromGitHub { + owner = "bdraco"; + repo = "ha-HAP-python"; + rev = "refs/tags/v4.5.2"; + hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig="; + }; + }); + + # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; src = self.fetchPypi { @@ -126,10 +129,8 @@ let zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - }) - # Pinned due to API changes in 0.1.0 - (self: super: { + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; src = super.fetchPypi { @@ -138,10 +139,8 @@ let hash = "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc="; }; }); - }) - # Pinned due to API changes >0.3.5.3 - (self: super: { + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; src = fetchFromGitHub { @@ -151,15 +150,11 @@ let sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; }; }); - }) - (self: super: { pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); - }) - (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -168,9 +163,7 @@ let hash = "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA="; }; }); - }) - (self: super: { pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.0"; src = fetchFromGitHub { @@ -180,9 +173,7 @@ let hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; }); - }) - (self: super: { pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec { version = "0.0.10"; src = super.fetchPypi { @@ -191,10 +182,8 @@ let hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE="; }; }); - }) - # Pinned due to API changes in 0.3.0 - (self: super: { + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; src = fetchFromGitHub { @@ -204,10 +193,8 @@ let hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; }; }); - }) - # Pinned due to API changes in 0.4.0 - (self: super: { + # Pinned due to API changes in 0.4.0 vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { version = "0.3.3"; src = fetchFromGitHub { @@ -217,10 +204,8 @@ let sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; }; }); - }) - # Pinned due to API changes ~1.0 - (self: super: { + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; src = fetchFromGitHub { @@ -230,10 +215,8 @@ let sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; }); - }) - # home-assistant-frontend does not exist in python3.pkgs - (self: super: { + # home-assistant-frontend does not exist in python3.pkgs home-assistant-frontend = self.callPackage ./frontend.nix { }; }) ]; @@ -261,7 +244,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.10.3"; + hassVersion = "2022.10.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +262,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-5ffMs6gXOyg0hhB0Wx4bRmSqkr0uRhNcLhLo1PI2UqE="; + hash = "sha256-949QvezOYW6hA3iU9j2Wu6DhX35CzW0ruwGe3JGPsH4="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b7bf2937a297d..b2d8e49efc582 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -37,10 +37,11 @@ PKG_SET = "home-assistant.python.pkgs" # If some requirements are matched by multiple or no Python packages, the # following can be used to choose the correct one PKG_PREFERENCES = { + "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "ha-av": "av", - "youtube_dl": "youtube-dl-light", + "ha-HAP-python": "hap-python", "tensorflow": "tensorflow", - "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 + "youtube_dl": "youtube-dl-light", } -- cgit 1.4.1