diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2019-04-18 08:29:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-18 08:29:32 +0200 |
commit | 707bff5e73ecf26b7e9183e741855f43916bb06c (patch) | |
tree | b843a9a94fed46b52b095241258263f8bba2fede /pkgs/servers/home-assistant | |
parent | 28ac30930934a5a0f40b6c585bc967ae3bbbd348 (diff) | |
parent | 8a14cd631d85c2de4e8d5641bd7b26598eab9111 (diff) | |
download | nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.tar nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.tar.gz nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.tar.bz2 nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.tar.lz nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.tar.xz nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.tar.zst nixpkgs-707bff5e73ecf26b7e9183e741855f43916bb06c.zip |
Merge pull request #59491 from dotlambda/esphome-1.12.2
esphome: 1.11.2 -> 1.12.2
Diffstat (limited to 'pkgs/servers/home-assistant')
-rw-r--r-- | pkgs/servers/home-assistant/esphome.nix | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index d4420be94b5..a8cb12193b0 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -1,17 +1,40 @@ -{ lib, python3, fetchpatch, platformio, esptool, git }: +{ lib, python3, fetchpatch, platformio, esptool, git, protobuf3_7 }: + +let + python = python3.override { + packageOverrides = self: super: { + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; + }; + }); + tornado = super.tornado.overridePythonAttrs (oldAttrs: rec { + version = "5.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; + }; + }); + protobuf = super.protobuf.override { + protobuf = protobuf3_7; + }; + }; + }; -python3.pkgs.buildPythonApplication rec { +in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.11.2"; + version = "1.12.2"; - src = python3.pkgs.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "0kg8fqv3mv8i852jr42p4mipa9wjlzjwj60j1r2zpgzgr8p8wfs8"; + sha256 = "935fc3d0f05b2f5911c29f60c9b5538bed584a31455b492944007d8b1524462c"; }; ESPHOME_USE_SUBPROCESS = ""; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ voluptuous pyyaml paho-mqtt colorlog tornado protobuf tzlocal pyserial ifaddr ]; @@ -24,11 +47,6 @@ python3.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - checkPhase = '' - $out/bin/esphomeyaml tests/test1.yaml compile - $out/bin/esphomeyaml tests/test2.yaml compile - ''; - # Platformio will try to access the network doCheck = false; |