cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #239634 from NixOS/home-assistant

Browse source 
home-assistant: 2023.6.2 -> 2023.6.3
This commit is contained in:
Martin Weinelt 2023-06-25 12:13:29 +02:00 committed by GitHub
commit 63e687f269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 54 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/python-modules/bthome-ble/default.nix
View file

@ -7,12 +7,13 @@
, pycryptodomex
, pytestCheckHook
, pythonOlder
, pytz
, sensor-state-data
}:
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.11.3";
version = "2.12.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-axumlQnD7MKGdmy1gGQNU4B/3jXffK2jTyO3BtWvp5w=";
hash = "sha256-SonB0pT6sC6kpFmIMzNeASUHyuik4HOOquWx6+K05Y8=";
};
nativeBuildInputs = [
@ -33,6 +34,7 @@ buildPythonPackage rec {
bluetooth-sensor-state-data
sensor-state-data
pycryptodomex
pytz
];
nativeCheckInputs = [

6
pkgs/development/python-modules/exceptiongroup/default.nix
View file

@ -33,6 +33,12 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = if (pythonAtLeast "3.11") then [
# regression in 3.11.4
# https://github.com/agronholm/exceptiongroup/issues/64
"test_catch_handler_raises"
] else null;
pythonImportsCheck = [
"exceptiongroup"
];

4
pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-clusters";
version = "2023.5.3";
version = "2023.6.0";
format = "wheel";
src = fetchPypi {
@ -15,7 +15,7 @@ buildPythonPackage rec {
pname = "home_assistant_chip_clusters";
dist = "py3";
python = "py3";
hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY=";
hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/home-assistant-chip-core/default.nix
View file

@ -8,6 +8,7 @@
, autoPatchelfHook
# runtime
, libnl
, openssl_1_1
# propagates
@ -27,7 +28,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-core";
version = "2023.5.3";
version = "2023.6.0";
format = "wheel";
disabled = pythonOlder "3.7";
@ -36,11 +37,11 @@ buildPythonPackage rec {
system = {
"aarch64-linux" = {
name = "aarch64";
hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ=";
hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA=";
};
"x86_64-linux" = {
name = "x86_64";
hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0=";
hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI=";
};
}.${stdenv.system} or (throw "Unsupported system");
in fetchPypi {
@ -58,6 +59,7 @@ buildPythonPackage rec {
];
buildInputs = [
libnl
openssl_1_1
];

13
pkgs/development/python-modules/ical/default.nix
View file

@ -13,12 +13,13 @@
, pytest-golden
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, pyyaml
}:
buildPythonPackage rec {
pname = "ical";
version = "4.5.3";
version = "4.5.4";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -27,9 +28,17 @@ buildPythonPackage rec {
owner = "allenporter";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU=";
hash = "sha256-UcuJ23yzpRHDUFlwov692UyLXP/9Qb4F+IJIszo12/M=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"tzdata"
];
propagatedBuildInputs = [
emoji
python-dateutil

4
pkgs/development/python-modules/python-matter-server/default.nix
View file

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "python-matter-server";
version = "3.4.2";
version = "3.5.2";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I=";
hash = "sha256-sLVKhQIqJanvupfkJSLObHTiyGE+PP8UdQR2my1azUA=";
};
nativeBuildInputs = [

5
pkgs/development/python-modules/restrictedpython/default.nix
View file

@ -3,6 +3,7 @@
, fetchPypi
, pytest-mock
, pytestCheckHook
, pythonAtLeast
, pythonOlder
}:
@ -24,6 +25,10 @@ buildPythonPackage rec {
pytest-mock
];
disabledTests = lib.optionals (pythonAtLeast "3.11") [
"test_compile__compile_restricted_exec__5"
];
pythonImportsCheck = [
"RestrictedPython"
];

2
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.6.2";
version = "2023.6.3";
components = {
"3_day_blinds" = ps: with ps; [
];

17
pkgs/servers/home-assistant/default.nix
View file

@ -231,15 +231,6 @@ let
doCheck = false;
});
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "2.0.12";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w=";
};
});
# Pinned due to API changes in 0.3.0
tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
version = "0.2.0";
@ -296,7 +287,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.6.2";
hassVersion = "2023.6.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -312,7 +303,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0=";
hash = "sha256-hlU2LNG/9Uy7XfST/ZwVOQCar0IFvFUgpMSoSCviTrc=";
};
# Secondary source is git for tests
@ -320,7 +311,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8=";
hash = "sha256-V/ndNu8zvtI8Z0LzrlWaV+EbeL8oBBz/D46ec+fhPPY=";
};
nativeBuildInputs = with python.pkgs; [
@ -357,7 +348,7 @@ in python.pkgs.buildPythonApplication rec {
"PyJWT"
"pyOpenSSL"
"requests"
"typing-extensions"
"typing_extensions"
"voluptuous-serialize"
"yarl"
];

5
pkgs/servers/home-assistant/stubs.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.6.2";
version = "2023.6.3";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms=";
hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc=";
};
nativeBuildInputs = [
@ -30,7 +30,6 @@ buildPythonPackage rec {
substituteInPlace pyproject.toml --replace \
'homeassistant = "${version}"' \
'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"'
cat pyproject.toml
'';
pythonImportsCheck = [

12
pkgs/servers/home-assistant/tests.nix
View file

@ -47,6 +47,9 @@ let
};
extraPytestFlagsArray = {
conversation = [
"--deselect tests/components/conversation/test_init.py::test_get_agent_list"
];
dnsip = [
# Tries to resolve DNS entries
"--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
@ -63,10 +66,19 @@ let
# aioserial mock produces wrong state
"--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"
];
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 (
home-assistant.overridePythonAttrs (old: {