Merge remote-tracking branch 'nixpkgs/master' into master

1 files changed, 10 insertions, 3 deletions

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 51b6d94860c..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.108.2";
+  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 = "0v4i1ak7pkpycas0mzdmxgc42xgfymwx2b0a2a4h13c4z46pbs2l";
+    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";