kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

home-assistant: 0.100.3 -> 0.103.6

Browse Source
wip/yesman
Jörg Thalheim 5 years ago
parent 2148e53664
commit b2dbc1edd1
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
3 changed files with 55 additions and 71 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 51
      pkgs/servers/home-assistant/component-packages.nix
  2. 71
      pkgs/servers/home-assistant/default.nix
  3. 4
      pkgs/servers/home-assistant/frontend.nix

51
pkgs/servers/home-assistant/component-packages.nix
Unescape View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.100.3";
version = "0.103.6";
components = {
"abode" = ps: with ps; [ ];
"acer_projector" = ps: with ps; [ pyserial ];
@ -11,6 +11,7 @@
"ads" = ps: with ps; [ ];
"aftership" = ps: with ps; [ ];
"air_quality" = ps: with ps; [ ];
"airly" = ps: with ps; [ ];
"airvisual" = ps: with ps; [ pyairvisual ];
"aladdin_connect" = ps: with ps; [ ];
"alarm_control_panel" = ps: with ps; [ ];
@ -18,6 +19,7 @@
"alarmdotcom" = ps: with ps; [ ];
"alert" = ps: with ps; [ ];
"alexa" = ps: with ps; [ aiohttp-cors ];
"almond" = ps: with ps; [ aiohttp-cors ];
"alpha_vantage" = ps: with ps; [ ];
"amazon_polly" = ps: with ps; [ boto3 ];
"ambiclimate" = ps: with ps; [ ];
@ -28,11 +30,12 @@
"androidtv" = ps: with ps; [ ];
"anel_pwrctrl" = ps: with ps; [ ];
"anthemav" = ps: with ps; [ ];
"apache_kafka" = ps: with ps; [ ];
"apache_kafka" = ps: with ps; [ aiokafka ];
"apcupsd" = ps: with ps; [ ];
"api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ];
"apple_tv" = ps: with ps; [ pyatv ];
"apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ ];
"aqualogic" = ps: with ps; [ ];
"aquostv" = ps: with ps; [ ];
@ -45,6 +48,7 @@
"asterisk_cdr" = ps: with ps; [ ];
"asterisk_mbox" = ps: with ps; [ ];
"asuswrt" = ps: with ps; [ ];
"aten_pe" = ps: with ps; [ ];
"atome" = ps: with ps; [ ];
"august" = ps: with ps; [ ];
"aurora" = ps: with ps; [ ];
@ -58,6 +62,7 @@
"aws" = ps: with ps; [ ];
"axis" = ps: with ps; [ ];
"azure_event_hub" = ps: with ps; [ ];
"azure_service_bus" = ps: with ps; [ azure-servicebus ];
"baidu" = ps: with ps; [ ];
"bayesian" = ps: with ps; [ ];
"bbb_gpio" = ps: with ps; [ ];
@ -105,7 +110,7 @@
"clicksend" = ps: with ps; [ ];
"clicksend_tts" = ps: with ps; [ ];
"climate" = ps: with ps; [ ];
"cloud" = ps: with ps; [ aiohttp-cors ];
"cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ];
"cloudflare" = ps: with ps; [ ];
"cmus" = ps: with ps; [ ];
"co2signal" = ps: with ps; [ ];
@ -134,7 +139,7 @@
"deconz" = ps: with ps; [ ];
"decora" = ps: with ps; [ ];
"decora_wifi" = ps: with ps; [ ];
"default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ];
"default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf ];
"delijn" = ps: with ps; [ ];
"deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ];
@ -158,11 +163,12 @@
"dlna_dmr" = ps: with ps; [ ];
"dnsip" = ps: with ps; [ aiodns ];
"dominos" = ps: with ps; [ aiohttp-cors ];
"doods" = ps: with ps; [ ];
"doods" = ps: with ps; [ pillow ];
"doorbird" = ps: with ps; [ ];
"dovado" = ps: with ps; [ ];
"downloader" = ps: with ps; [ ];
"dsmr" = ps: with ps; [ ];
"dsmr_reader" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
"dte_energy_bridge" = ps: with ps; [ ];
"dublin_bus_transport" = ps: with ps; [ ];
"duckdns" = ps: with ps; [ ];
@ -230,6 +236,7 @@
"flexit" = ps: with ps; [ ];
"flic" = ps: with ps; [ ];
"flock" = ps: with ps; [ ];
"flume" = ps: with ps; [ ];
"flunearyou" = ps: with ps; [ ];
"flux" = ps: with ps; [ ];
"flux_led" = ps: with ps; [ ];
@ -264,6 +271,7 @@
"geo_rss_events" = ps: with ps; [ ];
"geofency" = ps: with ps; [ aiohttp-cors ];
"geonetnz_quakes" = ps: with ps; [ ];
"geonetnz_volcano" = ps: with ps; [ ];
"github" = ps: with ps; [ PyGithub ];
"gitlab_ci" = ps: with ps; [ python-gitlab ];
"gitter" = ps: with ps; [ ];
@ -290,7 +298,6 @@
"growatt_server" = ps: with ps; [ ];
"gstreamer" = ps: with ps; [ ];
"gtfs" = ps: with ps; [ ];
"gtt" = ps: with ps; [ ];
"habitica" = ps: with ps; [ ];
"hangouts" = ps: with ps; [ ];
"harman_kardon_avr" = ps: with ps; [ ];
@ -304,7 +311,7 @@
"here_travel_time" = ps: with ps; [ ];
"hikvision" = ps: with ps; [ ];
"hikvisioncam" = ps: with ps; [ ];
"hipchat" = ps: with ps; [ ];
"hisense_aehw4a1" = ps: with ps; [ ];
"history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
"history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ];
"history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ];
@ -324,12 +331,11 @@
"html5" = ps: with ps; [ aiohttp-cors pywebpush ];
"http" = ps: with ps; [ aiohttp-cors ];
"htu21d" = ps: with ps; [ ];
"huawei_lte" = ps: with ps; [ ];
"huawei_lte" = ps: with ps; [ stringcase ];
"huawei_router" = ps: with ps; [ ];
"hue" = ps: with ps; [ aiohue ];
"hunterdouglas_powerview" = ps: with ps; [ ];
"hydrawise" = ps: with ps; [ ];
"hydroquebec" = ps: with ps; [ ];
"hyperion" = ps: with ps; [ ];
"ialarm" = ps: with ps; [ ];
"iaqualink" = ps: with ps; [ ];
@ -339,7 +345,7 @@
"iglo" = ps: with ps; [ ];
"ign_sismologia" = ps: with ps; [ ];
"ihc" = ps: with ps; [ defusedxml ];
"image_processing" = ps: with ps; [ aiohttp-cors pillow ];
"image_processing" = ps: with ps; [ aiohttp-cors ];
"imap" = ps: with ps; [ ];
"imap_email_content" = ps: with ps; [ ];
"incomfort" = ps: with ps; [ ];
@ -351,6 +357,7 @@
"input_text" = ps: with ps; [ ];
"insteon" = ps: with ps; [ ];
"integration" = ps: with ps; [ ];
"intent" = ps: with ps; [ aiohttp-cors ];
"intent_script" = ps: with ps; [ ];
"ios" = ps: with ps; [ aiohttp-cors zeroconf ];
"iota" = ps: with ps; [ ];
@ -470,6 +477,7 @@
"mqtt_json" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
"mqtt_room" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
"mqtt_statestream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
"msteams" = ps: with ps; [ ];
"mvglive" = ps: with ps; [ PyMVGLive ];
"mychevy" = ps: with ps; [ ];
"mycroft" = ps: with ps; [ ];
@ -538,6 +546,7 @@
"openweathermap" = ps: with ps; [ pyowm ];
"opple" = ps: with ps; [ ];
"orangepi_gpio" = ps: with ps; [ ];
"oru" = ps: with ps; [ ];
"orvibo" = ps: with ps; [ ];
"osramlightify" = ps: with ps; [ ];
"otp" = ps: with ps; [ pyotp ];
@ -548,6 +557,7 @@
"pandora" = ps: with ps; [ pexpect ];
"panel_custom" = ps: with ps; [ aiohttp-cors ];
"panel_iframe" = ps: with ps; [ aiohttp-cors ];
"pcal9535a" = ps: with ps; [ ];
"pencom" = ps: with ps; [ ];
"persistent_notification" = ps: with ps; [ ];
"person" = ps: with ps; [ ];
@ -572,6 +582,7 @@
"prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
"prowl" = ps: with ps; [ ];
"proximity" = ps: with ps; [ ];
"proxmoxve" = ps: with ps; [ ];
"proxy" = ps: with ps; [ pillow ];
"ps4" = ps: with ps; [ ];
"ptvsd" = ps: with ps; [ ];
@ -647,7 +658,7 @@
"serial" = ps: with ps; [ pyserial-asyncio ];
"serial_pm" = ps: with ps; [ ];
"sesame" = ps: with ps; [ ];
"seven_segments" = ps: with ps; [ ];
"seven_segments" = ps: with ps; [ pillow ];
"seventeentrack" = ps: with ps; [ ];
"shell_command" = ps: with ps; [ ];
"shiftr" = ps: with ps; [ paho-mqtt ];
@ -658,6 +669,7 @@
"simplepush" = ps: with ps; [ ];
"simplisafe" = ps: with ps; [ ];
"simulated" = ps: with ps; [ ];
"sinch" = ps: with ps; [ ];
"sisyphus" = ps: with ps; [ ];
"sky_hub" = ps: with ps; [ ];
"skybeacon" = ps: with ps; [ ];
@ -679,9 +691,10 @@
"socialblade" = ps: with ps; [ ];
"solaredge" = ps: with ps; [ stringcase ];
"solaredge_local" = ps: with ps; [ ];
"solarlog" = ps: with ps; [ ];
"solax" = ps: with ps; [ ];
"soma" = ps: with ps; [ ];
"somfy" = ps: with ps; [ ];
"somfy" = ps: with ps; [ aiohttp-cors ];
"somfy_mylink" = ps: with ps; [ ];
"sonarr" = ps: with ps; [ ];
"songpal" = ps: with ps; [ ];
@ -697,7 +710,8 @@
"spotify" = ps: with ps; [ aiohttp-cors ];
"sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ ];
"ssdp" = ps: with ps; [ netdisco ];
"ssdp" = ps: with ps; [ defusedxml netdisco ];
"starline" = ps: with ps; [ ];
"starlingbank" = ps: with ps; [ ];
"startca" = ps: with ps; [ xmltodict ];
"statistics" = ps: with ps; [ ];
@ -706,7 +720,7 @@
"stiebel_eltron" = ps: with ps; [ ];
"stream" = ps: with ps; [ aiohttp-cors av ];
"streamlabswater" = ps: with ps; [ ];
"stride" = ps: with ps; [ ];
"stt" = ps: with ps; [ aiohttp-cors ];
"suez_water" = ps: with ps; [ ];
"sun" = ps: with ps; [ ];
"supervisord" = ps: with ps; [ ];
@ -735,14 +749,14 @@
"tcp" = ps: with ps; [ ];
"ted5000" = ps: with ps; [ xmltodict ];
"teksavvy" = ps: with ps; [ ];
"telegram" = ps: with ps; [ aiohttp-cors python-telegram-bot ];
"telegram_bot" = ps: with ps; [ aiohttp-cors python-telegram-bot ];
"telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
"telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
"tellduslive" = ps: with ps; [ ];
"tellstick" = ps: with ps; [ ];
"telnet" = ps: with ps; [ ];
"temper" = ps: with ps; [ ];
"template" = ps: with ps; [ ];
"tensorflow" = ps: with ps; [ numpy protobuf tensorflow ];
"tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow ];
"tesla" = ps: with ps; [ ];
"tfiac" = ps: with ps; [ ];
"thermoworks_smoke" = ps: with ps; [ stringcase ];
@ -789,6 +803,7 @@
"uk_transport" = ps: with ps; [ ];
"unifi" = ps: with ps; [ aiounifi ];
"unifi_direct" = ps: with ps; [ pexpect ];
"unifiled" = ps: with ps; [ ];
"universal" = ps: with ps; [ ];
"upc_connect" = ps: with ps; [ ];
"upcloud" = ps: with ps; [ ];
@ -808,6 +823,7 @@
"venstar" = ps: with ps; [ ];
"vera" = ps: with ps; [ ];
"verisure" = ps: with ps; [ ];
"versasense" = ps: with ps; [ ];
"version" = ps: with ps; [ pyhaversion ];
"vesync" = ps: with ps; [ ];
"viaggiatreno" = ps: with ps; [ ];
@ -839,6 +855,7 @@
"wink" = ps: with ps; [ ];
"wirelesstag" = ps: with ps; [ ];
"withings" = ps: with ps; [ aiohttp-cors ];
"wled" = ps: with ps; [ ];
"workday" = ps: with ps; [ holidays ];
"worldclock" = ps: with ps; [ ];
"worldtidesinfo" = ps: with ps; [ ];

71
pkgs/servers/home-assistant/default.nix
Unescape View File

@ -1,7 +1,7 @@
{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6
# Look up dependencies of specified components in component-packages.nix
, extraComponents ? []
, extraComponents ? [ ]
# Additional packages to add to propagatedBuildInputs
, extraPackages ? ps: []
@ -21,44 +21,15 @@ let
defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py
# (mkOverride "aiohttp" "3.5.4"
# "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf")
# (mkOverride "astral" "1.10.1"
# "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
# (mkOverride "async-timeout" "3.0.1"
# "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
# (mkOverride "bcrypt" "3.1.7"
# "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42")
# (mkOverride "pyjwt" "1.7.1"
# "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96")
(mkOverride "cryptography" "2.7" # TODO for 2.8: Remove the override below
"e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6")
(mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7
"f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc")
# (mkOverride "importlib-metadata" "0.18"
# "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db")
(mkOverride "python-slugify" "3.0.4"
"0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap")
# (mkOverride "pyyaml" "5.1.1"
# "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955")
# (mkOverride "requests" "2.22.0"
# "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4")
# (mkOverride "ruamel_yaml" "0.15.97"
# "17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845")
# (mkOverride "voluptuous" "0.11.5"
# "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
# (mkOverride "voluptuous-serialize" "2.1.0"
# "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f")
# used by auth.mfa_modules.totp
(mkOverride "pyotp" "2.2.7"
"be0ffeabddaa5ee53e7204e7740da842d070cf69168247a3d0c08541b84de602")
# used by check_config script
# can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
(mkOverride "colorlog" "4.0.2"
"3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42")
(mkOverride "pyyaml" "5.1.2"
"1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81")
# required by aioesphomeapi
(self: super: {
protobuf = super.protobuf.override {
@ -66,19 +37,6 @@ let
};
})
(self: super: {
# TODO: Remove this override after updating to cryptography 2.8
cryptography = super.cryptography.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.asn1crypto ];
patches = [
(fetchpatch {
url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
})
];
});
})
# hass-frontend does not exist in python3.pkgs
(self: super: {
hass-frontend = self.callPackage ./frontend.nix { };
@ -112,7 +70,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.100.3";
hassVersion = "0.103.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -127,7 +85,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
sha256 = "1rrv71h91qjq5sii4wfcdjvrcpid2aci1dwadrcd35363ff0w200";
sha256 = "1492q4icyhvz30fw5ysrwlnsls4iy5pv62ay3vq1ygcfnlapkqhl";
};
propagatedBuildInputs = [
@ -140,7 +98,15 @@ in with py.pkgs; buildPythonApplication rec {
] ++ componentBuildInputs ++ extraBuildInputs;
checkInputs = [
asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue
asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco hass-nabucasa
];
patches = [
# newer importlib-metadata version
(fetchpatch {
url = "https://github.com/home-assistant/home-assistant/commit/63c6b803dc2d835d57b97ed833ee5cd8318bf7ae.patch";
sha256 = "16q3qdnmgsw5415f70zvsv1z63dljp3c9glv06cyj4s6qsl13xdc";
})
];
postPatch = ''
@ -151,9 +117,10 @@ in with py.pkgs; buildPythonApplication rec {
'';
checkPhase = ''
# The components' dependencies are not included, so they cannot be tested
# test_webhook_create_cloudhook imports hass_nabucasa and is thus excluded
py.test --ignore tests/components -k "not test_webhook_create_cloudhook and not test_webhook_config_flow_registers_webhook"
# - components' dependencies are not included, so they cannot be tested
# - test_merge_id_schema requires pyqwikswitch
# - unclear why test_merge fails: assert merge_log_err.call_count != 0
py.test --ignore tests/components -k "not test_merge_id_schema and not test_merge"
# Some basic components should be tested however
py.test \
tests/components/{api,config,configurator,demo,discovery,frontend,group,history,history_graph} \

4
pkgs/servers/home-assistant/frontend.nix
Unescape View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20190919.0";
version = "20191204.1";
src = fetchPypi {
inherit pname version;
sha256 = "1xdw8fj4njc3sf15mlyiwigrwf89xsz4r2dsv6zs5fnl512r439a";
sha256 = "1agbc8laql9vb9f8qnha2zwah967avfyna0ckdyvvdd6sjwkc0a2";
};
# no Python tests implemented

Write Preview
Loading…
Cancel
Save