cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

homeassistant: 0.115.6 -> 0.116.0

Browse source
This commit is contained in:
Martin Weinelt 2020-10-07 20:28:25 +02:00
parent 2721442187
commit 9cf3b6a473
5 changed files with 17 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.115.6";
version = "0.116.0";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ ]; # missing inputs: accuweather
@ -303,6 +303,7 @@
"glances" = ps: with ps; [ ]; # missing inputs: glances_api
"gntp" = ps: with ps; [ ]; # missing inputs: gntp
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
"goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
"gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
"google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ];
@ -364,7 +365,7 @@
"hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
"hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
"hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser
"hyperion" = ps: with ps; [ ];
"hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
"ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
@ -565,7 +566,8 @@
"oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
"ohmconnect" = ps: with ps; [ defusedxml ];
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
"onboarding" = ps: with ps; [ aiohttp-cors pillow ];
"omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic
"onboarding" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
"onewire" = ps: with ps; [ ]; # missing inputs: pyownet
"onkyo" = ps: with ps; [ onkyo-eiscp ];
"onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async
@ -682,6 +684,7 @@
"rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO
"rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled
"rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio
"rpi_power" = ps: with ps; [ ]; # missing inputs: rpi-bad-power
"rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf
"rss_feed_template" = ps: with ps; [ aiohttp-cors ];
"rtorrent" = ps: with ps; [ ];
@ -762,7 +765,7 @@
"spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
"speedtestdotnet" = ps: with ps; [ speedtest-cli ];
"spider" = ps: with ps; [ ]; # missing inputs: spiderpy
"splunk" = ps: with ps; [ ];
"splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk
"spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime
"spotify" = ps: with ps; [ aiohttp-cors spotipy ];
"sql" = ps: with ps; [ sqlalchemy ];
@ -809,7 +812,6 @@
"tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
"tcp" = ps: with ps; [ ];
"ted5000" = ps: with ps; [ xmltodict ];
"teksavvy" = ps: with ps; [ ];
"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; [ ]; # missing inputs: tellduslive
@ -957,6 +959,7 @@
"zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; # missing inputs: zigpy-znp
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
"zodiac" = ps: with ps; [ ];
"zone" = ps: with ps; [ ];
"zoneminder" = ps: with ps; [ zm-py ];
"zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];

15
pkgs/servers/home-assistant/default.nix
View file

@ -68,18 +68,14 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.115.6";
hassVersion = "0.116.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
version = assert (componentPackages.version == hassVersion); hassVersion;
disabled = pythonOlder "3.5";
patches = [
./relax-dependencies.patch
./fix-media-path-test.patch
];
# check REQUIRED_PYTHON_VER in homeassistant/const.py
disabled = pythonOlder "3.7.1";
inherit availableComponents;
@ -88,12 +84,15 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "07j54glcpa5ngkr0pwdg44f8gas3jz3nh653mr5sb5wg7xspgcr8";
sha256 = "1bqpk9dpra53yhasmp0yb7kzmfwdvlhb7jrf6wyv12rwzf8wy5w7";
};
postPatch = ''
substituteInPlace setup.py \
--replace "cryptography==2.9.2" "cryptography" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" \
--replace "yarl==1.4.2" "yarl~=1.4"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';
propagatedBuildInputs = [

24
pkgs/servers/home-assistant/fix-media-path-test.patch
View file

@ -1,24 +0,0 @@
diff --git a/tests/test_config.py b/tests/test_config.py
index fb22ee1118..1b87e32fe7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -440,7 +440,7 @@ async def test_loading_configuration(hass):
"allowlist_external_dirs": "/etc",
"external_url": "https://www.example.com",
"internal_url": "http://example.local",
- "media_dirs": {"mymedia": "/usr"},
+ "media_dirs": {"mymedia": "/build/media"},
},
)
@@ -454,8 +454,8 @@ async def test_loading_configuration(hass):
assert hass.config.internal_url == "http://example.local"
assert len(hass.config.allowlist_external_dirs) == 3
assert "/etc" in hass.config.allowlist_external_dirs
- assert "/usr" in hass.config.allowlist_external_dirs
- assert hass.config.media_dirs == {"mymedia": "/usr"}
+ assert "/build/media" in hass.config.allowlist_external_dirs
+ assert hass.config.media_dirs == {"mymedia": "/build/media"}
assert hass.config.config_source == config_util.SOURCE_YAML

4
pkgs/servers/home-assistant/frontend.nix
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 = "20200918.2";
version = "20201001.1";
src = fetchPypi {
inherit pname version;
sha256 = "1gmk5rbfyqanj30dinfphxrsji4l1yiya2p0ahybyjb9fbzz9cl4";
sha256 = "0y24017jdbhc7yh8r3c97qk7ygcjlg0b5r3p2j4yqipk213jp5nl";
};
# no Python tests implemented

21
pkgs/servers/home-assistant/relax-dependencies.patch
View file

@ -1,21 +0,0 @@
diff --git a/setup.py b/setup.py
index 81f8727ed6..12200e0b9f 100755
--- a/setup.py
+++ b/setup.py
@@ -43,13 +43,13 @@ REQUIRES = [
"jinja2>=2.11.1",
"PyJWT==1.7.1",
# PyJWT has loose dependency. We want the latest one.
- "cryptography==2.9.2",
+ "cryptography>=2.9.2",
"pip>=8.0.3",
"python-slugify==4.0.1",
"pytz>=2020.1",
"pyyaml==5.3.1",
- "requests==2.24.0",
- "ruamel.yaml==0.15.100",
+ "requests>=2.23.0",
+ "ruamel.yaml>=0.15.100",
"voluptuous==0.11.7",
"voluptuous-serialize==2.4.0",
"yarl==1.4.2",