mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #203909 from NixOS/home-assistant
This commit is contained in:
commit
67f5368df1
@ -1,18 +1,17 @@
|
||||
{ lib
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, click
|
||||
, click-log
|
||||
, dataclasses
|
||||
, fetchFromGitHub
|
||||
, pure-pcapy3
|
||||
, pyserial-asyncio
|
||||
, voluptuous
|
||||
, zigpy
|
||||
, asynctest
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, voluptuous
|
||||
, zigpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -20,11 +19,13 @@ buildPythonPackage rec {
|
||||
version = "0.34.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc=";
|
||||
hash = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -34,8 +35,6 @@ buildPythonPackage rec {
|
||||
pyserial-asyncio
|
||||
voluptuous
|
||||
zigpy
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -53,6 +52,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python module to implement EZSP for EmberZNet devices";
|
||||
homepage = "https://github.com/zigpy/bellows";
|
||||
changelog = "https://github.com/zigpy/bellows/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mvnetbiz ];
|
||||
};
|
||||
|
@ -4,7 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, graphql-subscription-manager
|
||||
, gql
|
||||
, python-dateutil
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.25.6";
|
||||
version = "0.26.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,15 +21,16 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aGl43gxrnKwo3ZhN+EpSBMZw0wKWf5aIPFx3goo8Nog=";
|
||||
hash = "sha256-Bok5dtEpteo20vnQa0myxFHiu2BViqlvKZ5TxAkfFUM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
graphql-subscription-manager
|
||||
gql
|
||||
python-dateutil
|
||||
];
|
||||
]
|
||||
++ gql.optional-dependencies.websockets;
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
@ -48,6 +49,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${version}";
|
||||
description = "Python library to communicate with Tibber";
|
||||
homepage = "https://github.com/Danielhiversen/pyTibber";
|
||||
license = licenses.mit;
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2022.11.0";
|
||||
version = "2022.11.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-I4ZEKJFfCrpwPXl2f+2XJdFD2VkCghiKdgLjRKdZC+0=";
|
||||
sha256 = "sha256-fGCYsuhqPs3ZYInx6Z3iRb4dtjoA7mJKpBDVx+6d/qA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -80,6 +80,7 @@ buildPythonPackage rec {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/bachya/simplisafe-python/releases/tag/${version}";
|
||||
description = "Python library the SimpliSafe API";
|
||||
homepage = "https://simplisafe-python.readthedocs.io/";
|
||||
license = with licenses; [ mit ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.86";
|
||||
version = "0.0.87";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gKYpjen5JLMiZITLGZbcgqDZedsxeofZyMhRR2ti3Ew=";
|
||||
hash = "sha256-MX+UWS1h2HMIhyrhtn/tzti2w9RBHptVE3klATIXvAM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -39,8 +39,9 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
|
||||
homepage = "https://github.com/dmulcahey/zha-device-handlers";
|
||||
changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-deconz";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HYLL+1o133Is40wVCPJoUGZO1B/43p+V8K2rJ/mdMFQ=";
|
||||
hash = "sha256-qbzHG6qoTAm773HAoAjmmanqVtuIDR72ECQH+N+iw3o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -43,6 +43,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library which communicates with Deconz radios for zigpy";
|
||||
homepage = "https://github.com/zigpy/zigpy-deconz";
|
||||
changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mvnetbiz ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.51.5";
|
||||
version = "0.51.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU=";
|
||||
hash = "sha256-keQFFWPl2SCy1cyvbqDrA9/Yude8bf0qNiyEbFjFv/o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -59,6 +59,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library implementing a ZigBee stack";
|
||||
homepage = "https://github.com/zigpy/zigpy";
|
||||
changelog = "https://github.com/zigpy/zigpy/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mvnetbiz ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.11.4";
|
||||
version = "2022.11.5";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
@ -5,7 +5,7 @@
|
||||
, fetchpatch
|
||||
, python3
|
||||
, substituteAll
|
||||
, ffmpeg
|
||||
, ffmpeg-headless
|
||||
, inetutils
|
||||
, nixosTests
|
||||
|
||||
@ -51,16 +51,6 @@ let
|
||||
];
|
||||
});
|
||||
|
||||
backoff = super.backoff.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.11.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "litl";
|
||||
repo = "backoff";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4=";
|
||||
};
|
||||
});
|
||||
|
||||
caldav = super.caldav.overridePythonAttrs (old: rec {
|
||||
version = "0.9.1";
|
||||
src = fetchFromGitHub {
|
||||
@ -185,16 +175,6 @@ let
|
||||
doCheck = false; # requires pytest-aiohttp>=1.0.0
|
||||
});
|
||||
|
||||
pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrey-git";
|
||||
repo = "pysensibo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-L2NP4XS+dPlBr2h8tsGoa4G7tI9yiI4fwrhvQaKkexk=";
|
||||
};
|
||||
});
|
||||
|
||||
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "python-slugify";
|
||||
version = "4.0.1";
|
||||
@ -284,7 +264,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.11.4";
|
||||
hassVersion = "2022.11.5";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -302,14 +282,14 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-3vNwWPFSR9Ap89rAxZjUOptigBaDlboxvLZysMyUUX0=";
|
||||
hash = "sha256-5QV9k3aMMhkB5ZVNOzkwAcA2qTLT7HBays8BoRyshVo=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./patches/ffmpeg-path.patch;
|
||||
ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg";
|
||||
ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
|
||||
})
|
||||
];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user