ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 17:49:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #278962 from NixOS/home-assistant

Browse Source 
home-assistant: 2024.1.0 -> 2024.1.1
This commit is contained in:
Martin Weinelt 2024-01-06 04:38:44 +01:00 committed by GitHub
commit b6e019f833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 80 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/aiohomekit/default.nix
View File

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohomekit"; pname = "aiohomekit";
version = "3.1.1"; version = "3.1.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "Jc2k"; owner = "Jc2k";
repo = "aiohomekit"; repo = "aiohomekit";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6dR7hMcHOjbFl4tnInMEYfnEWMFx+A+9TXoBcB83mrE="; hash = "sha256-GepXC3u37NuTWCoecUkR1+Ic/5ztn3f6cUlalZ0Na4o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/python-modules/habluetooth/default.nix
View File

@ -11,13 +11,12 @@
, bluetooth-adapters , bluetooth-adapters
, bluetooth-auto-recovery , bluetooth-auto-recovery
, bluetooth-data-tools , bluetooth-data-tools
, home-assistant-bluetooth
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "habluetooth"; pname = "habluetooth";
version = "2.0.1"; version = "2.0.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -26,7 +25,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices"; owner = "Bluetooth-Devices";
repo = "habluetooth"; repo = "habluetooth";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-vUq3WVo9dAt4Q/oid9ixLwI6v6jCavRU9FZYR6t6TzI="; hash = "sha256-3HyFKg+JR48MQrWmOjOQV2qhVHRHLnJHvtvBajXPDMg=";
}; };
postPatch = '' postPatch = ''
@ -47,7 +46,6 @@ buildPythonPackage rec {
bluetooth-adapters bluetooth-adapters
bluetooth-auto-recovery bluetooth-auto-recovery
bluetooth-data-tools bluetooth-data-tools
home-assistant-bluetooth
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

20
pkgs/development/python-modules/home-assistant-bluetooth/default.nix
View File

@ -2,25 +2,32 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
# build-system
, cython , cython
, poetry-core , poetry-core
, setuptools , setuptools
# dependencies
, habluetooth
# tests
, bleak , bleak
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "home-assistant-bluetooth"; pname = "home-assistant-bluetooth";
version = "1.10.4"; version = "1.11.0";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = "home-assistant-bluetooth";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-7gkesxQI6QBxyQpHlSSh1w6MDeid0dSdXn+jnxvafD0="; hash = "sha256-1Bp43TaJkrT9lZsBu4yiuOD4tE7vv6bYRlcgTfNwOuA=";
}; };
postPatch = '' postPatch = ''
@ -35,7 +42,7 @@ buildPythonPackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
bleak habluetooth
]; ];
pythonImportsCheck = [ pythonImportsCheck = [
@ -43,6 +50,7 @@ buildPythonPackage rec {
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
bleak
pytestCheckHook pytestCheckHook
]; ];

28
pkgs/development/python-modules/homeassistant-pyozw/default.nix
View File

@ -1,28 +0,0 @@
{ python_openzwave, fetchPypi, openzwave, fetchFromGitHub }:
(python_openzwave.override {
openzwave = openzwave.overrideAttrs (oldAttrs: {
version = "unstable-2020-03-24";
src = fetchFromGitHub {
owner = "home-assistant";
repo = "open-zwave";
rev = "94267fa298c1882f0dc73c0fd08f1f755ba83e83";
sha256 = "0p2869fwidz1wcqzfm52cwm9ab96pmwkna3d4yvvh21nh09cvmwk";
};
patches = [ ];
});
}).overridePythonAttrs (oldAttrs: rec {
pname = "homeassistant_pyozw";
version = "0.1.10";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "47c1abd8f3dc287760471c6c7b5fad222ead64763c4cb25e37d0599ea3b26952";
};
patches = [];
meta.homepage = "https://github.com/home-assistant/python-openzwave";
})

6
pkgs/development/python-modules/openwebifpy/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "openwebifpy"; pname = "openwebifpy";
version = "4.0.2"; version = "4.0.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.11";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-D2NCTn1Q3/AknmEAAOZO4d7i2mpM/kMlt94RaLmmnjM="; hash = "sha256-mGCi3nFnyzA+yKD5qtpErXYjOA6liZRiy7qJTbTGGnQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/orvibo/default.nix
View File

@ -5,14 +5,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "orvibo"; pname = "orvibo";
version = "1.1.1"; version = "1.1.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "happyleavesaoc"; owner = "happyleavesaoc";
repo = "python-orvibo"; repo = "python-orvibo";
rev = version; rev = version;
sha256 = "042prd5yxqvlfija7ii1xn424iv1p7ndhxv6m67ij8cbvspwx356"; sha256 = "sha256-Azmho47CEbRo18emmLKhYa/sViQX0oxUTUk4zdrpOaE=";
}; };
# Project as no tests # Project as no tests

4
pkgs/development/python-modules/python-tado/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-tado"; pname = "python-tado";
version = "0.17.2"; version = "0.17.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -18,7 +18,7 @@ buildPythonPackage rec {
repo = "PyTado"; repo = "PyTado";
# https://github.com/wmalgadey/PyTado/issues/62 # https://github.com/wmalgadey/PyTado/issues/62
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; hash = "sha256-whpNYiAb2cqKI4m0HJN2lPt51FLuEzrkrRTSWs6uznU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zwave-js-server-python"; pname = "zwave-js-server-python";
version = "0.55.2"; version = "0.55.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-yZlYsaN9j8WVtxWIXeH4Jqyo0xpDOC+2DCE8UA1c9h8="; hash = "sha256-FTcj0xZnIt0P6J/QRMC0bwcbRIVmpSWTorvE/AV/5PU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2024.1.0"; version = "2024.1.1";
components = { components = {
"3_day_blinds" = ps: with ps; [ "3_day_blinds" = ps: with ps; [
]; ];
@ -1042,9 +1042,10 @@
aiohttp-cors aiohttp-cors
aiohttp-fast-url-dispatcher aiohttp-fast-url-dispatcher
aiohttp-zlib-ng aiohttp-zlib-ng
dropmqttapi
janus janus
paho-mqtt paho-mqtt
]; # missing inputs: dropmqttapi ];
"dsmr" = ps: with ps; [ "dsmr" = ps: with ps; [
dsmr-parser dsmr-parser
]; ];
@ -5846,6 +5847,7 @@
"doorbird" "doorbird"
"dormakaba_dkey" "dormakaba_dkey"
"dremel_3d_printer" "dremel_3d_printer"
"drop_connect"
"dsmr" "dsmr"
"dsmr_reader" "dsmr_reader"
"dte_energy_bridge" "dte_energy_bridge"

6
pkgs/servers/home-assistant/default.nix
View File

@ -312,7 +312,7 @@ let
extraBuildInputs = extraPackages python.pkgs; extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2024.1.0"; hassVersion = "2024.1.1";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -330,13 +330,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-aNSyBr4QEK4pmYnRGW1LNuCSU5EpZtLEGQUtYL+CvUg="; hash = "sha256-jTBNjVBPtxNG+5Ju3Dgjnpl9i5DM6qo92yWKNaFzfCo=";
}; };
# Secondary source is pypi sdist for translations # Secondary source is pypi sdist for translations
sdist = fetchPypi { sdist = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-szlvSfkcPG6DGGHZ5iNtz0EBa8DVYaoGZWSlc7AEG1I="; hash = "sha256-LpiZ9cvfMgzpDtEriiTeDGIsl9QX8LzebzUtb8H73VE=";
}; };
nativeBuildInputs = with python.pkgs; [ nativeBuildInputs = with python.pkgs; [

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here # 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 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20240103.3"; version = "20240104.0";
format = "wheel"; format = "wheel";
src = fetchPypi { src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend"; pname = "home_assistant_frontend";
dist = "py3"; dist = "py3";
python = "py3"; python = "py3";
hash = "sha256-xCYAGig8sKZHa2Ix+XhR33xcKPucwvQFikuYjXpqzNM="; hash = "sha256-AQkrnU5UKsrl02CXDNf/aMTPII39poWJoZ4nBpySTZE=";
}; };
# there is nothing to strip in this package # there is nothing to strip in this package

4
pkgs/servers/home-assistant/stubs.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "homeassistant-stubs"; pname = "homeassistant-stubs";
version = "2024.1.0"; version = "2024.1.1";
format = "pyproject"; format = "pyproject";
disabled = python.version != home-assistant.python.version; disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI"; owner = "KapJI";
repo = "homeassistant-stubs"; repo = "homeassistant-stubs";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-FOf0MCyYIIoPa7H39rY+2jUy7O6/c4DDRhDHJ7tSEcU="; hash = "sha256-jVmjMs1OmxSnx0cQHXbAezJhkv5V8PRJOSDmfx0XQ9o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

107
pkgs/servers/home-assistant/tests.nix
View File

@ -5,45 +5,53 @@
let let
# some components' tests have additional dependencies # some components' tests have additional dependencies
extraCheckInputs = with home-assistant.python.pkgs; { extraCheckInputs = with home-assistant.python.pkgs; {
airzone_cloud = [ aioairzone ]; airzone_cloud = [
alexa = [ av ]; aioairzone
bluetooth = [ pyswitchbot ]; ];
bthome = [ xiaomi-ble ]; bluetooth = [
camera = [ av ]; pyswitchbot
cloud = [ mutagen ]; ];
config = [ pydispatcher ]; govee_ble = [
generic = [ av ]; ibeacon-ble
google_translate = [ mutagen ]; ];
google_sheets = [ oauth2client ]; lovelace = [
govee_ble = [ ibeacon-ble ]; pychromecast
hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; ];
homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; matrix = [
homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; pydantic
lovelace = [ pychromecast ]; ];
matrix = [ pydantic ]; mopeka = [
mopeka = [ pyswitchbot ]; pyswitchbot
nest = [ av ]; ];
onboarding = [ pymetno radios rpi-bad-power ]; onboarding = [
otbr = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; pymetno
raspberry_pi = [ rpi-bad-power ]; radios
shelly = [ pyswitchbot ]; rpi-bad-power
tilt_ble = [ govee-ble ibeacon-ble ]; ];
tomorrowio = [ pyclimacell ]; raspberry_pi = [
version = [ aioaseko ]; rpi-bad-power
xiaomi_miio = [ arrow ]; ];
voicerss = [ mutagen ]; shelly = [
yandextts = [ mutagen ]; pyswitchbot
zha = [ pydeconz ]; ];
zwave_js = [ homeassistant-pyozw ]; tilt_ble = [
ibeacon-ble
];
xiaomi_miio = [
arrow
];
zha = [
pydeconz
];
}; };
extraDisabledTestPaths = { extraDisabledTestPaths = {
}; };
extraDisabledTests = { extraDisabledTests = {
mqtt = [ private_ble_device = [
# Assert None is not None # AssertionError: assert '90' == '90.0'
"test_handle_logging_on_writing_the_entity_state" "test_estimated_broadcast_interval"
]; ];
shell_command = [ shell_command = [
# tries to retrieve file from github # tries to retrieve file from github
@ -53,17 +61,9 @@ let
# missing operating_status attribute in entity # missing operating_status attribute in entity
"test_sensor_entities" "test_sensor_entities"
]; ];
vesync = [
# homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration
"test_async_get_config_entry_diagnostics__single_humidifier"
"test_async_get_device_diagnostics__single_fan"
];
}; };
extraPytestFlagsArray = { extraPytestFlagsArray = {
conversation = [
"--deselect tests/components/conversation/test_init.py::test_get_agent_list"
];
cloud = [ cloud = [
# Tries to connect to alexa-api.nabucasa.com:443 # Tries to connect to alexa-api.nabucasa.com:443
"--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state" "--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state"
@ -72,41 +72,16 @@ let
# Tries to resolve DNS entries # Tries to resolve DNS entries
"--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
]; ];
history_stats = [
# Flaky: AssertionError: assert '0.0' == '12.0'
"--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed"
];
jellyfin = [ jellyfin = [
# AssertionError: assert 'audio/x-flac' == 'audio/flac' # AssertionError: assert 'audio/x-flac' == 'audio/flac'
"--deselect tests/components/jellyfin/test_media_source.py::test_resolve" "--deselect tests/components/jellyfin/test_media_source.py::test_resolve"
# AssertionError: assert [+ received] == [- snapshot] # AssertionError: assert [+ received] == [- snapshot]
"--deselect tests/components/jellyfin/test_media_source.py::test_music_library" "--deselect tests/components/jellyfin/test_media_source.py::test_music_library"
]; ];
modbus = [
# homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception
"--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail"
];
modem_callerid = [ modem_callerid = [
# aioserial mock produces wrong state # aioserial mock produces wrong state
"--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry"
]; ];
sonos = [
# KeyError: 'sonos_media_player'
"--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings"
"--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3"
];
unifiprotect = [
# "TypeError: object Mock can't be used in 'await' expression
"--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix"
];
xiaomi_ble = [
# assert 0 == 1"
"--deselect tests/components/xiaomi_ble/test_sensor.py::test_xiaomi_consumable"
];
zha = [
"--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp"
"--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp"
];
}; };
in lib.listToAttrs (map (component: lib.nameValuePair component ( in lib.listToAttrs (map (component: lib.nameValuePair component (
home-assistant.overridePythonAttrs (old: { home-assistant.overridePythonAttrs (old: {

1
pkgs/top-level/python-aliases.nix
View File

@ -194,6 +194,7 @@ mapAliases ({
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
hglib = python-hglib; # added 2023-10-13 hglib = python-hglib; # added 2023-10-13
homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05
HTSeq = htseq; # added 2023-02-19 HTSeq = htseq; # added 2023-02-19
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08 ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08

2
pkgs/top-level/python-packages.nix
View File

@ -5178,8 +5178,6 @@ self: super: with self; {
home-assistant-chip-core = callPackage ../development/python-modules/home-assistant-chip-core { }; home-assistant-chip-core = callPackage ../development/python-modules/home-assistant-chip-core { };
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { }; homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { };
homeconnect = callPackage ../development/python-modules/homeconnect { }; homeconnect = callPackage ../development/python-modules/homeconnect { };