Merge pull request #195278 from NixOS/home-assistant

2024-11-26 08:53:21 +00:00 · 2022-10-09 23:10:35 +02:00 · 2022-10-09 23:10:35 +02:00 · 34c5293a71
commit 34c5293a71
parent 9bb7ee9867 1c6a1eefe8
12 changed files with 42 additions and 32 deletions
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aiounifi";
-  version = "37";
+  version = "38";

  disabled = pythonOlder "3.9";

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "Kane610";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-VKR01lbXznkO/OQvvxvMJOjPIPSynLWT6G/YV4Essy0=";
+    hash = "sha256-NKraMxpP9O22NzO4UDl6zYBeJldTRdf4U43WVQYcPyQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "bellows";
-  version = "0.34.1";
+  version = "0.34.2";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "zigpy";
    repo = "bellows";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-a2skDJVqbct1+Ky2D8LXv8VMqFwqznUzXh+o+M6GtvQ=";
+    sha256 = "sha256-78LUQBFV4TFPDLiSHBG+RLnQLaCPX4LZpow9aszQAQA=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@ -12,14 +12,16 @@

 buildPythonPackage rec {
  pname = "pydaikin";
-  version = "2.7.0";
+  version = "2.7.2";
+  format = "setuptools";
+
  disabled = pythonOlder "3.6";

  src = fetchFromBitbucket {
    owner = "mustang51";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg=";
+    hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig=";
  };

  propagatedBuildInputs = [
@ -28,17 +30,15 @@ buildPythonPackage rec {
    urllib3
  ];

-  # while they have tests, they do not run them in their CI and they fail as of 2.7.0
-  # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
-  doCheck = false;
-
  checkInputs = [
    freezegun
    pytest-aiohttp
    pytestCheckHook
  ];

-  pythonImportsCheck = [ "pydaikin" ];
+  pythonImportsCheck = [
+    "pydaikin"
+  ];

  meta = with lib; {
    description = "Python Daikin HVAC appliances interface";
--- a/pkgs/development/python-modules/pyhumps/default.nix
+++ b/pkgs/development/python-modules/pyhumps/default.nix
@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , poetry-core
 , pytestCheckHook
 , pythonOlder
@ -20,6 +21,14 @@ buildPythonPackage rec {
    hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc=";
  };

+  patches = [
+    (fetchpatch {
+      # https://github.com/nficano/humps/pull/281
+      url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch";
+      hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4=";
+    })
+  ];
+
  nativeBuildInputs = [
    poetry-core
  ];
--- a/pkgs/development/python-modules/pymicrobot/default.nix
+++ b/pkgs/development/python-modules/pymicrobot/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "pymicrobot";
-  version = "0.0.6";
+  version = "0.0.8";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -16,7 +16,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "PyMicroBot";
    inherit version;
-    hash = "sha256-BvxF/9bnA0oXCAXq1GXoR7AUnPF9hQLxmlOHxfYX+u8=";
+    hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "pyoverkiz";
-  version = "1.5.4";
+  version = "1.5.5";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -24,9 +24,14 @@ buildPythonPackage rec {
    owner = "iMicknl";
    repo = "python-overkiz-api";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+2L62GG9amP+0RROk9GzJqcaXsXCv+BMmMyUMH7VxYI=";
+    hash = "sha256-5HoCoVgq1pg+VxD324Fijosk2ln4sGE0oWpemFVAsfc=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"'
+  '';
+
  nativeBuildInputs = [
    poetry-core
  ];
@ -45,11 +50,6 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'backoff = "^1.10.0"' 'backoff = "*"'
-  '';
-
  pythonImportsCheck = [
    "pyoverkiz"
  ];
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "zigpy-xbee";
-  version = "0.16.0";
+  version = "0.16.1";
  # https://github.com/Martiusweb/asynctest/issues/152
  # broken by upstream python bug with asynctest and
  # is used exclusively by home-assistant with python 3.8
@ -22,8 +22,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "zigpy";
    repo = "zigpy-xbee";
-    rev = version;
-    sha256 = "sha256-0Eg+XaMDEB3Zh0Ksn8Nsaf7AYdhRqzpscuZIz19DxCI=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-75LftepCexIsqVMgrJKeTJWHlPI5zcj2aZbJt09JSwE=";
  };

  buildInputs = [
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "zigpy-zigate";
-  version = "0.10.0";
+  version = "0.10.1";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "zigpy-zigate";
    rev = "refs/tags/v${version}";
-    hash = "sha256-JcKmLD3ET17PaNm1DoAV8TDMw88Qd5okDPOStLUqASM=";
+    hash = "sha256-g6EFc9z9LrUawDczgGaIt5o+Vgp5U3swJJD8VftL4bQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "zigpy-znp";
-  version = "0.9.0";
+  version = "0.9.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-GvGWda+vsDwJrRIjc3hkl9zMrJ/cj2HGvHSeCROE69g=";
+    sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "zigpy";
-  version = "0.51.2";
+  version = "0.51.3";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "zigpy";
    rev = "refs/tags/${version}";
-    hash = "sha256-6JHj75ntbW3Pu4P6/nw0/xhZ+fZCfpNCzB1ZB7WJ0jY=";
+    hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -2,7 +2,7 @@
 # Do not edit!

 {
-  version = "2022.10.1";
+  version = "2022.10.2";
  components = {
    "abode" = ps: with ps; [
      abodepy
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@ -261,7 +261,7 @@ let
  extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

  # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2022.10.1";
+  hassVersion = "2022.10.2";

 in python.pkgs.buildPythonApplication rec {
  pname = "homeassistant";
@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    rev = version;
-    hash = "sha256-+hf+Qjj/UrEJ8gHsaXZonKkANVJpjEsb5HoaSbsCFJ8=";
+    hash = "sha256-bx4bixTWeOho8MG5yPBmVp07a7k8xfCli8OhQovG7Qw=";
  };

  # leave this in, so users don't have to constantly update their downstream patch handling
@ -302,6 +302,7 @@ in python.pkgs.buildPythonApplication rec {
      "orjson"
      "PyJWT"
      "requests"
+      "typing-extensions"
      "yarl"
    ];
  in ''