diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index bd223d437dd9..144ebdf520d5 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "1.2.11"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A/exf2XTlogowdeFLmxO/P7JeGIE8CDsOX9tR0HOXws="; + hash = "sha256-2EU7Um3uxGP1LBt/PEg2s6v7iny60NHCg8ixX+lIsZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index 4bc5ae32d753..c2c4b23d951a 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.1.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ASFdV/4IH3eaxJJ+Hj7YRZ7Ejp35bqT9DH2NUcD3S9A="; + hash = "sha256-icrgLPn2Nr5rKJ2YzLLL8rhHoTK+ecNyhGd3glOc7tM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 552ba149be95..30c03decf005 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -17,10 +17,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vincegio"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ihNy5Rme20fCO1tG7aqdVFhSF3DI9hAlge54+/nNGLs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'bleak = "^0.15.1"' 'bleak = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index bd66c47c6cc1..cb897b31fc81 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , bluez , buildPythonPackage , dbus-next @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.15.1"; - format = "setuptools"; + version = "0.16.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2MjYjeDyKhW9E1ugVsTlsvufFRGSg97yGx7X1DwA1ZA="; + hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc="; }; propagatedBuildInputs = [ + async-timeout dbus-next typing-extensions ]; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 1526477644b1..b1ea83a1d568 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.3.0"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PRYu3PTmSg25DiSuLnv1tp1cOZsXHGTmxRA2V39ab4k="; + hash = "sha256-bnFcqWM1kN2m3HMHJ5LgGJPxCXlgULu7kSl7RpKsVxc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index d6cc52d5d997..6ee8d55d192c 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.2.2"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Td7LT5C7ho/fIT2gnkPA0LLXHtzDjbYAopE4ECTfFKQ="; + hash = "sha256-bYdVpToRDZMV/XKlGAxF0qhiM8Z3QlGrnjDXbtZRIQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 268f5b2ca7b6..4f216bd2eee1 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "0.5.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-G3EZ23bpvt0HBjHtxJnpXgOzv+3/Rl8yWrVR5s3iZQA="; + hash = "sha256-yTbJ69FPMIsc/w7UXfvXPLXGRs9s0F4YiccljRyI5Ek="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/epson-projector/default.nix b/pkgs/development/python-modules/epson-projector/default.nix index 7dbe665ede8e..0bb5eb5adc9b 100644 --- a/pkgs/development/python-modules/epson-projector/default.nix +++ b/pkgs/development/python-modules/epson-projector/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "epson-projector"; - version = "0.4.6"; + version = "0.5.0"; src = fetchPypi { pname = "epson_projector"; inherit version; - sha256 = "sha256-F8Dvk5OtlPbFyIedJb+zM2iN9eT0jDQEs06xbL3rlVs="; + sha256 = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 99964db9806e..4e0b2ef7b08e 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -1,4 +1,5 @@ { lib +, bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.14.1"; + version = "0.17.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-gAhrhHTPwNipAFS22GXKjeVXqx0AGorvsqqEWKwRLzA="; + hash = "sha256-Kj1RCDQiDAt01yjoRVPdpi2dlF8V1rwnx+n7WGTRdQ0="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index d41fca17e471..d5101e7ba666 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1tCTkmhO9HyfdQuymTtFdCvxG9+Xs5/dEN5tB3/2fpQ="; + hash = "sha256-8B3xdSvvxmbjpPk6aWHQTraf2J1oCBvP0/UxTxaN0jY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix new file mode 100644 index 000000000000..b81f62aa94db --- /dev/null +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -0,0 +1,57 @@ +{ lib +, async-timeout +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, flux-led +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "led-ble"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-WjSMyuxxScJMtrQAvCHX98IXzbO2dWAsAaOwXf6TEDg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=led_ble --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + bleak-retry-connector + flux-led + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "led_ble" + ]; + + meta = with lib; { + description = "Library for LED BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/led-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 81d80dcd7b2e..3ae81a4afed6 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , dacite , fetchFromGitHub +, aqipy-atmotech , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.3.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,12 +22,13 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-O/HJTqmNmnx85AVuhRRxNqS1W0dZyKFSPVFqaBXAuhU="; + hash = "sha256-UbknJ+dX+4kzfe6/gg/Nj1Ay8YXtIRj203B6NkhGVys="; }; propagatedBuildInputs = [ aiohttp dacite + aqipy-atmotech ]; checkInputs = [ diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index c99e7c909cbb..a0aac69df9e1 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.0.2"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY="; + hash = "sha256-hMTafmG3mk6jyrqxI7L/rQxKGpgNgEZ+b6d6/yISCng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix index b80f5058cae8..d2accd221df0 100644 --- a/pkgs/development/python-modules/pescea/default.nix +++ b/pkgs/development/python-modules/pescea/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pescea"; - version = "1.0.11"; + version = "1.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lazdavila"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yiBtvD7kCqR/F4yoJa5rIOekYy8+zlJh849Jv+HkA4M="; + # https://github.com/lazdavila/pescea/issues/4 + rev = "a3dd7deedc64205e24adbc4ff406a2f6aed3b240"; + hash = "sha256-5TkFrGaSkQOORhf5a7SjkzggFLPyqe9k3M0B4ljhWTQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 45fd001dd9a3..d7a97205f80a 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.12.1"; + version = "4.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-OzHykLpcy+ZA3jfzrDwmCoNb4JhvdHYJErzfWn+zjqo="; + sha256 = "sha256-lFVXWkT6cg0JlFWz5AquEXC6icwTU3bNHMDfKEy/3rQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psutil-home-assistant/default.nix b/pkgs/development/python-modules/psutil-home-assistant/default.nix new file mode 100644 index 000000000000..4e248702f53c --- /dev/null +++ b/pkgs/development/python-modules/psutil-home-assistant/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, psutil +, pytestCheckHook +}: + + +buildPythonPackage rec { + pname = "psutil-home-assistant"; + version = "0.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "psutil-home-assistant"; + rev = "refs/tags/${version}"; + hash = "sha256-6bj1aaa/JYZFVwUAJfxISRoldgTmumCG8WrlKhkb6kM="; + }; + + propagatedBuildInputs = [ + psutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/home-assistant-libs/psutil-home-assistant/releases/tag/${version}"; + description = "Wrapper of psutil that removes reliance on globals"; + homepage = "https://github.com/home-assistant-libs/psutil-home-assistant"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index cdb971b6a7b5..accbf6761a6f 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -1,45 +1,58 @@ { lib -, authlib +, aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub -, httpx -, pytest-asyncio +, poetry-core +, pyjwt +, pytest-aiohttp +, pytest-freezegun , pytestCheckHook , pythonOlder -, pytz +, deepdiff }: buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.7.0"; - format = "setuptools"; + version = "2022.8.2"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; - rev = version; - sha256 = "sha256-iniSlsZVWdDuwM/6asX4xyVrtrQvt7wEBwDVutjCogU="; + rev = "refs/tags/${version}"; + hash = "sha256-TfPixJr5CmEUZHSg8VLlmRZbF53F95DTVuiCgJ8dTcE="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - authlib - httpx - pytz + aiohttp + deepdiff + pyjwt ]; checkInputs = [ - pytest-asyncio + aioresponses + pytest-aiohttp + pytest-freezegun pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "pylitterbot" ]; meta = with lib; { - description = "Python package for controlling a Litter-Robot"; + description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index d071743d748d..e9d6ab74ad8c 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -1,4 +1,5 @@ { lib +, awesomeversion , buildPythonPackage , click , crcmod @@ -17,29 +18,35 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.23.0"; + version = "0.24.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h"; + hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo="; }; propagatedBuildInputs = [ + awesomeversion click crcmod getmac intelhex - paho-mqtt pyserial pyserial-asyncio voluptuous ]; + passthru.optional-dependencies = { + mqtt-client = [ + paho-mqtt + ]; + }; + checkInputs = [ pytest-sugar pytest-timeout diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index b6442c82bacd..74101ad3abf1 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.2"; + version = "0.5.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gRAQARdVZWpFHx0nE4xRktIP2p4ggp9/95VO9nNd/1w="; + sha256 = "sha256-/h0vqclvVjoY/tjAWAYjvSqVaAaXeXNafECygutvACA="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 677fb0ef3586..24f7c6bde6d9 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -4,11 +4,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.14"; + version = "0.18.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-XUdrjhV0AnKV6snb183FrlcSLAvo7U+NyvPDorykkJU="; + hash = "sha256-80GzOKZRsjWHLEGhNrYIWdUMiel5ztcobwRhrlyjzpY="; }; propagatedBuildInputs = [ @@ -25,8 +26,9 @@ buildPythonPackage rec { bleak-retry-connector ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "switchbot" diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index e3ce43109725..b4dac08811cb 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -7,11 +7,12 @@ , pytest-aio , pytest-asyncio , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "python-izone"; - version = "1.2.7"; + version = "1.2.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,10 +20,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Swamp-Ig"; repo = "pizone"; - rev = "v${version}"; - hash = "sha256-CvFOhs56dfNerK3junWElQfTJi1YXA86zMbv0tseQC8="; + rev = "refs/tags/v${version}"; + hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ aiohttp netifaces diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index a09234c11409..8a266607912a 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.1"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-5KfR01qsSGF2ZNklhm7he9Hskk8pqC2GEmIcsB4HpRY="; + rev = "refs/tags/v${version}"; + hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 68d28d0f4756..266ae1d8769d 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.5"; + version = "1.1.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WO1oLD09fokMR7lVCqs1Qeodjc+Yg431otl9rohtmPo="; + hash = "sha256-C7kCliNLqzkrOoT1oy3scLl3VNdDXwWEqaO0DlGZWmk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 7f0b61b37510..5f745a521002 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0b7bqg4h9q9rk3hv2im903xn7jgfyf36kcv31v96ap75yrvip6wa"; + hash = "sha256-M7V+JgbaFxrijaP8znZv8tOoHGVlQmTJIdiBXK6g8LM="; }; propagatedBuildInputs = [ @@ -36,6 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # https://github.com/abmantis/whirlpool-sixth-sense/issues/15 + doCheck = false; + pythonImportsCheck = [ "whirlpool" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 7d13d6d3a6d2..858844023e72 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,5 +1,6 @@ { lib , bleak-retry-connector +, bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage , fetchFromGitHub @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.8.0"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-HwA2NKsrqXBsC5/rUZUNfHDk8QA7I+zQmwqt0SVhw38="; + hash = "sha256-FitHVfl/N2Q9bixmJFyADBytuM3T4A/D+/36lAU9vls="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bleak-retry-connector + bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth pycryptodomex diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 4373d9a2d062..b7a4ee39ea84 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.0"; + version = "0.39.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jstasiak"; repo = "python-zeroconf"; - rev = version; - hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk="; + rev = "refs/tags/${version}"; + hash = "sha256-fIp1RLf6qpo9s5fdgFt7yid6M/Sf3hmm8MZikjCiCu0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 487ff10adabc..241fe6760551 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.78"; + version = "0.0.79"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-S54reJhzvDMOC5+N/WZ8bz8XNXH/91jAAy8gCq90MvQ="; + hash = "sha256-7qE0HLp/ehwHdwVWb0H4eCwCCTUUySAPoZewLYE/MUw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 204ac1cfa189..1800e5a6d6bb 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.39.0"; + version = "0.41.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qKIlknxzZSHCl5KF8SRVHLB7eFc7ZEzAdzi+tlfcoPg="; + hash = "sha256-V4QEsHkakqYsZ09Q8BJG9fhREdGboirF5sNxm8t+dAQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 740642de51fe..8ce6469bcfee 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.8.7"; + version = "2022.9.0"; components = { "abode" = ps: with ps; [ abodepy @@ -85,7 +85,6 @@ boto3 ]; "ambee" = ps: with ps; [ - aiohttp-cors ambee ]; "amberelectric" = ps: with ps; [ @@ -124,7 +123,6 @@ "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka @@ -193,6 +191,13 @@ pyatome ]; "august" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + yalexs-ble yalexs ]; "aurora" = ps: with ps; [ @@ -277,6 +282,15 @@ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; + "bluemaestro" = ps: with ps; [ + aiohttp-cors + bleak + bluemaestro-ble + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + ]; "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ @@ -286,11 +300,17 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "bluetooth_le_tracker" = ps: with ps; [ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity @@ -309,8 +329,7 @@ zeroconf ]; "braviatv" = ps: with ps; [ - bravia-tv - ]; + ]; # missing inputs: pybravia "broadlink" = ps: with ps; [ broadlink ]; @@ -332,6 +351,15 @@ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist + "bthome" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + bthome-ble + pyserial + pyudev + ]; "buienradar" = ps: with ps; [ buienradar ]; @@ -498,11 +526,13 @@ async-upnp-client bleak bluetooth-adapters + bluetooth-auto-recovery fnvhash hass-nabucasa home-assistant-frontend ifaddr pillow + psutil-home-assistant pyserial pyudev scapy @@ -657,7 +687,10 @@ pyeconet ]; "ecovacs" = ps: with ps; [ - ]; # missing inputs: sucks + ]; # missing inputs: py-sucks + "ecowitt" = ps: with ps; [ + aioecowitt + ]; "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools @@ -750,12 +783,23 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery construct + pyserial + pyudev ]; # missing inputs: python-eq3bt + "escea" = ps: with ps; [ + pescea + ]; "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery ifaddr + pyserial + pyudev zeroconf ]; "etherscan" = ps: with ps; [ @@ -812,6 +856,9 @@ "file" = ps: with ps; [ file-read-backwards ]; + "file_upload" = ps: with ps; [ + aiohttp-cors + ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ @@ -841,7 +888,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery fjaraskupan + pyserial + pyudev ]; "fleetgo" = ps: with ps; [ ritassist @@ -867,7 +917,6 @@ pyflume ]; "flunearyou" = ps: with ps; [ - aiohttp-cors pyflunearyou ]; "flux" = ps: with ps; [ @@ -934,6 +983,8 @@ "frontier_silicon" = ps: with ps; [ afsapi ]; + "fully_kiosk" = ps: with ps; [ + ]; # missing inputs: python-fullykiosk "futurenow" = ps: with ps; [ pyfnip ]; @@ -1038,7 +1089,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery govee-ble + pyserial + pyudev ]; "gpsd" = ps: with ps; [ gps3 @@ -1082,9 +1136,11 @@ fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "hardware" = ps: with ps; [ + psutil-home-assistant ]; "harman_kardon_avr" = ps: with ps; [ hkavr @@ -1150,13 +1206,19 @@ "homeassistant" = ps: with ps; [ ]; "homeassistant_alerts" = ps: with ps; [ + ]; + "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors + psutil-home-assistant + pyserial + pyudev ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "homekit" = ps: with ps; [ @@ -1175,7 +1237,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery ifaddr + pyserial + pyudev zeroconf ]; "homematic" = ps: with ps; [ @@ -1279,7 +1344,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery inkbird-ble + pyserial + pyudev ]; "input_boolean" = ps: with ps; [ ]; @@ -1365,6 +1433,9 @@ "juicenet" = ps: with ps; [ python-juicenet ]; + "justnimbus" = ps: with ps; [ + justnimbus + ]; "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kaleidescape" = ps: with ps; [ @@ -1420,8 +1491,13 @@ "lacrosse" = ps: with ps; [ pylacrosse ]; + "lacrosse_view" = ps: with ps; [ + ]; # missing inputs: lacrosse-view "lametric" = ps: with ps; [ - lmnotify + aiohttp-cors + ]; # missing inputs: demetriek + "landisgyr_heat_meter" = ps: with ps; [ + ultraheat-api ]; "lannouncer" = ps: with ps; [ ]; @@ -1437,6 +1513,15 @@ "lcn" = ps: with ps; [ pypck ]; + "led_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + led-ble + pyserial + pyudev + ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; @@ -1448,7 +1533,6 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors - aiolifx-connection aiolifx aiolifx-effects ifaddr @@ -1594,6 +1678,14 @@ ]; "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate + "melnor" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors ]; @@ -1635,7 +1727,6 @@ aiohttp-cors ]; "miflora" = ps: with ps; [ - aiohttp-cors ]; "mikrotik" = ps: with ps; [ librouteros @@ -1655,7 +1746,6 @@ minio ]; "mitemp_bt" = ps: with ps; [ - aiohttp-cors ]; "mjpeg" = ps: with ps; [ ]; @@ -1663,7 +1753,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery moat-ble + pyserial + pyudev ]; "mobile_app" = ps: with ps; [ pynacl @@ -1943,7 +2036,6 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ - aiohttp-cors ]; "opencv" = ps: with ps; [ numpy @@ -1955,6 +2047,7 @@ openevsewifi ]; "openexchangerates" = ps: with ps; [ + aioopenexchangerates ]; "opengarage" = ps: with ps; [ open-garage @@ -2125,6 +2218,8 @@ "proxy" = ps: with ps; [ pillow ]; + "prusalink" = ps: with ps; [ + ]; # missing inputs: pyprusalink "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ @@ -2157,6 +2252,15 @@ ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent + "qingping" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + qingping-ble + ]; "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ]; @@ -2190,7 +2294,6 @@ radios ]; "radiotherm" = ps: with ps; [ - aiohttp-cors radiotherm ]; "rainbird" = ps: with ps; [ @@ -2213,6 +2316,7 @@ fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "raspyrfm" = ps: with ps; [ @@ -2355,6 +2459,8 @@ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; + "schedule" = ps: with ps; [ + ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter "scrape" = ps: with ps; [ @@ -2394,10 +2500,22 @@ fnvhash sqlalchemy ]; + "sensorpro" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + sensorpro-ble + ]; "sensorpush" = ps: with ps; [ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev sensorpush-ble ]; "sentry" = ps: with ps; [ @@ -2451,7 +2569,6 @@ pysignalclirestapi ]; "simplepush" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python @@ -2566,7 +2683,6 @@ pysdcp ]; "soundtouch" = ps: with ps; [ - aiohttp-cors libsoundtouch ]; "spaceapi" = ps: with ps; [ @@ -2618,7 +2734,6 @@ statsd ]; "steam_online" = ps: with ps; [ - aiohttp-cors steamodd ]; "steamist" = ps: with ps; [ @@ -2675,6 +2790,9 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -2771,6 +2889,24 @@ ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac + "thermobeacon" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + thermobeacon-ble + ]; + "thermopro" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + thermopro-ble + ]; "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -2956,7 +3092,6 @@ pyudev ]; "uscis" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ aio-geojson-usgs-earthquakes @@ -3146,6 +3281,9 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev xiaomi-ble ]; "xiaomi_miio" = ps: with ps; [ @@ -3164,6 +3302,15 @@ "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; + "yalexs_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + yalexs-ble + ]; "yamaha" = ps: with ps; [ rxv ]; @@ -3290,6 +3437,7 @@ "ambiclimate" "ambient_station" "analytics" + "android_ip_webcam" "androidtv" "apache_kafka" "api" @@ -3319,17 +3467,18 @@ "blackbird" "blebox" "blink" + "bluemaestro" "blueprint" "bluetooth" "bluetooth_le_tracker" "bmw_connected_drive" "bond" "bosch_shc" - "braviatv" "broadlink" "brother" "brunt" "bsblan" + "bthome" "buienradar" "button" "caldav" @@ -3391,6 +3540,7 @@ "eafm" "ecobee" "econet" + "ecowitt" "efergy" "eight_sleep" "elgato" @@ -3405,6 +3555,7 @@ "enphase_envoy" "environment_canada" "epson" + "escea" "esphome" "everlights" "evil_genius_labs" @@ -3419,6 +3570,7 @@ "fibaro" "fido" "file" + "file_upload" "filesize" "filter" "fireservicerota" @@ -3486,6 +3638,7 @@ "harmony" "hassio" "hddtemp" + "hdmi_cec" "heos" "here_travel_time" "hisense_aehw4a1" @@ -3497,6 +3650,7 @@ "home_plus_control" "homeassistant" "homeassistant_alerts" + "homeassistant_sky_connect" "homeassistant_yellow" "homekit" "homekit_controller" @@ -3545,6 +3699,7 @@ "jellyfin" "jewish_calendar" "juicenet" + "justnimbus" "keenetic_ndms2" "kira" "kmtronic" @@ -3553,10 +3708,12 @@ "konnected" "kraken" "kulersky" + "landisgyr_heat_meter" "lastfm" "launch_library" "laundrify" "lcn" + "led_ble" "lg_soundbar" "life360" "lifx" @@ -3655,6 +3812,7 @@ "open_meteo" "openalpr_cloud" "openerz" + "openexchangerates" "opengarage" "openhardwaremonitor" "opentherm_gw" @@ -3689,9 +3847,11 @@ "pure_energie" "push" "pushbullet" + "pushover" "pvoutput" "pvpc_hourly_pricing" "python_script" + "qingping" "qld_bushfire" "qnap_qsw" "rachio" @@ -3730,6 +3890,7 @@ "safe_mode" "samsungtv" "scene" + "schedule" "scrape" "screenlogic" "script" @@ -3740,6 +3901,7 @@ "senseme" "sensibo" "sensor" + "sensorpro" "sensorpush" "sentry" "senz" @@ -3819,6 +3981,8 @@ "tellduslive" "template" "tesla_wall_connector" + "thermobeacon" + "thermopro" "threshold" "tibber" "tile" @@ -3878,6 +4042,7 @@ "vlc_telnet" "voicerss" "volumio" + "volvooncall" "vulcan" "vultr" "wake_on_lan" @@ -3906,6 +4071,7 @@ "xiaomi_ble" "xiaomi_miio" "yale_smart_alarm" + "yalexs_ble" "yamaha" "yamaha_musiccast" "yandex_transport" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ecbdc2eadb6a..f07974e325c2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -79,18 +79,6 @@ let }); }) - (self: super: { - p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { - version = "1.0.1"; - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "python-p1monitor"; - rev = "refs/tags/v${version}"; - hash = "sha256-g3isA2gF2AD+VVzTqpnD+YiJQ9Kcl0VKvwd5l5Yx/Uo="; - }; - }); - }) - # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { @@ -104,15 +92,24 @@ let doCheck = false; patches = []; }); + aioecowitt = super.aioecowitt.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -245,6 +242,19 @@ let }); }) + # Pinned due to API changes in 0.3.0 + (self: super: { + tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { + version = "0.2.0"; + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-tailscale"; + rev = "refs/tags/v${version}"; + hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; + }; + }); + }) + # Pinned due to API changes in 0.4.0 (self: super: { vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { @@ -271,6 +281,18 @@ let }); }) + (self: super: { + xiaomi-ble = super.xiaomi-ble.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "xiaomi-ble"; + rev = "refs/tags/v${version}"; + hash = "sha256-xdh8WHrSkbuOGqSiIiufjiVaO719DMDYzbprE3s2kmQ="; + }; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -300,7 +322,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.7"; + hassVersion = "2022.9.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -318,7 +340,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-FkI0EHO+M3dpt5xt73QkneQlCqgYUGKuO9MT3bRK2jI="; + hash = "sha256-uFmp0zgBU5rcMqpHNgscG+PywHraWgR0iMjOfjFx8hw="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -327,7 +349,6 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; }) - ./patches/wilight-import.patch ]; postPatch = let diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 868b8359e7de..8654b23ff187 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220802.0"; + version = "20220907.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-vUK/apsaJLaR/i6I2EWPxyohps+EazOr9ZuBKoRcyCI="; + sha256 = "sha256-G/2lOUffxKnEmd4mz/qAlNkzTNAUTfjKaGgvj6vG9ro="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/wilight-import.patch b/pkgs/servers/home-assistant/patches/wilight-import.patch deleted file mode 100644 index 2d6626b97438..000000000000 --- a/pkgs/servers/home-assistant/patches/wilight-import.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py -index 2cdcf20c1e..37b034c9ae 100644 ---- a/homeassistant/components/wilight/__init__.py -+++ b/homeassistant/components/wilight/__init__.py -@@ -2,7 +2,7 @@ - - from typing import Any - --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.config_entries import ConfigEntry - from homeassistant.const import Platform -diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py -index c598e6db39..3d0c6d0ff3 100644 ---- a/homeassistant/components/wilight/fan.py -+++ b/homeassistant/components/wilight/fan.py -@@ -13,7 +13,7 @@ from pywilight.const import ( - WL_SPEED_LOW, - WL_SPEED_MEDIUM, - ) --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature - from homeassistant.config_entries import ConfigEntry -diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py -index ea9e19dcb3..2509dc5073 100644 ---- a/homeassistant/components/wilight/light.py -+++ b/homeassistant/components/wilight/light.py -@@ -4,7 +4,7 @@ from __future__ import annotations - from typing import Any - - from pywilight.const import ITEM_LIGHT, LIGHT_COLOR, LIGHT_DIMMER, LIGHT_ON_OFF --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.components.light import ( - ATTR_BRIGHTNESS, -diff --git a/homeassistant/components/wilight/parent_device.py b/homeassistant/components/wilight/parent_device.py -index 17a33fef63..8091e78cc7 100644 ---- a/homeassistant/components/wilight/parent_device.py -+++ b/homeassistant/components/wilight/parent_device.py -@@ -5,7 +5,7 @@ import asyncio - import logging - - import pywilight --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - import requests - - from homeassistant.config_entries import ConfigEntry diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 77bb02662bc4..7703bc6b2832 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -7,11 +7,13 @@ let extraCheckInputs = with home-assistant.python.pkgs; { alexa = [ av ]; bluetooth = [ pyswitchbot ]; + bthome = [ xiaomi-ble ]; camera = [ av ]; cloud = [ mutagen ]; config = [ pydispatcher ]; generic = [ av ]; google_translate = [ mutagen ]; + homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; nest = [ av ]; @@ -19,6 +21,7 @@ let raspberry_pi = [ rpi-bad-power ]; tomorrowio = [ pyclimacell ]; version = [ aioaseko ]; + xiaomi_miio = [ arrow ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; zha = [ pydeconz ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04ce20cfd096..7b64d3225645 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5057,6 +5057,8 @@ in { leb128 = callPackage ../development/python-modules/leb128 { }; + led-ble = callPackage ../development/python-modules/led-ble { }; + ledger = (toPythonModule (pkgs.ledger.override { usePython = true; python3 = python; @@ -7243,6 +7245,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; }; + psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { }; + psycopg = callPackage ../development/python-modules/psycopg { }; psycopg2 = callPackage ../development/python-modules/psycopg2 { };