git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #152989 from fabaff/bump-hahomematic
commit617c643edb52c66b1f9ee4a7b274723e114fe258 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateMon 3 Jan 2022, 21:46 (5 years ago) parent2dedc1e77ed160
3 files changed+52−5
compare with master
unifiedsplit
pkgs/development/python-modules/hahomematic/default.nix+11−5 pkgs/development/python-modules/pydevccu/default.nix+39 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/hahomematic/default.nix+11−5
@@ -1,7 +1,10 @@
11{ lib
2+, aiohttp
23, buildPythonPackage
34, fetchFromGitHub
4−, aiohttp
5+, pydevccu
6+, pytest-aiohttp
7+, pytestCheckHook
58, pythonOlder
69, voluptuous
710, websocket-client
@@ -10,7 +13,7 @@
1013
1114buildPythonPackage rec {
1215 pname = "hahomematic";
13− version = "0.9.1";
16+ version = "0.12.0";
1417 format = "setuptools";
1518
1619 disabled = pythonOlder "3.9";
@@ -19,7 +22,7 @@ buildPythonPackage rec {
1922 owner = "danielperna84";
2023 repo = pname;
2124 rev = version;
22− sha256 = "sha256-sxYa0SCsX1NZlCRMIpwyU1KPEteVH5HGLx1dFsbiu/E=";
25+ sha256 = "sha256-A7fuTSrXMTK0oz87htylWKb868+YR7FXYYEC3hSgG7o=";
2326 };
2427
2528 propagatedBuildInputs = [
@@ -27,8 +30,11 @@ buildPythonPackage rec {
2730 voluptuous
2831 ];
2932
30− # Module has no tests
31− doCheck = false;
33+ checkInputs = [
34+ pydevccu
35+ pytest-aiohttp
36+ pytestCheckHook
37+ ];
3238
3339 pythonImportsCheck = [
3440 "hahomematic"
pkgs/development/python-modules/pydevccu/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, pythonOlder
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "pydevccu";
9+ version = "0.0.9";
10+ format = "setuptools";
11+
12+ disabled = pythonOlder "3.8";
13+
14+ src = fetchFromGitHub {
15+ owner = "danielperna84";
16+ repo = pname;
17+ rev = version;
18+ sha256 = "sha256-/4sJ5T17nCcTjg1Me4zTlOEOkK1py9kl2YeLGv4X6us=";
19+ };
20+
21+ postPatch = ''
22+ # Fix file name, https://github.com/danielperna84/pydevccu/pull/8
23+ mv pydevccu/paramset_descriptions/HmIP-STDH.json pydevccu/paramset_descriptions/HmIP-STHD.json
24+ '';
25+
26+ # Module has no tests
27+ doCheck = false;
28+
29+ pythonImportsCheck = [
30+ "pydevccu"
31+ ];
32+
33+ meta = with lib; {
34+ description = "HomeMatic CCU XML-RPC Server with fake devices";
35+ homepage = "https://github.com/danielperna84/pydevccu";
36+ license = with licenses; [ mit ];
37+ maintainers = with maintainers; [ fab ];
38+ };
39+}
pkgs/top-level/python-packages.nix+2
@@ -6600,6 +6600,8 @@ in {
66006600
66016601 py-desmume = callPackage ../development/python-modules/py-desmume { };
66026602
6603+ pydevccu = callPackage ../development/python-modules/pydevccu { };
6604+
66036605 pydexcom = callPackage ../development/python-modules/pydexcom { };
66046606
66056607 pydicom = callPackage ../development/python-modules/pydicom { };