From 418981c391c38b94b3bb4c038fc822fb9f94723f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Jun 2020 07:07:06 +0200 Subject: [PATCH 1/3] esphome: 1.14.4 -> 1.14.5 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 3dd79969554f..2f696453636f 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -18,11 +18,11 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.14.4"; + version = "1.14.5"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "10krdmpbafvii0qlg5w94vdv573f3zdqm78ck79d6q0frdd9q9yn"; + sha256 = "176mi361677d5cqbi0hn52kky845byjs6gdad8pdhihyjgv7a9y9"; }; ESPHOME_USE_SUBPROCESS = ""; From 56c066f79d89521b4fe747398ae0c4fc602d5f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Jul 2020 10:01:17 +0200 Subject: [PATCH 2/3] esphome: update overrides --- pkgs/tools/misc/esphome/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 2f696453636f..e8c4c90f15c6 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,18 +1,11 @@ -{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }: +{ lib, python3, platformio, esptool, git, protobuf3_11, fetchpatch }: let python = python3.override { packageOverrides = self: super: { protobuf = super.protobuf.override { - protobuf = protobuf3_10; + protobuf = protobuf3_11; }; - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81"; - }; - }); }; }; From d71da1449da4fc9b2c56f189b9ee4b2c2e3b6b8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jul 2020 16:35:02 +0200 Subject: [PATCH 3/3] esphome: add click dependency used in update-all command --- pkgs/tools/misc/esphome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index e8c4c90f15c6..1160f4158b6d 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -23,7 +23,7 @@ in python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ voluptuous pyyaml paho-mqtt colorlog tornado protobuf tzlocal pyserial ifaddr - protobuf + protobuf click ]; # remove all version pinning (E.g tornado==5.1.1 -> tornado)