Merge pull request #265508 from NixOS/home-assistant

home-assistant: 2023.11.0 -> 2023.11.1
This commit is contained in:
Martin Weinelt 2023-11-05 09:45:28 +01:00 committed by GitHub
commit f73eb3e15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 72 additions and 43 deletions

View File

@ -9,13 +9,13 @@ in {
nodes.hass = { pkgs, ... }: { nodes.hass = { pkgs, ... }: {
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "hass" ];
ensureUsers = [{ # FIXME: hack for https://github.com/NixOS/nixpkgs/issues/216989
name = "hass"; # Should be replaced with ensureUsers again when a solution for that is found
ensurePermissions = { initialScript = pkgs.writeText "hass-setup-db.sql" ''
"DATABASE hass" = "ALL PRIVILEGES"; CREATE ROLE hass WITH LOGIN;
}; CREATE DATABASE hass WITH OWNER hass;
}]; '';
}; };
services.home-assistant = { services.home-assistant = {

View File

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiounifi"; pname = "aiounifi";
version = "64"; version = "65";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "Kane610"; owner = "Kane610";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-A6IfUUaXv/Dm8yncgC0SFBrabCFx0Y24pOul0bqxBLc="; hash = "sha256-VpDtr5r7BxZDd8G8tPrHRVo+LRhsFoMlVUuOcG/3g0s=";
}; };
postPatch = '' postPatch = ''

View File

@ -1,15 +1,22 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, convertdate
, fetchFromGitHub , fetchFromGitHub
, hijri-converter
, importlib-metadata
, korean-lunar-calendar
, polib
, pytestCheckHook
, python-dateutil
, pythonOlder , pythonOlder
# build-system
, setuptools , setuptools
# l10n
, polib
, lingua
, chameleon
# dependencies
, python-dateutil
# tests
, importlib-metadata
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -28,15 +35,29 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
# l10n
lingua
chameleon
polib
]; ];
postPatch = ''
patchShebangs scripts/l10n/*.py
'';
preBuild = ''
# make l10n
./scripts/l10n/generate_po_files.py
./scripts/l10n/generate_mo_files.py
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
convertdate
python-dateutil python-dateutil
hijri-converter
korean-lunar-calendar
]; ];
doCheck = false;
nativeCheckInputs = [ nativeCheckInputs = [
importlib-metadata importlib-metadata
polib polib

View File

@ -3,12 +3,13 @@
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "py-nextbusnext"; pname = "py-nextbusnext";
version = "1.0.1"; version = "1.0.2";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -16,9 +17,13 @@ buildPythonPackage rec {
owner = "ViViDboarder"; owner = "ViViDboarder";
repo = "py_nextbus"; repo = "py_nextbus";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-iJPbRhXgA1AIkyf3zGZ9tuFAw8h6oyBbh7Ln/y72fyQ="; hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM=";
}; };
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
]; ];

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "reolink-aio"; pname = "reolink-aio";
version = "0.7.12"; version = "0.7.14";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "starkillerOG"; owner = "starkillerOG";
repo = "reolink_aio"; repo = "reolink_aio";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-molHdZ51irWEE3OHywP5n0bCClK8z67JGiYRwvHAOxs="; hash = "sha256-fF/IwhHCTqi5eSRgfcUARWAqQ7jJ4nRpcWWOMx7IxLY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,6 +1,11 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
# build-system
, setuptools
# tests
, pytestCheckHook , pytestCheckHook
, pypng , pypng
, pyzbar , pyzbar
@ -8,24 +13,32 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "segno"; pname = "segno";
version = "1.5.2"; version = "1.5.3";
pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "heuer"; owner = "heuer";
repo = "segno"; repo = "segno";
rev = version; rev = version;
hash = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; hash = "sha256-j7DUCeMoYziu19WfJu/9YiIMa2ysOPYfqW8AMcE5LaU=";
}; };
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
pypng pypng
pyzbar pyzbar
]; ];
pythonImportsCheck = [ "segno" ]; pythonImportsCheck = [
"segno"
];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/heuer/segno/releases/tag/${version}";
description = "QR Code and Micro QR Code encoder"; description = "QR Code and Micro QR Code encoder";
homepage = "https://github.com/heuer/segno/"; homepage = "https://github.com/heuer/segno/";
license = licenses.bsd3; license = licenses.bsd3;

View File

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

View File

@ -87,16 +87,6 @@ let
}; };
}); });
holidays = super.holidays.overridePythonAttrs (oldAttrs: rec {
version = "0.28";
src = fetchFromGitHub {
owner = "dr-prodigy";
repo = "python-holidays";
rev = "refs/tags/v.${version}";
hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4=";
};
});
intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec { intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec {
version = "2.2.2"; version = "2.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -365,7 +355,7 @@ let
extraBuildInputs = extraPackages python.pkgs; extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2023.11.0"; hassVersion = "2023.11.1";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -381,7 +371,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations # Primary source is the pypi sdist, because it contains translations
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q="; hash = "sha256-4OIvY6blun++7JDY+B0Cjrr4yNgnjTd8G55SWkhS3Cs=";
}; };
# Secondary source is git for tests # Secondary source is git for tests
@ -389,7 +379,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM="; hash = "sha256-Z/CV1sGdJsdc4OxUZulC0boHaMP7WpajbY8Y6R9Q//I=";
}; };
nativeBuildInputs = with python.pkgs; [ nativeBuildInputs = with python.pkgs; [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "homeassistant-stubs"; pname = "homeassistant-stubs";
version = "2023.11.0"; version = "2023.11.1";
format = "pyproject"; format = "pyproject";
disabled = python.version != home-assistant.python.version; disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI"; owner = "KapJI";
repo = "homeassistant-stubs"; repo = "homeassistant-stubs";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-/yiTNsr22X8orQ8sni50/FeWWZL9OyVZvTngeaGv5SI="; hash = "sha256-eLmWOMKLzhZ7M/gdUHhlDZ3T+N4h5aHxMwOI8ZUepps=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [