Unverified Commit 737bde6f authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #285124 from NixOS/home-assistant 

home-assistant: 2024.1.5 -> 2024.1.6
parents 8df3afb8 acd8d61a

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix

+4 −15
Original line number Diff line number Diff line
@@ -4,33 +4,22 @@ 
, fetchPypi

, pythonOlder

, setuptools

, wheel

}:



buildPythonPackage rec {

  pname = "insteon-frontend-home-assistant";

  version = "0.3.5-1";

  format = "pyproject";

  version = "0.5.0";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.10";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-R+P4pgKbLvf0mwpSDoujCvlJe/yS+nvSJ7ewLVOOg/0=";

    hash = "sha256-NZwnx8tlXnsVCk4nvNjOg3cjSr2CnjqWcZG7xFTC2wA=";

  };



  patches = [

    # https://github.com/pyinsteon/insteon-panel/pull/33

    (fetchpatch {

      name = "unpin-setuptools.patch";

      url = "https://github.com/pyinsteon/insteon-panel/commit/2297eb05668907edd03633f244e5876990e340c7.patch";

      hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";

    })

  ];



  nativeBuildInputs = [

    setuptools

    wheel

  ];



  # upstream has no tests

pkgs/development/python-modules/python-homewizard-energy/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 


buildPythonPackage rec {

  pname = "python-homewizard-energy";

  version = "4.1.1";

  format = "pyproject";

  version = "4.2.2";

  pyproject = true;



  disabled = pythonOlder "3.9";
@@ -22,12 +22,12 @@ buildPythonPackage rec { 
    owner = "DCSBL";

    repo = "python-homewizard-energy";

    rev = "refs/tags/v${version}";

    hash = "sha256-p7uwodjC+wTGrlKf4i4ZRTPg9Qh9krsmwPpWNdF6J4U=";

    hash = "sha256-CNSZBH+D74Y71k7Ws0OlgN1/i/lWXlkz6MC3IXL5ycQ=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace 'version = "0.0.0"' 'version = "${version}"'

      --replace-fail 'version = "0.0.0"' 'version = "${version}"'

  '';



  nativeBuildInputs = [

pkgs/servers/home-assistant/component-packages.nix

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



{

  version = "2024.1.5";

  version = "2024.1.6";

  components = {

    "3_day_blinds" = ps: with ps; [

    ];
@@ -1676,6 +1676,7 @@ 
      aiohttp-zlib-ng

      fnv-hash-fast

      gcal-sync

      ical

      oauth2client

      psutil-home-assistant

      sqlalchemy

pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,16 +5,16 @@ 


buildNpmPackage rec {

  pname = "mushroom";

  version = "3.2.4";

  version = "3.4.0";



  src = fetchFromGitHub {

    owner = "piitaya";

    repo = "lovelace-mushroom";

    rev = "v${version}";

    hash = "sha256-UV/kqeVslB1lc1a9uvj8ocQKeAVINwo3aH8oHC9GLBQ=";

    hash = "sha256-XVi+VPOVHfYBlIY9xN7x9Qe1bVw/qS9p8bcRZb0ksE0=";

  };



  npmDepsHash = "sha256-p43ks6HM23LK3LOBOZA0uV+DTOj89/boBpjcXpbcw24=";

  npmDepsHash = "sha256-XtSeO5+RaBCBLmq6paRX9KipkhcEdJhzrQeEDdysZE0=";



  installPhase = ''

    runHook preInstall

pkgs/servers/home-assistant/default.nix

+21 −3
Original line number Diff line number Diff line
@@ -46,6 +46,24 @@ let 
        ];

      });



      aiohttp = super.aiohttp.overridePythonAttrs (old: rec {

        version = "3.9.3";

        src = fetchFromGitHub {

          owner = "aio-libs";

          repo = "aiohttp";

          rev = "refs/tags/v${version}";

          hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE=";

        };

        nativeCheckInputs = with self; [

          freezegun

          gunicorn

          pytest-mock

          pytestCheckHook

          python-on-whales

          re-assert

        ];

      });



      aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec {

        version = "2023.05.5";

        src = fetchFromGitHub {
@@ -448,7 +466,7 @@ let 
  extraBuildInputs = extraPackages python.pkgs;



  # Don't forget to run parse-requirements.py after updating

  hassVersion = "2024.1.5";

  hassVersion = "2024.1.6";



in python.pkgs.buildPythonApplication rec {

  pname = "homeassistant";
@@ -466,13 +484,13 @@ in python.pkgs.buildPythonApplication rec { 
    owner = "home-assistant";

    repo = "core";

    rev = "refs/tags/${version}";

    hash = "sha256-6HPHoUpS2WXbYx7Tbqp9LLo25DyNzNd/THpSo7Y43Jw=";

    hash = "sha256-zCpdOl16ZkO9mr0nYZg1mlnGNaPaX0RALFEDRHGfKvM=";

  };



  # Secondary source is pypi sdist for translations

  sdist = fetchPypi {

    inherit pname version;

    hash = "sha256-cptN6NgB/1qnvz+/EqDBQiH2vSQsOeSljSVFZBFXR5Y=";

    hash = "sha256-ipAw+vqePa5KA/Gqhl3WsQbzmzMXjmVx0NvbrM84SKg=";

  };



  nativeBuildInputs = with python.pkgs; [