Unverified Commit 818cad4a authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #305711 from NixOS/home-assistant

home-assistant: 2024.4.2 -> 2024.4.3
parents 006b543c cf99dec3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@

buildPythonPackage rec {
  pname = "aranet4";
  version = "2.2.3";
  version = "2.3.3";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "Anrijs";
    repo = "Aranet4-Python";
    rev = "refs/tags/v${version}";
    hash = "sha256-Jd7yuddxwRrO7XFQsVGy5vRQxwIUZdwFSjiZZHdkE3g=";
    hash = "sha256-j53d2Ki9xVWGHWkAu1wkjYE56Xq7kfMmqQrQiKrBg2I=";
  };

  nativeBuildInputs = [
+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
, click
, click-log
, fetchFromGitHub
, fetchpatch2
, pure-pcapy3
, pyserial-asyncio
, pytest-asyncio
@@ -29,6 +30,13 @@ buildPythonPackage rec {
    hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw=";
  };

  patches = [
    (fetchpatch2 {
      url = "https://github.com/zigpy/bellows/commit/7833647083f27f55b7ad345f4aaa7dffaa369abc.patch";
      hash = "sha256-v+BOPqikWoyNtZ1qRWe3RwraG6nQnfZqoV6yj9PpGX8=";
    })
  ];

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace-fail '"setuptools-git-versioning<2"' "" \
+9 −0
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch2
, html5lib
, pytestCheckHook
, pythonOlder
@@ -19,6 +20,14 @@ buildPythonPackage rec {
    hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE=";
  };

  patches = [
    (fetchpatch2 {
      # python 3.11+ compat
      url = "https://github.com/python-mechanize/mechanize/commit/1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c.patch";
      hash = "sha256-d0Zuz6m2Uv8pnR8TC0L+AStS82rPPTpQrrjkCZnJliE=";
    })
  ];

  nativeBuildInputs = [
    setuptools
  ];
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
# Do not edit!

{
  version = "2024.4.2";
  version = "2024.4.3";
  components = {
    "3_day_blinds" = ps: with ps; [
    ];
+5 −3
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ let
  extraBuildInputs = extraPackages python.pkgs;

  # Don't forget to run parse-requirements.py after updating
  hassVersion = "2024.4.2";
  hassVersion = "2024.4.3";

in python.pkgs.buildPythonApplication rec {
  pname = "homeassistant";
@@ -544,13 +544,13 @@ in python.pkgs.buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    rev = "refs/tags/${version}";
    hash = "sha256-V6qvpPrhfSLINH99hYkAjvG8pfIN8AXGO3HuwiKgMPo=";
    hash = "sha256-jHt4cWi1JxUs2XKf0N9gqsYj5XZK7TXwgj7WPZ7dmEA=";
  };

  # Secondary source is pypi sdist for translations
  sdist = fetchPypi {
    inherit pname version;
    hash = "sha256-ZtTlLRDSXKUz+ZA+UctFL+d3wdKrcPdeROIUhS35qWU=";
    hash = "sha256-sj3usdXUl/wNElO3OgGx6dsBqn9+h9zq/AC3Zdn379M=";
  };

  nativeBuildInputs = with python.pkgs; [
@@ -559,6 +559,7 @@ in python.pkgs.buildPythonApplication rec {
  ];

  pythonRelaxDeps = [
    "aiohttp"
    "attrs"
    "bcrypt"
    "ciso8601"
@@ -566,6 +567,7 @@ in python.pkgs.buildPythonApplication rec {
    "hass-nabucasa"
    "httpx"
    "orjson"
    "pillow"
    "pyopenssl"
    "typing-extensions"
    "urllib3"
Loading