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

Merge pull request #59491 from dotlambda/esphome-1.12.2

Browse Source 
esphome: 1.11.2 -> 1.12.2
This commit is contained in:
Robert Schütz 2019-04-18 08:29:32 +02:00 committed by GitHub
commit 707bff5e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/arduino/platformio/core.nix
View File

@ -10,6 +10,8 @@ let
"commands/test_ci.py::test_ci_boards"
"commands/test_ci.py::test_ci_project_conf"
"commands/test_ci.py::test_ci_lib_and_board"
"commands/test_ci.py::test_ci_build_dir"
"commands/test_ci.py::test_ci_keep_build_dir"
"commands/test_init.py::test_init_enable_auto_uploading"
"commands/test_init.py::test_init_custom_framework"
"commands/test_init.py::test_init_incorrect_board"
@ -44,14 +46,14 @@ let
in buildPythonApplication rec {
pname = "platformio";
version = "3.6.4";
version = "3.6.6";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
sha256 = "1c1y099xvpdh35n8fln642psa4xsaaqly2i2jgkvhrb9yl77x5aj";
sha256 = "1qwd6684y2xagl375sv8fm6a535hcdqx296hknjlbvsgc1jc514a";
};
propagatedBuildInputs = [

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

@ -1,17 +1,40 @@
{ lib, python3, fetchpatch, platformio, esptool, git }:
{ lib, python3, fetchpatch, platformio, esptool, git, protobuf3_7 }:
python3.pkgs.buildPythonApplication rec {
let
python = python3.override {
packageOverrides = self: super: {
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
version = "5.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95";
};
});
tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
version = "5.1.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409";
};
});
protobuf = super.protobuf.override {
protobuf = protobuf3_7;
};
};
};
in python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "1.11.2";
version = "1.12.2";
src = python3.pkgs.fetchPypi {
src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "0kg8fqv3mv8i852jr42p4mipa9wjlzjwj60j1r2zpgzgr8p8wfs8";
sha256 = "935fc3d0f05b2f5911c29f60c9b5538bed584a31455b492944007d8b1524462c";
};
ESPHOME_USE_SUBPROCESS = "";
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python.pkgs; [
voluptuous pyyaml paho-mqtt colorlog
tornado protobuf tzlocal pyserial ifaddr
];
@ -24,11 +47,6 @@ python3.pkgs.buildPythonApplication rec {
"--set ESPHOME_USE_SUBPROCESS ''"
];
checkPhase = ''
$out/bin/esphomeyaml tests/test1.yaml compile
$out/bin/esphomeyaml tests/test2.yaml compile
'';
# Platformio will try to access the network
doCheck = false;