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

Commits on Apr 22, 2019

  1. python3.pkgs.aioesphomeapi: 1.8.0 -> 2.0.1 

    Pin the protobuf version used by Home Assistant to the version
required by aioesphomeapi and some components.
    Robert Schütz committed Apr 22, 2019
    Copy the full SHA
    59b1cdb View commit details

Commits on Apr 23, 2019

  1. Merge pull request #60064 from dotlambda/aioesphomeapi-2.0.1 

    python3.pkgs.aioesphomeapi: 1.8.0 -> 2.0.1
    @fpletz
    fpletz authored Apr 23, 2019
    Copy the full SHA
    fa6ff57 View commit details
Showing with 17 additions and 4 deletions.
  1. +9 −3 pkgs/development/python-modules/aioesphomeapi/default.nix
  2. +8 −1 pkgs/servers/home-assistant/default.nix
12 changes: 9 additions & 3 deletions pkgs/development/python-modules/aioesphomeapi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{ lib, buildPythonPackage, fetchPypi, attrs, protobuf, zeroconf }:
{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }:

buildPythonPackage rec {
pname = "aioesphomeapi";
version = "1.8.0";
version = "2.0.1";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "16ywa7yggmsx8m2r9azdq7w9fxjh736g1vd1aibgh24g7srhwwhj";
sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb";
};

propagatedBuildInputs = [ attrs protobuf zeroconf ];
@@ -19,5 +21,9 @@ buildPythonPackage rec {
homepage = https://github.com/esphome/aioesphomeapi;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];

# Home Assistant should pin protobuf to the correct version. Can be tested using
# nix-build -E "with import ./. {}; home-assistant.override { extraPackages = ps: [ ps.aioesphomeapi ]; }"
broken = !lib.hasPrefix "3.6.1" protobuf.version;
};
}
9 changes: 8 additions & 1 deletion pkgs/servers/home-assistant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, python3
{ lib, fetchFromGitHub, fetchpatch, python3, protobuf3_6

# Look up dependencies of specified components in component-packages.nix
, extraComponents ? []
@@ -78,6 +78,13 @@ let
});
})

# required by aioesphomeapi
(self: super: {
protobuf = super.protobuf.override {
protobuf = protobuf3_6;
};
})

# hass-frontend does not exist in python3.pkgs
(self: super: {
hass-frontend = self.callPackage ./frontend.nix { };