dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #203909 from NixOS/home-assistant

Browse Source
This commit is contained in:
Martin Weinelt 2022-12-02 01:11:37 +01:00 committed by GitHub
commit 67f5368df1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/python-modules/bellows/default.nix
View File

@ -1,18 +1,17 @@
{ lib { lib
, asynctest
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub
, click , click
, click-log , click-log
, dataclasses , fetchFromGitHub
, pure-pcapy3 , pure-pcapy3
, pyserial-asyncio , pyserial-asyncio
, voluptuous
, zigpy
, asynctest
, pythonOlder
, pytestCheckHook
, pytest-asyncio , pytest-asyncio
, pytest-timeout , pytest-timeout
, pytestCheckHook
, pythonOlder
, voluptuous
, zigpy
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -20,11 +19,13 @@ buildPythonPackage rec {
version = "0.34.4"; version = "0.34.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "bellows"; repo = "bellows";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; hash = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,8 +35,6 @@ buildPythonPackage rec {
pyserial-asyncio pyserial-asyncio
voluptuous voluptuous
zigpy zigpy
] ++ lib.optionals (pythonOlder "3.7") [
dataclasses
]; ];
checkInputs = [ checkInputs = [
@ -53,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python module to implement EZSP for EmberZNet devices"; description = "Python module to implement EZSP for EmberZNet devices";
homepage = "https://github.com/zigpy/bellows"; homepage = "https://github.com/zigpy/bellows";
changelog = "https://github.com/zigpy/bellows/releases/tag/${version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ mvnetbiz ]; maintainers = with maintainers; [ mvnetbiz ];
}; };

12
pkgs/development/python-modules/pytibber/default.nix
View File

@ -4,7 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, aiohttp , aiohttp
, async-timeout , async-timeout
, graphql-subscription-manager , gql
, python-dateutil , python-dateutil
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytibber"; pname = "pytibber";
version = "0.25.6"; version = "0.26.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,15 +21,16 @@ buildPythonPackage rec {
owner = "Danielhiversen"; owner = "Danielhiversen";
repo = "pyTibber"; repo = "pyTibber";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-aGl43gxrnKwo3ZhN+EpSBMZw0wKWf5aIPFx3goo8Nog="; hash = "sha256-Bok5dtEpteo20vnQa0myxFHiu2BViqlvKZ5TxAkfFUM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
async-timeout async-timeout
graphql-subscription-manager gql
python-dateutil python-dateutil
]; ]
++ gql.optional-dependencies.websockets;
checkInputs = [ checkInputs = [
pytest-asyncio pytest-asyncio
@ -48,6 +49,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${version}";
description = "Python library to communicate with Tibber"; description = "Python library to communicate with Tibber";
homepage = "https://github.com/Danielhiversen/pyTibber"; homepage = "https://github.com/Danielhiversen/pyTibber";
license = licenses.mit; license = licenses.mit;

5
pkgs/development/python-modules/simplisafe-python/default.nix
View File

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "simplisafe-python"; pname = "simplisafe-python";
version = "2022.11.0"; version = "2022.11.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-I4ZEKJFfCrpwPXl2f+2XJdFD2VkCghiKdgLjRKdZC+0="; sha256 = "sha256-fGCYsuhqPs3ZYInx6Z3iRb4dtjoA7mJKpBDVx+6d/qA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -80,6 +80,7 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
meta = with lib; { meta = with lib; {
changelog = "https://github.com/bachya/simplisafe-python/releases/tag/${version}";
description = "Python library the SimpliSafe API"; description = "Python library the SimpliSafe API";
homepage = "https://simplisafe-python.readthedocs.io/"; homepage = "https://simplisafe-python.readthedocs.io/";
license = with licenses; [ mit ]; license = with licenses; [ mit ];

7
pkgs/development/python-modules/zha-quirks/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zha-quirks"; pname = "zha-quirks";
version = "0.0.86"; version = "0.0.87";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = "zha-device-handlers"; repo = "zha-device-handlers";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-gKYpjen5JLMiZITLGZbcgqDZedsxeofZyMhRR2ti3Ew="; hash = "sha256-MX+UWS1h2HMIhyrhtn/tzti2w9RBHptVE3klATIXvAM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -39,8 +39,9 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
homepage = "https://github.com/dmulcahey/zha-device-handlers"; homepage = "https://github.com/dmulcahey/zha-device-handlers";
changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ fab ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

5
pkgs/development/python-modules/zigpy-deconz/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy-deconz"; pname = "zigpy-deconz";
version = "0.19.0"; version = "0.19.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-HYLL+1o133Is40wVCPJoUGZO1B/43p+V8K2rJ/mdMFQ="; hash = "sha256-qbzHG6qoTAm773HAoAjmmanqVtuIDR72ECQH+N+iw3o=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -43,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Library which communicates with Deconz radios for zigpy"; description = "Library which communicates with Deconz radios for zigpy";
homepage = "https://github.com/zigpy/zigpy-deconz"; homepage = "https://github.com/zigpy/zigpy-deconz";
changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ mvnetbiz ]; maintainers = with maintainers; [ mvnetbiz ];
platforms = platforms.linux; platforms = platforms.linux;

5
pkgs/development/python-modules/zigpy/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy"; pname = "zigpy";
version = "0.51.5"; version = "0.51.6";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = "zigpy"; repo = "zigpy";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; hash = "sha256-keQFFWPl2SCy1cyvbqDrA9/Yude8bf0qNiyEbFjFv/o=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -59,6 +59,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Library implementing a ZigBee stack"; description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy"; homepage = "https://github.com/zigpy/zigpy";
changelog = "https://github.com/zigpy/zigpy/releases/tag/${version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ mvnetbiz ]; maintainers = with maintainers; [ mvnetbiz ];
platforms = platforms.linux; platforms = platforms.linux;

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2022.11.4"; version = "2022.11.5";
components = { components = {
"3_day_blinds" = ps: with ps; [ "3_day_blinds" = ps: with ps; [
]; ];

28
pkgs/servers/home-assistant/default.nix
View File

@ -5,7 +5,7 @@
, fetchpatch , fetchpatch
, python3 , python3
, substituteAll , substituteAll
, ffmpeg , ffmpeg-headless
, inetutils , inetutils
, nixosTests , 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 { caldav = super.caldav.overridePythonAttrs (old: rec {
version = "0.9.1"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -185,16 +175,6 @@ let
doCheck = false; # requires pytest-aiohttp>=1.0.0 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 { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
pname = "python-slugify"; pname = "python-slugify";
version = "4.0.1"; version = "4.0.1";
@ -284,7 +264,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2022.11.4"; hassVersion = "2022.11.5";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -302,14 +282,14 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
hash = "sha256-3vNwWPFSR9Ap89rAxZjUOptigBaDlboxvLZysMyUUX0="; hash = "sha256-5QV9k3aMMhkB5ZVNOzkwAcA2qTLT7HBays8BoRyshVo=";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./patches/ffmpeg-path.patch; src = ./patches/ffmpeg-path.patch;
ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
}) })
]; ];