Merge pull request #127735 from mweinelt/esphome

This commit is contained in:
Martin Weinelt 2021-06-22 16:59:24 +02:00 committed by GitHub
commit ec12eaec34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, sqlalchemy
, aiocontextvars
, isPy27
@ -23,6 +24,18 @@ buildPythonPackage rec {
sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf";
};
patches = [
# sqlalchemy 1.4 compat, https://github.com/encode/databases/pull/299
(fetchpatch {
url = "https://github.com/encode/databases/commit/9d6e0c024833bd41421f0798a94ef2bbf27a31d5.patch";
sha256 = "0wz9dz6g88ifvvwlhy249cjvqpx72x99wklzcl7b23srpcvb5gv1";
})
(fetchpatch {
url = "https://github.com/encode/databases/commit/40c41c2b7b3fedae484ad94d81b27ce88a09c5ed.patch";
sha256 = "0z458l3vkg4faxbnf31lszfby5d10fa9kgxxy4xxcm0py6d8a2pi";
})
];
propagatedBuildInputs = [
aiocontextvars
sqlalchemy

View file

@ -4,13 +4,20 @@
with python3.pkgs; buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20210615.0";
version = "20210617.1";
src = fetchPypi {
inherit pname version;
sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9";
sha256 = "0kwg940pdzjsfbdmcml382khpxm6p1ip0bib0wk8rg8qdvmia7w5";
};
# no tests
doCheck = false;
pythonImportsCheck = [
"esphome_dashboard"
];
meta = with lib; {
description = "ESPHome dashboard";
homepage = "https://esphome.io/";

View file

@ -12,13 +12,13 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "1.19.0";
version = "1.19.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi";
sha256 = "0bz6gkrvn7mwmjsqrazgpy9r64m5jj462v0izgvdymkx8bjd8mpi";
};
postPatch = ''