pyrox.dev
Merge pull request #127735 from mweinelt/esphome
authored by Martin Weinelt and committed by GitHub ec12eaec ab8167cc
+13
pkgs/development/python-modules/databases/default.nix
+13
pkgs/development/python-modules/databases/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, sqlalchemy
5
6
, aiocontextvars
6
7
, isPy27
···
22
23
rev = version;
23
24
sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf";
24
25
};
26
+
27
+
patches = [
28
+
# sqlalchemy 1.4 compat, https://github.com/encode/databases/pull/299
29
+
(fetchpatch {
30
+
url = "https://github.com/encode/databases/commit/9d6e0c024833bd41421f0798a94ef2bbf27a31d5.patch";
31
+
sha256 = "0wz9dz6g88ifvvwlhy249cjvqpx72x99wklzcl7b23srpcvb5gv1";
32
+
})
33
+
(fetchpatch {
34
+
url = "https://github.com/encode/databases/commit/40c41c2b7b3fedae484ad94d81b27ce88a09c5ed.patch";
35
+
sha256 = "0z458l3vkg4faxbnf31lszfby5d10fa9kgxxy4xxcm0py6d8a2pi";
36
+
})
37
+
];
25
38
26
39
propagatedBuildInputs = [
27
40
aiocontextvars
+9
-2
pkgs/tools/misc/esphome/dashboard.nix
+9
-2
pkgs/tools/misc/esphome/dashboard.nix
···
4
4
5
5
with python3.pkgs; buildPythonPackage rec {
6
6
pname = "esphome-dashboard";
7
-
version = "20210615.0";
7
+
version = "20210617.1";
8
8
9
9
src = fetchPypi {
10
10
inherit pname version;
11
-
sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9";
11
+
sha256 = "0kwg940pdzjsfbdmcml382khpxm6p1ip0bib0wk8rg8qdvmia7w5";
12
12
};
13
+
14
+
# no tests
15
+
doCheck = false;
16
+
17
+
pythonImportsCheck = [
18
+
"esphome_dashboard"
19
+
];
13
20
14
21
meta = with lib; {
15
22
description = "ESPHome dashboard";
+2
-2
pkgs/tools/misc/esphome/default.nix
+2
-2
pkgs/tools/misc/esphome/default.nix
···
12
12
in
13
13
python3.pkgs.buildPythonApplication rec {
14
14
pname = "esphome";
15
-
version = "1.19.0";
15
+
version = "1.19.2";
16
16
17
17
src = fetchFromGitHub {
18
18
owner = pname;
19
19
repo = pname;
20
20
rev = "v${version}";
21
-
sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi";
21
+
sha256 = "0bz6gkrvn7mwmjsqrazgpy9r64m5jj462v0izgvdymkx8bjd8mpi";
22
22
};
23
23
24
24
postPatch = ''