dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #91804 from mweinelt/esphome

Browse Source 
esphome: 1.14.4 -> 1.14.5
This commit is contained in:
Martin Weinelt 2020-07-08 21:30:44 +02:00 committed by GitHub
commit bddf762cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/esphome/default.nix
View File

@ -1,28 +1,21 @@
{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }: { lib, python3, platformio, esptool, git, protobuf3_11, fetchpatch }:
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
protobuf = super.protobuf.override { 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";
};
});
}; };
}; };
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "esphome"; pname = "esphome";
version = "1.14.4"; version = "1.14.5";
src = python.pkgs.fetchPypi { src = python.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "10krdmpbafvii0qlg5w94vdv573f3zdqm78ck79d6q0frdd9q9yn"; sha256 = "176mi361677d5cqbi0hn52kky845byjs6gdad8pdhihyjgv7a9y9";
}; };
ESPHOME_USE_SUBPROCESS = ""; ESPHOME_USE_SUBPROCESS = "";
@ -30,7 +23,7 @@ in python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [
voluptuous pyyaml paho-mqtt colorlog voluptuous pyyaml paho-mqtt colorlog
tornado protobuf tzlocal pyserial ifaddr tornado protobuf tzlocal pyserial ifaddr
protobuf protobuf click
]; ];
# remove all version pinning (E.g tornado==5.1.1 -> tornado) # remove all version pinning (E.g tornado==5.1.1 -> tornado)