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

Merge pull request #60064 from dotlambda/aioesphomeapi-2.0.1

Browse Source 
python3.pkgs.aioesphomeapi: 1.8.0 -> 2.0.1
This commit is contained in:
Franz Pletz 2019-04-23 23:13:21 +00:00 committed by GitHub
commit fa6ff572d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/aioesphomeapi/default.nix
View File

@ -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
pkgs/servers/home-assistant/default.nix
View File

@ -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 { };