Merge pull request #195278 from NixOS/home-assistant

This commit is contained in:
Martin Weinelt 2022-10-09 23:10:35 +02:00 committed by GitHub
commit 34c5293a71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 42 additions and 32 deletions

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiounifi"; pname = "aiounifi";
version = "37"; version = "38";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Kane610"; owner = "Kane610";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-VKR01lbXznkO/OQvvxvMJOjPIPSynLWT6G/YV4Essy0="; hash = "sha256-NKraMxpP9O22NzO4UDl6zYBeJldTRdf4U43WVQYcPyQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bellows"; pname = "bellows";
version = "0.34.1"; version = "0.34.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "bellows"; repo = "bellows";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-a2skDJVqbct1+Ky2D8LXv8VMqFwqznUzXh+o+M6GtvQ="; sha256 = "sha256-78LUQBFV4TFPDLiSHBG+RLnQLaCPX4LZpow9aszQAQA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -12,14 +12,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydaikin"; pname = "pydaikin";
version = "2.7.0"; version = "2.7.2";
format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromBitbucket { src = fetchFromBitbucket {
owner = "mustang51"; owner = "mustang51";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg="; hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -28,17 +30,15 @@ buildPythonPackage rec {
urllib3 urllib3
]; ];
# while they have tests, they do not run them in their CI and they fail as of 2.7.0
# AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
doCheck = false;
checkInputs = [ checkInputs = [
freezegun freezegun
pytest-aiohttp pytest-aiohttp
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "pydaikin" ]; pythonImportsCheck = [
"pydaikin"
];
meta = with lib; { meta = with lib; {
description = "Python Daikin HVAC appliances interface"; description = "Python Daikin HVAC appliances interface";

View File

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, poetry-core , poetry-core
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
@ -20,6 +21,14 @@ buildPythonPackage rec {
hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc="; hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc=";
}; };
patches = [
(fetchpatch {
# https://github.com/nficano/humps/pull/281
url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch";
hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymicrobot"; pname = "pymicrobot";
version = "0.0.6"; version = "0.0.8";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "PyMicroBot"; pname = "PyMicroBot";
inherit version; inherit version;
hash = "sha256-BvxF/9bnA0oXCAXq1GXoR7AUnPF9hQLxmlOHxfYX+u8="; hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyoverkiz"; pname = "pyoverkiz";
version = "1.5.4"; version = "1.5.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,9 +24,14 @@ buildPythonPackage rec {
owner = "iMicknl"; owner = "iMicknl";
repo = "python-overkiz-api"; repo = "python-overkiz-api";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-+2L62GG9amP+0RROk9GzJqcaXsXCv+BMmMyUMH7VxYI="; hash = "sha256-5HoCoVgq1pg+VxD324Fijosk2ln4sGE0oWpemFVAsfc=";
}; };
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"'
'';
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];
@ -45,11 +50,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.10.0"' 'backoff = "*"'
'';
pythonImportsCheck = [ pythonImportsCheck = [
"pyoverkiz" "pyoverkiz"
]; ];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy-xbee"; pname = "zigpy-xbee";
version = "0.16.0"; version = "0.16.1";
# https://github.com/Martiusweb/asynctest/issues/152 # https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and # broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8 # is used exclusively by home-assistant with python 3.8
@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "zigpy-xbee"; repo = "zigpy-xbee";
rev = version; rev = "refs/tags/${version}";
sha256 = "sha256-0Eg+XaMDEB3Zh0Ksn8Nsaf7AYdhRqzpscuZIz19DxCI="; sha256 = "sha256-75LftepCexIsqVMgrJKeTJWHlPI5zcj2aZbJt09JSwE=";
}; };
buildInputs = [ buildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy-zigate"; pname = "zigpy-zigate";
version = "0.10.0"; version = "0.10.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = "zigpy-zigate"; repo = "zigpy-zigate";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-JcKmLD3ET17PaNm1DoAV8TDMw88Qd5okDPOStLUqASM="; hash = "sha256-g6EFc9z9LrUawDczgGaIt5o+Vgp5U3swJJD8VftL4bQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy-znp"; pname = "zigpy-znp";
version = "0.9.0"; version = "0.9.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-GvGWda+vsDwJrRIjc3hkl9zMrJ/cj2HGvHSeCROE69g="; sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy"; pname = "zigpy";
version = "0.51.2"; version = "0.51.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = "zigpy"; repo = "zigpy";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6JHj75ntbW3Pu4P6/nw0/xhZ+fZCfpNCzB1ZB7WJ0jY="; hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2022.10.1"; version = "2022.10.2";
components = { components = {
"abode" = ps: with ps; [ "abode" = ps: with ps; [
abodepy abodepy

View File

@ -261,7 +261,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2022.10.1"; hassVersion = "2022.10.2";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
hash = "sha256-+hf+Qjj/UrEJ8gHsaXZonKkANVJpjEsb5HoaSbsCFJ8="; hash = "sha256-bx4bixTWeOho8MG5yPBmVp07a7k8xfCli8OhQovG7Qw=";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling
@ -302,6 +302,7 @@ in python.pkgs.buildPythonApplication rec {
"orjson" "orjson"
"PyJWT" "PyJWT"
"requests" "requests"
"typing-extensions"
"yarl" "yarl"
]; ];
in '' in ''