diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-08 09:27:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-08 09:27:41 +0100 |
commit | 8f9eb70461b33b9d4cdb8d9453805a225fafff08 (patch) | |
tree | 853b327541333741e19e1478669fd4066e26a673 /pkgs/servers | |
parent | 077c7f780f2fd5db0d5a7e180b535b627f19d96e (diff) | |
parent | 44ee03d7fc903ea5fa12f62d23d7e9daddf2aeef (diff) | |
download | nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.tar nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.tar.gz nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.tar.bz2 nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.tar.lz nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.tar.xz nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.tar.zst nixpkgs-8f9eb70461b33b9d4cdb8d9453805a225fafff08.zip |
Merge pull request #86407 from Mic92/home-assistant
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 13 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/frontend.nix | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 28c0322720a..96ca0c83898 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.109.0"; + version = "0.109.6"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 03805344ae6..9471a5faad8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.109.0"; + hassVersion = "0.109.6"; 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 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn"; + sha256 = "133l6n165yivnc9qmrahk423hmns0hn0dbnx4ys7yaw3x5hqwyns"; }; propagatedBuildInputs = [ @@ -98,6 +98,9 @@ in with py.pkgs; buildPythonApplication rec { sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; + # upstream only tests on Linux, so do we. + doCheck = stdenv.isLinux; + checkInputs = [ asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher ]; @@ -118,6 +121,10 @@ in with py.pkgs; buildPythonApplication rec { makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; + passthru = { + inherit (py.pkgs) hass-frontend; + }; + meta = with lib; { homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bcb770b8dc6..9fb543d06ce 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -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 = "20200427.1"; + version = "20200505.0"; src = fetchPypi { inherit pname version; - sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7"; + sha256 = "0h19ddgnws5l49fwr4b0j99j4xkhpxkwdsmq71q36akd4s5lj0ll"; }; # no Python tests implemented |