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: 962195d9777b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f5fa9a8298e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 9, 2019

  1. esphome: 1.12.2 -> 1.13.6

    @dotlambda
    dotlambda committed Oct 9, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: E35C2D7C2C6AC724
    Expired
    Learn about vigilant mode
    Copy the full SHA
    7ab21ef View commit details

  2. Merge pull request #70867 from dotlambda/esphome-1.13.6 

    esphome: 1.12.2 -> 1.13.6
    @globin
    globin authored Oct 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1f5fa9a View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/servers/home-assistant/esphome.nix
12 changes: 9 additions & 3 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 }:
{ lib, python3, platformio, esptool, git, protobuf3_7, fetchpatch }:

let
python = python3.override {
@@ -18,11 +18,17 @@ let

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

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

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

ESPHOME_USE_SUBPROCESS = "";