colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #226084 from NixOS/home-assistant

Browse Source 
home-assistant: 2023.4.3 -> 2023.4.4
This commit is contained in:
Martin Weinelt 2023-04-14 14:13:16 +02:00 committed by GitHub
commit ecb664996b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ lib
, async-timeout
, fetchPypi
, buildPythonPackage
, pythonOlder
@ -8,17 +9,18 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "0.8.9";
version = "0.8.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8=";
hash = "sha256-NiNKFrWxpGkwbb7tFEDD5jZ6ETW20BBIqrdjCsL/DkY=";
};
propagatedBuildInputs = [
async-timeout
bitstring
ifaddr
];
@ -33,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for local communication with LIFX devices over a LAN";
homepage = "https://github.com/frawau/aiolifx";
changelog = "https://github.com/frawau/aiolifx/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ netixx ];
};

4
pkgs/development/python-modules/python-homewizard-energy/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-homewizard-energy";
version = "1.8.0";
version = "2.0.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "DCSBL";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ab+Fa7Dc2mHGy5C5PfoBfXIb/eugCyGrWjTYlJmTQE0=";
hash = "sha256-s3FNRpMZC/MG3s+ZDHgdsIT2AhvBDmGvJfutUPzY4wE=";
};
nativeBuildInputs = [

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

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

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

@ -310,7 +310,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.4.3";
hassVersion = "2023.4.4";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-L99fwGHjSHaE4ba9zA5wL0Zd7kTZsZLefjLMrvOgymw=";
hash = "sha256-96Fjf8FOXxpdt+7QC54Q1UzyhkRFZm11xsNXUkg/D+U=";
};
# Secondary source is git for tests
@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-X7qZfehUSOOlW5d6pZDLnx7Qs+U+kw/6Cs6oiJle5qY=";
hash = "sha256-ATchEqxVkzUDdRbVxW5YRS9T8WgIGPcdlsjCXXxeWoU=";
};
nativeBuildInputs = with python3.pkgs; [

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20230411.0";
version = "20230411.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-OCNOIFB4BmpEviOiXz39wE8cJ/gcVOOCYF5r8ZiG6o0=";
hash = "sha256-SV1SglO9XqkxfUD/jUyFgdJIWgKgnPNNQR94MHTYew0=";
};
# there is nothing to strip in this package

22
pkgs/servers/home-assistant/parse-requirements.py
View File

@ -29,6 +29,7 @@ from typing import Any, Dict, List, Optional, Set
from urllib.request import urlopen
from packaging import version as Version
from packaging.version import InvalidVersion
from rich.console import Console
from rich.table import Table
@ -197,6 +198,8 @@ def main() -> None:
# Therefore, if there's a "#" in the line, only take the part after it
req = req[req.find("#") + 1 :]
name, required_version = req.split("==", maxsplit=1)
# Strip conditions off version constraints e.g. "1.0; python<3.11"
required_version = required_version.split(";").pop(0)
# Split package name and extra requires
extras = []
if name.endswith("]"):
@ -206,11 +209,20 @@ def main() -> None:
if attr_path:
if our_version := get_pkg_version(attr_path, packages):
attr_name = attr_path.split(".")[-1]
if Version.parse(our_version) < Version.parse(required_version):
outdated[attr_name] = {
'wanted': required_version,
'current': our_version
}
attr_outdated = False
try:
Version.parse(our_version)
except InvalidVersion:
print(f"Attribute {attr_name} has invalid version specifier {our_version}", file=sys.stderr)
attr_outdated = True
else:
attr_outdated = Version.parse(our_version) < Version.parse(required_version)
finally:
if attr_outdated:
outdated[attr_name] = {
'wanted': required_version,
'current': our_version
}
if attr_path is not None:
# Add attribute path without "python3Packages." prefix
pname = attr_path[len(PKG_SET + "."):]

4
pkgs/servers/home-assistant/stubs.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.4.2";
version = "2023.4.4";
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-FzcgGyYtmU8owlvUfP/D+Y6m5QwOWj4njoLTZX6skLE=";
hash = "sha256-ycyRLt8L3OnfnT1ZoO5wJAhJljnXClh1V343rPVeZHU=";
};
nativeBuildInputs = [