Unverified Commit 5c1ff7d6 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #309244 from NixOS/home-assistant

home-assistant: 2024.5.0 -> 2024.5.1
parents 84caa2e3 11317fa0
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  fetchpatch2,
  poetry-core,
  poetry-dynamic-versioning,
  pytestCheckHook,
  pythonOlder,
}:

buildPythonPackage rec {
  pname = "govee-local-api";
  version = "1.4.4";
  version = "1.4.5";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -19,12 +19,19 @@ buildPythonPackage rec {
    owner = "Galorhallen";
    repo = "govee-local-api";
    rev = "refs/tags/v${version}";
    hash = "sha256-J4SG4n6LIZ/G6pEXAzliV7uTWzqsH7rtFe3Y7BJ2dWE=";
    hash = "sha256-kmIuo/e3eLJTgmI+2Oq9Y0jov/133jXwgoBayGv33r4=";
  };

  patches = [
    (fetchpatch2 {
      # configure pep517 build-backend
      url = "https://github.com/Galorhallen/govee-local-api/commit/897a21ae723ff94343bbf4ba1541e3a1d3e03c94.patch";
      hash = "sha256-/d5jGKGME768Ar+WWWQUByHJPGB31OHShI4oLjcMUIU=";
    })
  ];

  build-system = [
    poetry-core
    poetry-dynamic-versioning
  ];

  nativeCheckInputs = [ pytestCheckHook ];
+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@

buildPythonPackage rec {
  pname = "habluetooth";
  version = "2.8.0";
  version = "2.8.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "habluetooth";
    rev = "refs/tags/v${version}";
    hash = "sha256-Qmq81iZpeLNrSIvxgkHl6ZYntlRwQPfPWRY2ZToQXCs=";
    hash = "sha256-2QiV32gDaoIBLUv/a3YzosFl6+E/nm0WoSUcTx9ph8s=";
  };

  postPatch = ''
+18 −5
Original line number Diff line number Diff line
@@ -9,33 +9,46 @@
, pytest-cov
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
, tenacity
}:

buildPythonPackage rec {
  pname = "pynws";
  version = "1.6.0";
  format = "setuptools";
  version = "1.7.0";
  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "MatthewFlamm";
    repo = pname;
    rev = "refs/tags/v${version}";
    hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU=";
    hash = "sha256-JjXGDjLITzJxEmCIv7RPvb+Jqe9hm++ptpJOryuK9M0=";
  };

  propagatedBuildInputs = [
  build-system = [
    setuptools
    setuptools-scm
  ];

  dependencies = [
    aiohttp
    metar
  ];

  optional-dependencies.retry = [
    tenacity
  ];

  nativeCheckInputs = [
    freezegun
    pytest-aiohttp
    pytest-asyncio
    pytest-cov
    pytestCheckHook
  ];
  ] ++ lib.flatten (lib.attrValues optional-dependencies);

  pythonImportsCheck = [ "pynws" ];

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
# Do not edit!

{
  version = "2024.5.0";
  version = "2024.5.1";
  components = {
    "3_day_blinds" = ps: with ps; [
    ];
@@ -3083,7 +3083,8 @@
    ];
    "nws" = ps: with ps; [
      pynws
    ];
    ]
    ++ pynws.optional-dependencies.retry;
    "nx584" = ps: with ps; [
      pynx584
    ];
+3 −3
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ let
  extraBuildInputs = extraPackages python.pkgs;

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

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

  # Secondary source is pypi sdist for translations
  sdist = fetchPypi {
    inherit pname version;
    hash = "sha256-9BgfQCP+t4zvC+ZVI0IAlm2qFArqRjTb8974sY/SHUg=";
    hash = "sha256-3Tqs+69e1ESOcEMCx3LTt1c04pG5pK/RGX30x8WRegQ=";
  };

  build-system = with python.pkgs; [
Loading