Merge pull request #185609 from mweinelt/home-assistant

This commit is contained in:
Martin Weinelt 2022-08-08 22:28:33 +02:00 committed by GitHub
commit 972609aace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 143 additions and 16 deletions

View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.31.2";
version = "0.31.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
sha256 = "sha256-CAah1Yu3gbHcqHbTM1nXAVFqGKatdUNYt881sjsCD2o=";
sha256 = "sha256-h0hGTT8ipZZ3l/B6I/O74hFpRzaxj5vUBMbM/xX0dq4=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pkginfo
, sphinxHook
, sphinx-rtd-theme
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "colorzero";
version = "2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "waveform80";
repo = pname;
rev = "refs/tags/release-${version}";
hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov" ""
'';
outputs = [
"out"
"doc"
];
nativeBuildInputs = [
pkginfo
sphinx-rtd-theme
sphinxHook
];
pythonImportsCheck = [
"colorzero"
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Yet another Python color library";
homepage = "https://github.com/waveform80/colorzero";
license = licenses.bsd3;
maintainers = with maintainers; [ hexa ];
};
}

View File

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, sphinx-rtd-theme
, sphinxHook
, colorzero
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "gpiozero";
version = "1.6.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "gpiozero";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-dmFc3DNTlEajYQ5e8QK2WfehwYwAsWyG2cxKg5ykEaI=";
};
outputs = [
"out"
"doc"
];
nativeBuildInputs = [
sphinx-rtd-theme
sphinxHook
];
propagatedBuildInputs = [
colorzero
];
pythonImportsCheck = [
"gpiozero"
"gpiozero.tools"
];
checkInputs = [
mock
pytestCheckHook
];
meta = with lib; {
description = "A simple interface to GPIO devices with Raspberry Pi";
homepage = "https://github.com/gpiozero/gpiozero";
license = licenses.bsd3;
maintainers = with maintainers; [ hexa ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "greeclimate";
version = "1.2.1";
version = "1.3.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = "refs/tags/v${version}";
hash = "sha256-SvAvLxWk/IIlkv54cUVN6FXj9rrM0QPKHAk36+PuqP0=";
hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA=";
};
propagatedBuildInputs = [

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, gpiozero
, mock
, pyserial
, pyserial-asyncio
@ -13,7 +14,7 @@
buildPythonPackage rec {
pname = "zigpy-zigate";
version = "0.9.0";
version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,11 +22,12 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy-zigate";
rev = "v${version}";
hash = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM=";
rev = "refs/tags/${version}";
hash = "sha256-H1R+wNUo/J5ATINHrkC4mJ8KKnBxVZUvF6X7y54aiVQ=";
};
propagatedBuildInputs = [
gpiozero
pyserial
pyserial-asyncio
pyusb

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.48.0";
version = "0.49.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
sha256 = "sha256-usO5d2JLZ7tochQXmxEfRgxaW1KJew3RVbfWnew+bP4=";
sha256 = "sha256-mCqRqi7AUsrvfSOHyfK+WVj/4D7/4RDOYFWveS+tS/A=";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.8.1";
version = "2022.8.2";
components = {
"abode" = ps: with ps; [
abodepy
@ -1048,7 +1048,9 @@
"graphite" = ps: with ps; [
];
"gree" = ps: with ps; [
aiohttp-cors
greeclimate
ifaddr
];
"greeneye_monitor" = ps: with ps; [
greeneye-monitor
@ -2235,7 +2237,8 @@
"remote" = ps: with ps; [
];
"remote_rpi_gpio" = ps: with ps; [
]; # missing inputs: gpiozero pigpio
gpiozero
]; # missing inputs: pigpio
"renault" = ps: with ps; [
renault-api
];

View File

@ -112,9 +112,6 @@ let
hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
pynws = super.pynws.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
@ -186,6 +183,20 @@ let
});
})
(self: super: {
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
version = "102";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-Dbhp/+xyyWhFcYp2VRnivn5d1JMR5hBctdArIzLKIjM=";
};
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
})
(self: super: {
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
pname = "python-slugify";
@ -296,7 +307,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.8.1";
hassVersion = "2022.8.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -314,7 +325,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-0QhWusJ7vSiudigJTo4KiXqO0OWgIlvqkSpiK5FFI+g=";
hash = "sha256-82UPZmaSJVO0kmlGuY08vS3y5ai0NtSQ7ntkiOcNc2A=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -1894,6 +1894,8 @@ in {
colorthief = callPackage ../development/python-modules/colorthief { };
colorzero = callPackage ../development/python-modules/colorzero { };
colour = callPackage ../development/python-modules/colour { };
cometblue-lite = callPackage ../development/python-modules/cometblue-lite { };
@ -3772,6 +3774,8 @@ in {
gpapi = callPackage ../development/python-modules/gpapi { };
gpiozero = callPackage ../development/python-modules/gpiozero { };
gplaycli = callPackage ../development/python-modules/gplaycli { };
gpgme = toPythonModule (pkgs.gpgme.override {