Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42235323e5dc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f49029aceac
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 9, 2019

  1. esphome: 1.13.6 -> 1.14.1

    Jonathan Ringer committed Nov 9, 2019
    Copy the full SHA
    70a86f1 View commit details

  2. Merge pull request #72627 from jonringer/bump-esphome 

    esphome: 1.13.6 -> 1.14.1
    @globin
    globin authored Nov 9, 2019
    Copy the full SHA
    1f49029 View commit details
Showing with 13 additions and 10 deletions.
  1. +13 −10 pkgs/servers/home-assistant/esphome.nix
23 changes: 13 additions & 10 deletions pkgs/servers/home-assistant/esphome.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, python3, platformio, esptool, git, protobuf3_7, fetchpatch }:
{ lib, python3, platformio, esptool, git, protobuf3_10, fetchpatch }:

let
python = python3.override {
@@ -11,33 +11,36 @@ let
};
});
protobuf = super.protobuf.override {
protobuf = protobuf3_7;
protobuf = protobuf3_10;
};

};
};

in python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "1.13.6";
version = "1.14.1";

src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "53148fc43c6cc6736cb7aa4cc1189caa305812061f55289ff916f8bd731ac623";
};

patches = fetchpatch {
url = https://github.com/esphome/esphome/pull/694.patch;
includes = [ "esphome/voluptuous_schema.py" ];
sha256 = "0i2v1d6mcgc94i9rkaqmls7iyfbaisdji41sfc7bh7cf2j824im9";
sha256 = "1hw1q2fck9429077w207rk65a1krzyi6qya5pzjkpw4av5s0v0g3";
};

ESPHOME_USE_SUBPROCESS = "";

propagatedBuildInputs = with python.pkgs; [
voluptuous pyyaml paho-mqtt colorlog
tornado protobuf tzlocal pyserial ifaddr
protobuf
];

postPatch = ''
substituteInPlace setup.py \
--replace "protobuf==3.10.0" "protobuf~=3.10" \
--replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \
--replace "tornado==5.1.1" "tornado~=5.1"
'';

makeWrapperArgs = [
# platformio is used in esphomeyaml/platformio_api.py
# esptool is used in esphomeyaml/__main__.py