Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

home-assistant: 2024.7.0 -> 2024.7.1 #324850

Merged
merged 4 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/aiowebostv/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

buildPythonPackage rec {
pname = "aiowebostv";
version = "0.4.1";
version = "0.4.2";
pyproject = true;

disabled = pythonOlder "3.9";
Expand All @@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aiowebostv";
rev = "refs/tags/v${version}";
hash = "sha256-pjHm+oCwbiD2dtkl30yATIVP85R72xEk/cmA+a5b05c=";
hash = "sha256-RrSEl/U6UzPoE2151opDe0QRmj6M6wAtsQyF4/dd8ek=";
};

nativeBuildInputs = [ setuptools ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/python-kasa/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

buildPythonPackage rec {
pname = "python-kasa";
version = "0.7.0.2";
version = "0.7.0.3";
pyproject = true;

disabled = pythonOlder "3.8";
Expand All @@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "python-kasa";
repo = "python-kasa";
rev = "refs/tags/${version}";
hash = "sha256-Ah2SmKHinpjPMNl1cn2I5FouxhVvg56tg70dOM7C444=";
hash = "sha256-jbyc4YeUKjioUFXL5SVdgeUlSIiOCJ7D0cZRWPiKZII=";
};

build-system = [ poetry-core ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/velbus-aio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

buildPythonPackage rec {
pname = "velbus-aio";
version = "2024.7.1";
version = "2024.7.5";
pyproject = true;

disabled = pythonOlder "3.7";
Expand All @@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = "velbus-aio";
rev = "refs/tags/${version}";
hash = "sha256-lKCeNQkI+KxhDZ2DYZPteLxJ5J1vBahyH2S7QTYAUiQ=";
hash = "sha256-nGFx4ZqGTLMOmYNZam5jLKUsL3GxyyDwT8WFSEX9Qcs=";
fetchSubmodules = true;
};

Expand Down
14 changes: 7 additions & 7 deletions pkgs/servers/home-assistant/component-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Do not edit!

{
version = "2024.7.0";
version = "2024.7.1";
components = {
"3_day_blinds" = ps: with ps; [
];
Expand Down Expand Up @@ -687,7 +687,7 @@
"command_line" = ps: with ps; [
];
"compensation" = ps: with ps; [
numpy
numpy_1
];
"concord232" = ps: with ps; [
]; # missing inputs: concord232
Expand Down Expand Up @@ -784,7 +784,7 @@
home-assistant-intents
ifaddr
mutagen
numpy
numpy_1
pillow
psutil-home-assistant
pynacl
Expand Down Expand Up @@ -2133,7 +2133,7 @@
pyipp
];
"iqvia" = ps: with ps; [
numpy
numpy_1
pyiqvia
];
"irish_rail_transport" = ps: with ps; [
Expand Down Expand Up @@ -4294,7 +4294,7 @@
]; # missing inputs: stookwijzer
"stream" = ps: with ps; [
ha-av
numpy
numpy_1
pyturbojpeg
];
"streamlabswater" = ps: with ps; [
Expand Down Expand Up @@ -4465,7 +4465,7 @@
"template" = ps: with ps; [
];
"tensorflow" = ps: with ps; [
numpy
numpy_1
pillow
pycocotools
tensorflow
Expand Down Expand Up @@ -4697,7 +4697,7 @@
"travisci" = ps: with ps; [
]; # missing inputs: TravisPy
"trend" = ps: with ps; [
numpy
numpy_1
];
"tts" = ps: with ps; [
ha-ffmpeg
Expand Down
9 changes: 3 additions & 6 deletions pkgs/servers/home-assistant/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ let
extraBuildInputs = extraPackages python.pkgs;

# Don't forget to run update-component-packages.py after updating
hassVersion = "2024.7.0";
hassVersion = "2024.7.1";

in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
Expand All @@ -503,13 +503,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-0+h8Ml/EuEqfTh+TXyrCw07GpyyL84NlgJwPbLc/8XU=";
hash = "sha256-y3VYxlPit9LuC+9F+fQoJs3WD9LsvrMZMiSCqbzkgmk=";
};

# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-bxA6iJ90SYM8HOexyq5biKzTlQvU+V2UGtrKMR2+KWQ=";
hash = "sha256-pFsv0guypnRPeZOg2WrG2HL27W903iANHkvdQ8dCJHo=";
};

build-system = with python.pkgs; [
Expand Down Expand Up @@ -549,9 +549,6 @@ in python.pkgs.buildPythonApplication rec {
src = ./patches/ffmpeg-path.patch;
ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
})

# https://github.com/home-assistant/core/pull/121135
./patches/august-pathlib-import.patch
];

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/home-assistant/frontend.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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 = "20240703.0";
version = "20240705.0";
format = "wheel";

src = fetchPypi {
inherit version format;
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-O6BpAQrMcP+h33tT2IxuupKo+5qkkDYXNwd6XCrj0CU=";
hash = "sha256-uZs/2/+fmnZzDzEuzEus0LDUNTSQIs/jL4FMBJBpXAE=";
};

# there is nothing to strip in this package
Expand Down
25 changes: 0 additions & 25 deletions pkgs/servers/home-assistant/patches/august-pathlib-import.patch

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/servers/home-assistant/update-component-packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
PKG_PREFERENCES = {
"fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466
"HAP-python": "hap-python",
"numpy": "numpy_1",
"ollama-hass": "ollama",
"sentry-sdk": "sentry-sdk",
"slackclient": "slack-sdk",
Expand Down