public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72627 from jonringer/bump-esphome 

esphome: 1.13.6 -> 1.14.1
This commit is contained in:
Robin Gloster 2019-11-09 16:30:50 +01:00 committed by GitHub
parent 42235323e5 70a86f1184
commit 1f49029ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/servers/home-assistant/esphome.nix
View File

@ -1,4 +1,4 @@
{ lib, python3, platformio, esptool, git, protobuf3_7, fetchpatch }:
{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }:
let
python = python3.override {
@ -11,24 +11,19 @@ let
};
});
protobuf = super.protobuf.override {
protobuf = protobuf3_7;
protobuf = protobuf3_10;
};
};
};
in python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "1.13.6";
version = "1.14.1";
src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "53148fc43c6cc6736cb7aa4cc1189caa305812061f55289ff916f8bd731ac623";
};
patches = fetchpatch {
url = https://github.com/esphome/esphome/pull/694.patch;
includes = [ "esphome/voluptuous_schema.py" ];
sha256 = "0i2v1d6mcgc94i9rkaqmls7iyfbaisdji41sfc7bh7cf2j824im9";
sha256 = "1hw1q2fck9429077w207rk65a1krzyi6qya5pzjkpw4av5s0v0g3";
};
ESPHOME_USE_SUBPROCESS = "";
@ -36,8 +31,16 @@ in python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python.pkgs; [
voluptuous pyyaml paho-mqtt colorlog
tornado protobuf tzlocal pyserial ifaddr
protobuf
];
postPatch = ''
substituteInPlace setup.py \
--replace "protobuf==3.10.0" "protobuf~=3.10" \
--replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \
--replace "tornado==5.1.1" "tornado~=5.1"
'';
makeWrapperArgs = [
# platformio is used in esphomeyaml/platformio_api.py
# esptool is used in esphomeyaml/__main__.py