@@ -1,4 +1,4 @@
1−{ lib, python3, platformio, esptool, git, protobuf3_7, fetchpatch }:
1+{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }:
22
33let
44 python = python3.override {
@@ -11,24 +11,19 @@ let
1111 };
1212 });
1313 protobuf = super.protobuf.override {
14− protobuf = protobuf3_7;
14+ protobuf = protobuf3_10;
1515 };
16+
1617 };
1718 };
1819
1920in python.pkgs.buildPythonApplication rec {
2021 pname = "esphome";
21− version = "1.13.6";
22+ version = "1.14.1";
2223
2324 src = python.pkgs.fetchPypi {
2425 inherit pname version;
25− sha256 = "53148fc43c6cc6736cb7aa4cc1189caa305812061f55289ff916f8bd731ac623";
26− };
27−
28− patches = fetchpatch {
29− url = https://github.com/esphome/esphome/pull/694.patch;
30− includes = [ "esphome/voluptuous_schema.py" ];
31− sha256 = "0i2v1d6mcgc94i9rkaqmls7iyfbaisdji41sfc7bh7cf2j824im9";
26+ sha256 = "1hw1q2fck9429077w207rk65a1krzyi6qya5pzjkpw4av5s0v0g3";
3227 };
3328
3429 ESPHOME_USE_SUBPROCESS = "";
@@ -36,8 +31,16 @@ in python.pkgs.buildPythonApplication rec {
3631 propagatedBuildInputs = with python.pkgs; [
3732 voluptuous pyyaml paho-mqtt colorlog
3833 tornado protobuf tzlocal pyserial ifaddr
34+ protobuf
3935 ];
4036
37+ postPatch = ''
38+ substituteInPlace setup.py \
39+ --replace "protobuf==3.10.0" "protobuf~=3.10" \
40+ --replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \
41+ --replace "tornado==5.1.1" "tornado~=5.1"
42+ '';
43+
4144 makeWrapperArgs = [
4245 # platformio is used in esphomeyaml/platformio_api.py
4346 # esptool is used in esphomeyaml/__main__.py