git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #86407 from Mic92/home-assistant
commit8f9eb70461b33b9d4cdb8d9453805a225fafff08 authorJörg Thalheim <Mic92@users.noreply.github.com> dateFri 8 May 2020, 09:27 (7 years ago) parent077c7f744ee03d
3 files changed+13−6
pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/servers/home-assistant/default.nix+10−3 pkgs/servers/home-assistant/frontend.nix+2−2
pkgs/servers/home-assistant/component-packages.nix+1−1
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "0.109.0";
5+ version = "0.109.6";
66 components = {
77 "abode" = ps: with ps; [ ]; # missing inputs: abodepy
88 "acer_projector" = ps: with ps; [ pyserial];
pkgs/servers/home-assistant/default.nix+10−3
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6
1+{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6
22
33# Look up dependencies of specified components in component-packages.nix
44, extraComponents ? [ ]
@@ -67,7 +67,7 @@ let
6767 extraBuildInputs = extraPackages py.pkgs;
6868
6969 # Don't forget to run parse-requirements.py after updating
70− hassVersion = "0.109.0";
70+ hassVersion = "0.109.6";
7171
7272in with py.pkgs; buildPythonApplication rec {
7373 pname = "homeassistant";
@@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
8686 owner = "home-assistant";
8787 repo = "home-assistant";
8888 rev = version;
89− sha256 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn";
89+ sha256 = "133l6n165yivnc9qmrahk423hmns0hn0dbnx4ys7yaw3x5hqwyns";
9090 };
9191
9292 propagatedBuildInputs = [
@@ -98,6 +98,9 @@ in with py.pkgs; buildPythonApplication rec {
9898 sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601
9999 ] ++ componentBuildInputs ++ extraBuildInputs;
100100
101+ # upstream only tests on Linux, so do we.
102+ doCheck = stdenv.isLinux;
103+
101104 checkInputs = [
102105 asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher
103106 ];
@@ -118,6 +121,10 @@ in with py.pkgs; buildPythonApplication rec {
118121
119122 makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
120123
124+ passthru = {
125+ inherit (py.pkgs) hass-frontend;
126+ };
127+
121128 meta = with lib; {
122129 homepage = "https://home-assistant.io/";
123130 description = "Open-source home automation platform running on Python 3";
pkgs/servers/home-assistant/frontend.nix+2−2
@@ -4,11 +4,11 @@ buildPythonPackage rec {
44 # the frontend version corresponding to a specific home-assistant version can be found here
55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
66 pname = "home-assistant-frontend";
7− version = "20200427.1";
7+ version = "20200505.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7";
11+ sha256 = "0h19ddgnws5l49fwr4b0j99j4xkhpxkwdsmq71q36akd4s5lj0ll";
1212 };
1313
1414 # no Python tests implemented