Unverified Commit b3b1015a authored by Martin Weinelt's avatar Martin Weinelt
Browse files
parent 2f5e1943
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
# Do not edit!

{
  version = "2024.7.0";
  version = "2024.7.1";
  components = {
    "3_day_blinds" = ps: with ps; [
    ];
@@ -687,7 +687,7 @@
    "command_line" = ps: with ps; [
    ];
    "compensation" = ps: with ps; [
      numpy
      numpy_1
    ];
    "concord232" = ps: with ps; [
    ]; # missing inputs: concord232
@@ -784,7 +784,7 @@
      home-assistant-intents
      ifaddr
      mutagen
      numpy
      numpy_1
      pillow
      psutil-home-assistant
      pynacl
@@ -2133,7 +2133,7 @@
      pyipp
    ];
    "iqvia" = ps: with ps; [
      numpy
      numpy_1
      pyiqvia
    ];
    "irish_rail_transport" = ps: with ps; [
@@ -4294,7 +4294,7 @@
    ]; # missing inputs: stookwijzer
    "stream" = ps: with ps; [
      ha-av
      numpy
      numpy_1
      pyturbojpeg
    ];
    "streamlabswater" = ps: with ps; [
@@ -4465,7 +4465,7 @@
    "template" = ps: with ps; [
    ];
    "tensorflow" = ps: with ps; [
      numpy
      numpy_1
      pillow
      pycocotools
      tensorflow
@@ -4697,7 +4697,7 @@
    "travisci" = ps: with ps; [
    ]; # missing inputs: TravisPy
    "trend" = ps: with ps; [
      numpy
      numpy_1
    ];
    "tts" = ps: with ps; [
      ha-ffmpeg
+3 −6
Original line number Diff line number Diff line
@@ -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";
@@ -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; [
@@ -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 = ''
+2 −2
Original line number Diff line number Diff line
@@ -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 = "20240703.0";
  version = "20240705.0";
  format = "wheel";

  src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
    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
+0 −25
Original line number Diff line number Diff line
From b6a23fad3537e0baa026b2a7eb5bff8a4246780b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Thu, 4 Jul 2024 01:18:28 +0200
Subject: [PATCH] Fix broken pathlib import in august integration (#121135)

---
 homeassistant/components/august/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/august/__init__.py b/homeassistant/components/august/__init__.py
index eec794896f6bb..53aa3cdffd8cb 100644
--- a/homeassistant/components/august/__init__.py
+++ b/homeassistant/components/august/__init__.py
@@ -2,10 +2,10 @@
 
 from __future__ import annotations
 
+from pathlib import Path
 from typing import cast
 
 from aiohttp import ClientResponseError
-from path import Path
 from yalexs.exceptions import AugustApiAIOHTTPError
 from yalexs.manager.exceptions import CannotConnect, InvalidAuth, RequireValidation
 from yalexs.manager.gateway import Config as YaleXSConfig
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ PKG_SET = "home-assistant.python.pkgs"
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",