Merge pull request #142074 from NixOS/home-assistant

home-assistant: 2021.10.4 -> 2021.10.6

authored by

Martin Weinelt and committed by
GitHub
106ef6c0 11dab9f5

+35 -13
+9 -5
pkgs/development/python-modules/crownstone-cloud/default.nix
··· 10 11 buildPythonPackage rec { 12 pname = "crownstone-cloud"; 13 - version = "1.4.5"; 14 format = "setuptools"; 15 16 disabled = pythonOlder "3.8"; ··· 18 src = fetchFromGitHub { 19 owner = "crownstone"; 20 repo = "crownstone-lib-python-cloud"; 21 - rev = "v${version}"; 22 - sha256 = "1a8bkqkrc7iyggr5rr20qdqg67sycdx2d94dd1ylkmr7627r34ys"; 23 }; 24 25 propagatedBuildInputs = [ ··· 32 pytestCheckHook 33 ]; 34 35 postPatch = '' 36 - substituteInPlace requirements.txt \ 37 - --replace "codecov>=2.1.10" "" 38 ''; 39 40 pythonImportsCheck = [
··· 10 11 buildPythonPackage rec { 12 pname = "crownstone-cloud"; 13 + version = "1.4.8"; 14 format = "setuptools"; 15 16 disabled = pythonOlder "3.8"; ··· 18 src = fetchFromGitHub { 19 owner = "crownstone"; 20 repo = "crownstone-lib-python-cloud"; 21 + rev = version; 22 + sha256 = "sha256-iHn4g52/QM0TS/flKkcFrX6IFrCjiXUxcjVLHNg6tVo="; 23 }; 24 25 propagatedBuildInputs = [ ··· 32 pytestCheckHook 33 ]; 34 35 + disabledTests = [ 36 + # https://github.com/crownstone/crownstone-lib-python-cloud/issues/1 37 + "test_data_structure" 38 + ]; 39 + 40 postPatch = '' 41 + sed -i '/codecov/d' requirements.txt 42 ''; 43 44 pythonImportsCheck = [
+8 -4
pkgs/development/python-modules/simplisafe-python/default.nix
··· 1 { lib 2 , aiohttp 3 - , aioresponses 4 , asynctest 5 , backoff 6 , buildPythonPackage 7 , fetchFromGitHub 8 , poetry-core 9 , pytest-aiohttp 10 , pytestCheckHook 11 , pythonOlder 12 , pytz 13 , types-pytz 14 , voluptuous 15 }: 16 17 buildPythonPackage rec { 18 pname = "simplisafe-python"; 19 - version = "11.0.6"; 20 format = "pyproject"; 21 disabled = pythonOlder "3.7"; 22 ··· 24 owner = "bachya"; 25 repo = pname; 26 rev = version; 27 - sha256 = "sha256-XVn/GBcTTthvsRJOnCZ0yOF3nUwbBZ2dfMJZsJXnE6U="; 28 }; 29 30 nativeBuildInputs = [ poetry-core ]; ··· 35 pytz 36 types-pytz 37 voluptuous 38 ]; 39 40 checkInputs = [ 41 - aioresponses 42 asynctest 43 pytest-aiohttp 44 pytestCheckHook 45 ]; 46
··· 1 { lib 2 , aiohttp 3 + , aresponses 4 , asynctest 5 , backoff 6 , buildPythonPackage 7 , fetchFromGitHub 8 , poetry-core 9 , pytest-aiohttp 10 + , pytest-asyncio 11 , pytestCheckHook 12 , pythonOlder 13 , pytz 14 , types-pytz 15 , voluptuous 16 + , websockets 17 }: 18 19 buildPythonPackage rec { 20 pname = "simplisafe-python"; 21 + version = "12.0.2"; 22 format = "pyproject"; 23 disabled = pythonOlder "3.7"; 24 ··· 26 owner = "bachya"; 27 repo = pname; 28 rev = version; 29 + sha256 = "sha256-/KnDsnx+Jrirj6uBkdao6PI2jhtzKqDK6cmmQgsO5T4="; 30 }; 31 32 nativeBuildInputs = [ poetry-core ]; ··· 37 pytz 38 types-pytz 39 voluptuous 40 + websockets 41 ]; 42 43 checkInputs = [ 44 + aresponses 45 asynctest 46 pytest-aiohttp 47 + pytest-asyncio 48 pytestCheckHook 49 ]; 50
+2 -2
pkgs/servers/home-assistant/component-packages.nix
··· 2 # Do not edit! 3 4 { 5 - version = "2021.10.4"; 6 components = { 7 "abode" = ps: with ps; [ abodepy ]; 8 "accuweather" = ps: with ps; [ accuweather ]; ··· 151 "cover" = ps: with ps; [ ]; 152 "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy 153 "cpuspeed" = ps: with ps; [ py-cpuinfo ]; 154 - "crownstone" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; # missing inputs: crownstone-cloud crownstone-sse crownstone-uart 155 "cups" = ps: with ps; [ pycups ]; 156 "currencylayer" = ps: with ps; [ ]; 157 "daikin" = ps: with ps; [ pydaikin ];
··· 2 # Do not edit! 3 4 { 5 + version = "2021.10.6"; 6 components = { 7 "abode" = ps: with ps; [ abodepy ]; 8 "accuweather" = ps: with ps; [ accuweather ]; ··· 151 "cover" = ps: with ps; [ ]; 152 "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy 153 "cpuspeed" = ps: with ps; [ py-cpuinfo ]; 154 + "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud crownstone-sse crownstone-uart pyserial pyudev ]; 155 "cups" = ps: with ps; [ pycups ]; 156 "currencylayer" = ps: with ps; [ ]; 157 "daikin" = ps: with ps; [ pydaikin ];
+16 -2
pkgs/servers/home-assistant/default.nix
··· 68 # Pinned due to API changes in 0.1.0 69 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") 70 71 # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment 72 (self: super: { 73 total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { ··· 114 extraBuildInputs = extraPackages py.pkgs; 115 116 # Don't forget to run parse-requirements.py after updating 117 - hassVersion = "2021.10.4"; 118 119 in with py.pkgs; buildPythonApplication rec { 120 pname = "homeassistant"; ··· 131 owner = "home-assistant"; 132 repo = "core"; 133 rev = version; 134 - sha256 = "1cl0h15285x7xba425d9anv882adi6bdqx4i3cicg3gf0nzcc8am"; 135 }; 136 137 # leave this in, so users don't have to constantly update their downstream patch handling
··· 68 # Pinned due to API changes in 0.1.0 69 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") 70 71 + # Pinned due to missing simpliypy.errors.PendingAuthorizationError in simplisafe-python>12 which results in a failing import 72 + (self: super: { 73 + simplisafe-python = super.simplisafe-python.overridePythonAttrs (oldAttrs: rec { 74 + version = "11.0.7"; 75 + src = fetchFromGitHub { 76 + owner = "bachya"; 77 + repo = "simplisafe-python"; 78 + rev = version; 79 + sha256 = "02nrighkdcd5n9qgbizm9gyfnpgdm4iibw7y8nbyfaxpng069fzp"; 80 + }; 81 + checkInputs = oldAttrs.checkInputs ++ [ super.aioresponses ]; 82 + }); 83 + }) 84 + 85 # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment 86 (self: super: { 87 total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { ··· 128 extraBuildInputs = extraPackages py.pkgs; 129 130 # Don't forget to run parse-requirements.py after updating 131 + hassVersion = "2021.10.6"; 132 133 in with py.pkgs; buildPythonApplication rec { 134 pname = "homeassistant"; ··· 145 owner = "home-assistant"; 146 repo = "core"; 147 rev = version; 148 + sha256 = "0275f327dzr4cggfw5n8x533b4h8zz8yli5d0js7cw1rmi3cmkbc"; 149 }; 150 151 # leave this in, so users don't have to constantly update their downstream patch handling