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

Merge pull request #99477 from 1000101/esphome

Browse Source 
esphome: 1.14.5 -> 1.15.2
This commit is contained in:
Martin Weinelt 2020-10-03 16:26:43 +02:00 committed by GitHub
commit 6b9bc9efaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,21 @@
{ lib, python3, platformio, esptool, git, protobuf3_11, fetchpatch }: { lib, python3, platformio, esptool, git, protobuf3_12, 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_11; protobuf = protobuf3_12;
}; };
}; };
}; };
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "esphome"; pname = "esphome";
version = "1.14.5"; version = "1.15.2";
src = python.pkgs.fetchPypi { src = python.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "176mi361677d5cqbi0hn52kky845byjs6gdad8pdhihyjgv7a9y9"; sha256 = "1wnmgn0q4n2vp2cdwsc36acsy7c7w5vyxdglii3432mr5drrgcsx";
}; };
ESPHOME_USE_SUBPROCESS = ""; ESPHOME_USE_SUBPROCESS = "";
@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication rec {
# remove all version pinning (E.g tornado==5.1.1 -> tornado) # remove all version pinning (E.g tornado==5.1.1 -> tornado)
postPatch = '' postPatch = ''
sed -i -e "s/==[0-9.]*//" setup.py sed -i -e "s/==[0-9.]*//" requirements.txt
''; '';
makeWrapperArgs = [ makeWrapperArgs = [