alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #86326 from Mic92/home-assistant

Browse source
This commit is contained in:
Jörg Thalheim 2020-04-29 22:07:19 +01:00 committed by GitHub
parent 9e34c3a0c6 940c4fc4c6
commit 1330dcff09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
View file

@ -1,4 +1,4 @@
From 679364e1cd95dc7179dbd3114ec35b282fbcb0af Mon Sep 17 00:00:00 2001
From 55cb3ba4458bd43588e7921906d091d001130ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 9 Apr 2020 07:20:46 +0100
Subject: [PATCH] setup.py: relax dependencies
@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
setup.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
setup.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
index e0daacd98b..7166f1f228 100755
index 0c56e89b67..ba04546130 100755
--- a/setup.py
+++ b/setup.py
@@ -32,10 +32,10 @@ PROJECT_URLS = {
@@ -32,24 +32,24 @@ PROJECT_URLS = {
PACKAGES = find_packages(exclude=["tests", "tests.*"])
REQUIRES = [
@ -26,14 +26,16 @@ index e0daacd98b..7166f1f228 100755
- "attrs==19.3.0",
+ "attrs>=19.3.0",
"bcrypt==3.1.7",
"certifi>=2019.11.28",
- "certifi>=2020.4.5.1",
+ "certifi>=2019.11.28",
"ciso8601==2.1.3",
@@ -43,13 +43,13 @@ REQUIRES = [
- "importlib-metadata==1.6.0",
+ "importlib-metadata>=1.5.0",
"jinja2>=2.11.1",
"PyJWT==1.7.1",
# PyJWT has loose dependency. We want the latest one.
- "cryptography==2.8",
+ "cryptography>=2.8",
- "cryptography==2.9",
+ "cryptography>=2.9",
"pip>=8.0.3",
"python-slugify==4.0.0",
"pytz>=2019.03",

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

@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.108.7";
version = "0.109.0";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"acer_projector" = ps: with ps; [ pyserial];
@ -42,11 +42,13 @@
"arduino" = ps: with ps; [ ]; # missing inputs: PyMata
"arest" = ps: with ps; [ ];
"arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo
"arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg
"aruba" = ps: with ps; [ pexpect];
"arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
"asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
"asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
"asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt
"atag" = ps: with ps; [ ]; # missing inputs: pyatag
"aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu
"atome" = ps: with ps; [ ]; # missing inputs: pyatome
"august" = ps: with ps; [ ]; # missing inputs: py-august
@ -86,7 +88,7 @@
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
"bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
"braviatv" = ps: with ps; [ bravia-tv getmac];
"braviatv" = ps: with ps; [ bravia-tv];
"broadlink" = ps: with ps; [ broadlink];
"brother" = ps: with ps; [ ]; # missing inputs: brother
"brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
@ -139,7 +141,7 @@
"datadog" = ps: with ps; [ datadog];
"ddwrt" = ps: with ps; [ ];
"deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
"decora" = ps: with ps; [ ]; # missing inputs: bluepy decora
"decora" = ps: with ps; [ bluepy]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend
"delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
@ -327,7 +329,7 @@
"hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
"homeassistant" = ps: with ps; [ ];
"homekit" = ps: with ps; [ HAP-python];
"homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors]; # missing inputs: base36 fnvhash
"homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP]
"homematic" = ps: with ps; [ pyhomematic];
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
@ -467,7 +469,7 @@
"microsoft_face" = ps: with ps; [ aiohttp-cors];
"microsoft_face_detect" = ps: with ps; [ aiohttp-cors];
"microsoft_face_identify" = ps: with ps; [ aiohttp-cors];
"miflora" = ps: with ps; [ ]; # missing inputs: bluepy miflora
"miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora
"mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros
"mill" = ps: with ps; [ ]; # missing inputs: millheater
"min_max" = ps: with ps; [ ];
@ -548,6 +550,7 @@
"openalpr_cloud" = ps: with ps; [ ];
"openalpr_local" = ps: with ps; [ ];
"opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless
"openerz" = ps: with ps; [ ]; # missing inputs: openerz-api
"openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi
"openexchangerates" = ps: with ps; [ ];
"opengarage" = ps: with ps; [ ];
@ -567,7 +570,7 @@
"otp" = ps: with ps; [ pyotp];
"owntracks" = ps: with ps; [ pynacl aiohttp-cors];
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_viera" = ps: with ps; [ wakeonlan]; # missing inputs: panasonic_viera
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect];
"panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
"panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
@ -576,6 +579,7 @@
"persistent_notification" = ps: with ps; [ ];
"person" = ps: with ps; [ ];
"philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs
"pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx
"pi_hole" = ps: with ps; [ ]; # missing inputs: hole
"picotts" = ps: with ps; [ ];
"piglow" = ps: with ps; [ ]; # missing inputs: piglow
@ -603,7 +607,6 @@
"pulseaudio_loopback" = ps: with ps; [ ];
"push" = ps: with ps; [ aiohttp-cors];
"pushbullet" = ps: with ps; [ pushbullet];
"pushetta" = ps: with ps; [ ]; # missing inputs: pushetta
"pushover" = ps: with ps; [ pushover-complete];
"pushsafer" = ps: with ps; [ ];
"pvoutput" = ps: with ps; [ ];
@ -761,8 +764,8 @@
"syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru
"synology" = ps: with ps; [ ]; # missing inputs: py-synology
"synology_chat" = ps: with ps; [ ];
"synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
"synologydsm" = ps: with ps; [ ]; # missing inputs: python-synology
"syslog" = ps: with ps; [ ];
"system_health" = ps: with ps; [ aiohttp-cors];
"system_log" = ps: with ps; [ aiohttp-cors];
@ -912,7 +915,6 @@
"yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
"yi" = ps: with ps; [ aioftp ha-ffmpeg];
"yr" = ps: with ps; [ xmltodict];
"yweather" = ps: with ps; [ yahooweather];
"zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix
"zamg" = ps: with ps; [ ];
"zengge" = ps: with ps; [ ]; # missing inputs: zengge

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

@ -67,7 +67,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.108.7";
hassVersion = "0.109.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
sha256 = "0nk1615ms6nlmhgmsgsknc6m7b19baan8m4kr4s97njngiardxm7";
sha256 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn";
};
propagatedBuildInputs = [

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 = "20200418.0";
version = "20200427.1";
src = fetchPypi {
inherit pname version;
sha256 = "12px8znc6nw5ndg4f28lvfpqsnzi00b5qgpdj9jwny0fss4aglnb";
sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7";
};
# no Python tests implemented

2
pkgs/servers/home-assistant/parse-requirements.py
View file

@ -80,7 +80,7 @@ def parse_components(version: str = "master"):
# Recursively get the requirements of a component and its dependencies
def get_reqs(components, component):
requirements = set(components[component]["requirements"])
requirements = set(components[component].get("requirements", []))
deps = components[component].get("dependencies", [])
for dependency in deps:
requirements.update(get_reqs(components, dependency))