Merge pull request #237899 from NixOS/home-assistant

home-assistant: 2023.6.1 -> 2023.6.2
This commit is contained in:
Martin Weinelt 2023-06-16 12:20:48 +02:00 committed by GitHub
commit e4d378605e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 39 additions and 22 deletions

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "flask-jwt-extended";
version = "4.4.4";
version = "4.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Flask-JWT-Extended";
inherit version;
hash = "sha256-YrUh11SUwpCmRq6KzHcSNyHkNkeQ8eZK8AONgjlh+/A=";
hash = "sha256-ulYkW6Q7cciuk2eEuGdiXc6LmVb67t7ClTIi5XlC+ws=";
};
propagatedBuildInputs = [
@ -44,6 +44,7 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/vimalloc/flask-jwt-extended/releases/tag/${version}";
description = "JWT extension for Flask";
homepage = "https://flask-jwt-extended.readthedocs.io/";
license = licenses.mit;

View File

@ -56,6 +56,8 @@ buildPythonPackage rec {
"poetry_dynamic_versioning"
];
setupHook = ./setup-hook.sh;
meta = with lib; {
description = "Plugin for Poetry to enable dynamic versioning based on VCS tags";
homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning";

View File

@ -0,0 +1,8 @@
version-pretend-hook() {
echo "Setting POETRY_DYNAMIC_VERSIONING_BYPASS to $version"
export POETRY_DYNAMIC_VERSIONING_BYPASS=$version
}
if [ -z "${dontBypassPoetryDynamicVersioning-}" ]; then
preBuildHooks+=(version-pretend-hook)
fi

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.4.2";
version = "1.4.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE=";
hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo=";
};
nativeBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyjwt";
version = "2.6.0";
version = "2.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyJWT";
inherit version;
hash = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0=";
hash = "sha256-vWyko8QoXBotQ0nloDX9+PuU4EzND8vmuiidrpzD4HQ=";
};
postPatch = ''
@ -48,6 +48,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "jwt" ];
meta = with lib; {
changelog = "https://github.com/jpadilla/pyjwt/blob/${version}/CHANGELOG.rst";
description = "JSON Web Token implementation in Python";
homepage = "https://github.com/jpadilla/pyjwt";
license = licenses.mit;

View File

@ -4,6 +4,7 @@
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, poetry-dynamic-versioning
, pyjwt
, pytest-aiohttp
, pytest-freezegun
@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2023.4.0";
version = "2023.4.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,12 +23,13 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "natekspencer";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE=";
rev = "refs/tags/v${version}";
hash = "sha256-zB/LJGEPJ3uZEoVQiLQUCWqLo9YLXN6vge3RhIwA5D4=";
};
nativeBuildInputs = [
poetry-core
poetry-dynamic-versioning
];
propagatedBuildInputs = [
@ -50,7 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Modulefor controlling a Litter-Robot";
homepage = "https://github.com/natekspencer/pylitterbot";
changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${version}";
changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View File

@ -23,6 +23,8 @@ buildPythonPackage rec {
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "weconnect[Images]~=" "weconnect>="
substituteInPlace weconnect_mqtt/__version.py \
--replace "develop" "${version}"
substituteInPlace pytest.ini \

View File

@ -47,6 +47,8 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
substituteInPlace requirements.txt \
--replace "requests~=2.29.0" "requests"
substituteInPlace image_extra_requirements.txt \
--replace "pillow~=" "pillow>=" \
--replace "ascii_magic~=" "ascii_magic>="

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.6.1";
version = "2023.6.2";
components = {
"3_day_blinds" = ps: with ps; [
];
@ -2010,9 +2010,8 @@
"keyboard" = ps: with ps; [
]; # missing inputs: pyuserinput
"keyboard_remote" = ps: with ps; [
aionotify
evdev
];
]; # missing inputs: asyncinotify
"keymitt_ble" = ps: with ps; [
pymicrobot
aioesphomeapi
@ -2863,7 +2862,8 @@
opensensemap-api
];
"opensky" = ps: with ps; [
]; # missing inputs: python-opensky
python-opensky
];
"opentherm_gw" = ps: with ps; [
pyotgw
];
@ -2877,8 +2877,7 @@
pyopnsense
];
"opple" = ps: with ps; [
pyoppleio
];
]; # missing inputs: pyoppleio-legacy
"oralb" = ps: with ps; [
aioesphomeapi
aiohttp-cors
@ -3352,7 +3351,7 @@
pyruckus
];
"russound_rio" = ps: with ps; [
]; # missing inputs: russound_rio
]; # missing inputs: russound-rio
"russound_rnet" = ps: with ps; [
]; # missing inputs: russound
"ruuvi_gateway" = ps: with ps; [

View File

@ -296,7 +296,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.6.1";
hassVersion = "2023.6.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-8F2KiV/lujTbaWQl0IfCwzQ7HxNioHAHcffi7lL2hzs=";
hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0=";
};
# Secondary source is git for tests
@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-ojiNHl+sm1mLiM+rjESeR2zPOCGkG3RQ9to6VfetmZQ=";
hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8=";
};
nativeBuildInputs = with python.pkgs; [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.6.1";
version = "2023.6.2";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-LiBn9NpR7sAAZX1yPT0V5LhQeALPvGVRzDam7cCBoi8=";
hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms=";
};
nativeBuildInputs = [