Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

home-assistant: 0.92.2 -> 0.93.2 #61754

Merged
merged 3 commits into from May 27, 2019
Merged

home-assistant: 0.92.2 -> 0.93.2 #61754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
130e8f9
python3.pkgs.pyhomematic: 0.1.58 -> 0.1.59
May 20, 2019
c20b21d
home-assistant-cli: 0.6.0 -> 0.7.0
May 20, 2019
4fc639a
home-assistant: 0.92.2 -> 0.93.2
May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyhomematic/default.nix
View file
Open in desktop
Expand Up @@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "pyhomematic";
version = "0.1.58";
version = "0.1.59";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "b390400169a4d57b3ddc3bf2123d71f2c9ef9042a50906e13253aa67311f5183";
sha256 = "4406d9bf49d570ef0ba80be9cf8eb4bd75c08a2909369ebd90b8e94ff07f116e";
};

# PyPI tarball does not include tests/ directory
Expand Down
12 changes: 3 additions & 9 deletions pkgs/servers/home-assistant/cli.nix
View file
Open in desktop
@@ -1,29 +1,23 @@
{ lib, python3, glibcLocales }:
{ lib, python3 }:

python3.pkgs.buildPythonApplication rec {
pname = "homeassistant-cli";
version = "0.6.0";
version = "0.7.0";

src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4";
sha256 = "a38d4669201ac2afa71b6578a220bf4d6d59131263b278d51ebd1479677f6baf";
};

postPatch = ''
# Ignore pinned versions
sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py
'';

nativeBuildInputs = [
glibcLocales
];

propagatedBuildInputs = with python3.pkgs; [
requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp
];

LC_ALL = "en_US.UTF-8";

postInstall = ''
mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
$out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli"
Expand Down
14 changes: 11 additions & 3 deletions pkgs/servers/home-assistant/component-packages.nix
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
# Do not edit!

{
version = "0.92.2";
version = "0.93.2";
components = {
"abode" = ps: with ps; [ ];
"acer_projector" = ps: with ps; [ pyserial ];
Expand All @@ -19,6 +19,7 @@
"alexa" = ps: with ps; [ aiohttp-cors ];
"alpha_vantage" = ps: with ps; [ ];
"amazon_polly" = ps: with ps; [ boto3 ];
"ambiclimate" = ps: with ps; [ ];
"ambient_station" = ps: with ps; [ ];
"amcrest" = ps: with ps; [ ha-ffmpeg ];
"ampio" = ps: with ps; [ ];
Expand Down Expand Up @@ -56,6 +57,7 @@
"bh1750" = ps: with ps; [ ];
"binary_sensor" = ps: with ps; [ ];
"bitcoin" = ps: with ps; [ ];
"bizkaibus" = ps: with ps; [ ];
"blackbird" = ps: with ps; [ ];
"blink" = ps: with ps; [ ];
"blinksticklight" = ps: with ps; [ BlinkStick ];
Expand Down Expand Up @@ -188,6 +190,7 @@
"epsonworkforce" = ps: with ps; [ ];
"eq3btsmart" = ps: with ps; [ construct ];
"esphome" = ps: with ps; [ aioesphomeapi ];
"essent" = ps: with ps; [ ];
"etherscan" = ps: with ps; [ ];
"eufy" = ps: with ps; [ ];
"everlights" = ps: with ps; [ ];
Expand Down Expand Up @@ -319,6 +322,7 @@
"image_processing" = ps: with ps; [ aiohttp-cors ];
"imap" = ps: with ps; [ ];
"imap_email_content" = ps: with ps; [ ];
"incomfort" = ps: with ps; [ ];
"influxdb" = ps: with ps; [ influxdb ];
"input_boolean" = ps: with ps; [ ];
"input_datetime" = ps: with ps; [ ];
Expand All @@ -332,6 +336,7 @@
"iota" = ps: with ps; [ ];
"iperf3" = ps: with ps; [ ];
"ipma" = ps: with ps; [ ];
"iqvia" = ps: with ps; [ numpy ];
"irish_rail_transport" = ps: with ps; [ ];
"islamic_prayer_times" = ps: with ps; [ ];
"iss" = ps: with ps; [ ];
Expand Down Expand Up @@ -411,6 +416,7 @@
"message_bird" = ps: with ps; [ ];
"met" = ps: with ps; [ ];
"meteo_france" = ps: with ps; [ ];
"meteoalarm" = ps: with ps; [ ];
"metoffice" = ps: with ps; [ ];
"mfi" = ps: with ps; [ ];
"mhz19" = ps: with ps; [ ];
Expand Down Expand Up @@ -456,12 +462,12 @@
"ness_alarm" = ps: with ps; [ ];
"nest" = ps: with ps; [ ];
"netatmo" = ps: with ps; [ aiohttp-cors pyatmo ];
"netatmo_public" = ps: with ps; [ aiohttp-cors pyatmo ];
"netdata" = ps: with ps; [ ];
"netgear" = ps: with ps; [ ];
"netgear_lte" = ps: with ps; [ ];
"netio" = ps: with ps; [ aiohttp-cors ];
"neurio_energy" = ps: with ps; [ ];
"nextbus" = ps: with ps; [ ];
"nfandroidtv" = ps: with ps; [ ];
"niko_home_control" = ps: with ps; [ ];
"nilu" = ps: with ps; [ ];
Expand Down Expand Up @@ -502,6 +508,7 @@
"openuv" = ps: with ps; [ ];
"openweathermap" = ps: with ps; [ pyowm ];
"opple" = ps: with ps; [ ];
"orangepi_gpio" = ps: with ps; [ ];
"orvibo" = ps: with ps; [ ];
"osramlightify" = ps: with ps; [ ];
"otp" = ps: with ps; [ pyotp ];
Expand All @@ -528,7 +535,6 @@
"plum_lightpad" = ps: with ps; [ ];
"pocketcasts" = ps: with ps; [ ];
"point" = ps: with ps; [ aiohttp-cors ];
"pollen" = ps: with ps; [ numpy ];
"postnl" = ps: with ps; [ ];
"prezzibenzina" = ps: with ps; [ ];
"proliphix" = ps: with ps; [ ];
Expand All @@ -537,6 +543,7 @@
"proximity" = ps: with ps; [ ];
"proxy" = ps: with ps; [ pillow ];
"ps4" = ps: with ps; [ ];
"ptvsd" = ps: with ps; [ ];
"pulseaudio_loopback" = ps: with ps; [ ];
"push" = ps: with ps; [ aiohttp-cors ];
"pushbullet" = ps: with ps; [ pushbullet ];
Expand Down Expand Up @@ -666,6 +673,7 @@
"swisscom" = ps: with ps; [ ];
"switch" = ps: with ps; [ ];
"switchbot" = ps: with ps; [ ];
"switcher_kis" = ps: with ps; [ ];
"switchmate" = ps: with ps; [ ];
"syncthru" = ps: with ps; [ ];
"synology" = ps: with ps; [ ];
Expand Down
29 changes: 8 additions & 21 deletions pkgs/servers/home-assistant/default.nix
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ let
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
(mkOverride "async-timeout" "3.0.1"
"0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
(mkOverride "attrs" "18.2.0"
"10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69")
(mkOverride "attrs" "19.1.0"
"f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399")
(mkOverride "bcrypt" "3.1.6"
"44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea")
(mkOverride "pyjwt" "1.7.1"
Expand All @@ -40,35 +40,22 @@ let
"3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf")
(mkOverride "requests" "2.21.0"
"502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e")
(mkOverride "ruamel_yaml" "0.15.91"
"692f03ed24c8c1d9fa9fd4c045f7ba1c26f1e96edb8bfb4d54854ba26bc02319")
(mkOverride "ruamel_yaml" "0.15.94"
"0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8")
(mkOverride "voluptuous" "0.11.5"
"567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
(mkOverride "voluptuous-serialize" "2.1.0"
"d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f")

# used by auth.mfa_modules.totp
(mkOverride "pyotp" "2.2.6"
"dd9130dd91a0340d89a0f06f887dbd76dd07fb95a8886dc4bc401239f2eebd69")
(mkOverride "pyotp" "2.2.7"
"be0ffeabddaa5ee53e7204e7740da842d070cf69168247a3d0c08541b84de602")

# used by check_config script
# can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
(mkOverride "colorlog" "4.0.2"
"3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42")

# required by home-assistant-frontend
(self: super: {
user-agents = super.user-agents.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0";
src = fetchFromGitHub {
owner = "selwin";
repo = "python-user-agents";
rev = "v${version}";
sha256 = "0ix2yajqdnfj433j50dls90mkmqz8m4fiywxg097zwkkc95wm8s4";
};
});
})

# required by aioesphomeapi
(self: super: {
protobuf = super.protobuf.override {
Expand Down Expand Up @@ -109,7 +96,7 @@ let
extraBuildInputs = extraPackages py.pkgs;

# Don't forget to run parse-requirements.py after updating
hassVersion = "0.92.2";
hassVersion = "0.93.2";

in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
Expand All @@ -124,7 +111,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
sha256 = "10kqfj7gi8w0d9jalb4i2w4ifla8jkllymjav74abc4b30y08vmw";
sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8";
};

propagatedBuildInputs = [
Expand Down
8 changes: 3 additions & 5 deletions pkgs/servers/home-assistant/frontend.nix
View file
Open in desktop
@@ -1,16 +1,14 @@
{ lib, fetchPypi, buildPythonPackage, user-agents }:
{ lib, fetchPypi, buildPythonPackage }:

buildPythonPackage rec {
pname = "home-assistant-frontend";
version = "20190427.0";
version = "20190514.0";

src = fetchPypi {
inherit pname version;
sha256 = "eb14e7be0ad591ad4623c67db752bc4eb4f4e43ce60bb0f6d1909e9ad9399d91";
sha256 = "ba8cfa01b00ff2ee94a91cd83197b4d213e9b9df151daaef11dd0a56d34c5414";
};

propagatedBuildInputs = [ user-agents ];

# no Python tests implemented
doCheck = false;

Expand Down