From 967949c21acde17ddaf768402c29729f688b17ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 19:59:33 +0100 Subject: [PATCH 1/8] python311Packages.aiounifi: 64 -> 65 https://github.com/Kane610/aiounifi/releases/tag/v65 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index d07fbf7329ee..0d1423d9ac63 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "64"; + version = "65"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A6IfUUaXv/Dm8yncgC0SFBrabCFx0Y24pOul0bqxBLc="; + hash = "sha256-VpDtr5r7BxZDd8G8tPrHRVo+LRhsFoMlVUuOcG/3g0s="; }; postPatch = '' From 50535029204a3ec867bfdd330c684bd4d1265f35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 20:01:34 +0100 Subject: [PATCH 2/8] python311Packages.segno: 1.5.2 -> 1.5.3 https://github.com/heuer/segno/releases/tag/1.5.3 --- .../python-modules/segno/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/segno/default.nix b/pkgs/development/python-modules/segno/default.nix index 12aa23e95dd1..3e7bb0816448 100644 --- a/pkgs/development/python-modules/segno/default.nix +++ b/pkgs/development/python-modules/segno/default.nix @@ -1,6 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# tests , pytestCheckHook , pypng , pyzbar @@ -8,24 +13,32 @@ buildPythonPackage rec { pname = "segno"; - version = "1.5.2"; + version = "1.5.3"; + pyproject = true; src = fetchFromGitHub { owner = "heuer"; repo = "segno"; rev = version; - hash = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; + hash = "sha256-j7DUCeMoYziu19WfJu/9YiIMa2ysOPYfqW8AMcE5LaU="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook pypng pyzbar ]; - pythonImportsCheck = [ "segno" ]; + pythonImportsCheck = [ + "segno" + ]; meta = with lib; { + changelog = "https://github.com/heuer/segno/releases/tag/${version}"; description = "QR Code and Micro QR Code encoder"; homepage = "https://github.com/heuer/segno/"; license = licenses.bsd3; From b204ea290c08ce434f626c9e815914667888dc90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 20:08:12 +0100 Subject: [PATCH 3/8] python311Packages.py-nextbusnext: 1.0.1 -> 1.0.2 https://github.com/ViViDboarder/py_nextbus/compare/refs/tags/v1.0.1...v1.0.2 --- .../python-modules/py-nextbusnext/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 2ef7b55d0d39..090883bad3d9 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-nextbusnext"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "ViViDboarder"; repo = "py_nextbus"; rev = "refs/tags/v${version}"; - hash = "sha256-iJPbRhXgA1AIkyf3zGZ9tuFAw8h6oyBbh7Ln/y72fyQ="; + hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 1d0a131b67d1a4c7fde0c3a29834d68df1c0dfbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 20:22:45 +0100 Subject: [PATCH 4/8] python311Packages.reolink-aio: 0.7.12 -> 0.7.14 https://github.com/starkillerOG/reolink_aio/releases/tag/0.7.13 https://github.com/starkillerOG/reolink_aio/releases/tag/0.7.14 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index f773c33307ae..5b4e8eb6bd3e 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.12"; + version = "0.7.14"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-molHdZ51irWEE3OHywP5n0bCClK8z67JGiYRwvHAOxs="; + hash = "sha256-fF/IwhHCTqi5eSRgfcUARWAqQ7jJ4nRpcWWOMx7IxLY="; }; propagatedBuildInputs = [ From 4e4178153af655df540cd76f33c86b1fcc973803 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 20:21:29 +0100 Subject: [PATCH 5/8] home-assistant: 2023.11.0 -> 2023.11.0 https://github.com/home-assistant/core/releases/tag/2023.11.1 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 60248f80d7b1..271ed97c857a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.11.0"; + version = "2023.11.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d0ca426a0144..ec3c6abb2158 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -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 { version = "2.2.2"; src = fetchFromGitHub { @@ -365,7 +355,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.11.0"; + hassVersion = "2023.11.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -381,7 +371,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q="; + hash = "sha256-4OIvY6blun++7JDY+B0Cjrr4yNgnjTd8G55SWkhS3Cs="; }; # Secondary source is git for tests @@ -389,7 +379,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM="; + hash = "sha256-Z/CV1sGdJsdc4OxUZulC0boHaMP7WpajbY8Y6R9Q//I="; }; nativeBuildInputs = with python.pkgs; [ From 5bc5fcbf4b2338342aa68c39a7e3588ebb1e7f97 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 21:45:59 +0100 Subject: [PATCH 6/8] python311Packages.holidays: generate l10n files The localization files were previously missing, which led to issues in the home-assistant workday component. --- .../python-modules/holidays/default.nix | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 9fd25d7e138c..24224b769d7a 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,15 +1,22 @@ { lib , buildPythonPackage -, convertdate , fetchFromGitHub -, hijri-converter -, importlib-metadata -, korean-lunar-calendar -, polib -, pytestCheckHook -, python-dateutil , pythonOlder + +# build-system , setuptools + +# l10n +, polib +, lingua +, chameleon + +# dependencies +, python-dateutil + +# tests +, importlib-metadata +, pytestCheckHook }: buildPythonPackage rec { @@ -28,15 +35,29 @@ buildPythonPackage rec { nativeBuildInputs = [ 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 = [ - convertdate python-dateutil - hijri-converter - korean-lunar-calendar ]; + doCheck = false; + nativeCheckInputs = [ importlib-metadata polib From 163a50a5e1b210f16b81aab52e5053d693fdd200 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 4 Nov 2023 12:23:31 +0300 Subject: [PATCH 7/8] nixos/tests/home-assistant: replace ensureUsers with custom setup script for now (cherry picked from commit 30d70bf6058e2261048986b9db909ae291779d5c) --- nixos/tests/home-assistant.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index e06c52a5f41c..b7deb95b2c19 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -9,13 +9,13 @@ in { nodes.hass = { pkgs, ... }: { services.postgresql = { enable = true; - ensureDatabases = [ "hass" ]; - ensureUsers = [{ - name = "hass"; - ensurePermissions = { - "DATABASE hass" = "ALL PRIVILEGES"; - }; - }]; + + # FIXME: hack for https://github.com/NixOS/nixpkgs/issues/216989 + # Should be replaced with ensureUsers again when a solution for that is found + initialScript = pkgs.writeText "hass-setup-db.sql" '' + CREATE ROLE hass WITH LOGIN; + CREATE DATABASE hass WITH OWNER hass; + ''; }; services.home-assistant = { From 80c72efea87a7e24a8f767f5006f06b77a68d9ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Nov 2023 09:44:41 +0100 Subject: [PATCH 8/8] python311Packages.homeassistant-stubs: 2023.11.0 -> 2023.11.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.11.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 292f38b2e8b6..d4c009fa258a 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.11.0"; + version = "2023.11.1"; 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-/yiTNsr22X8orQ8sni50/FeWWZL9OyVZvTngeaGv5SI="; + hash = "sha256-eLmWOMKLzhZ7M/gdUHhlDZ3T+N4h5aHxMwOI8ZUepps="; }; nativeBuildInputs = [