From 028bf68df177ee0d06a2152613d9b82cdda8f51f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 11:39:22 +0100 Subject: [PATCH 01/11] home-assistant: use headless ffmpeg variant --- pkgs/servers/home-assistant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a2308d0998e6..f37145b51ca7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -5,7 +5,7 @@ , fetchpatch , python3 , substituteAll -, ffmpeg +, ffmpeg-headless , inetutils , nixosTests @@ -309,7 +309,7 @@ in python.pkgs.buildPythonApplication rec { patches = [ (substituteAll { src = ./patches/ffmpeg-path.patch; - ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; + ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; }) ]; From 267c1835862c54189c2820fc88e05023f39cf6d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 12:03:00 +0100 Subject: [PATCH 02/11] python3Packages.pytibber: 0.25.6 -> 0.26.1 https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.1 https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.0 --- pkgs/development/python-modules/pytibber/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 4583c883904c..f237c2bc4bc3 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , aiohttp , async-timeout -, graphql-subscription-manager +, gql , python-dateutil , pytest-asyncio , pytestCheckHook @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.25.6"; + version = "0.26.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,15 +21,16 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-aGl43gxrnKwo3ZhN+EpSBMZw0wKWf5aIPFx3goo8Nog="; + hash = "sha256-Bok5dtEpteo20vnQa0myxFHiu2BViqlvKZ5TxAkfFUM="; }; propagatedBuildInputs = [ aiohttp async-timeout - graphql-subscription-manager + gql python-dateutil - ]; + ] + ++ gql.optional-dependencies.websockets; checkInputs = [ pytest-asyncio @@ -48,6 +49,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${version}"; description = "Python library to communicate with Tibber"; homepage = "https://github.com/Danielhiversen/pyTibber"; license = licenses.mit; From 962bc1a79d27e64a6278bee6df4eddc2a1cb98f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 12:10:16 +0100 Subject: [PATCH 03/11] python3Packages.simplisafe-python: 2022.11.0 -> 2022.11.2 https://github.com/bachya/simplisafe-python/releases/tag/2022.11.2 https://github.com/bachya/simplisafe-python/releases/tag/2022.11.1 --- .../development/python-modules/simplisafe-python/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 9312b9f36d17..97b844613b18 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.11.0"; + version = "2022.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-I4ZEKJFfCrpwPXl2f+2XJdFD2VkCghiKdgLjRKdZC+0="; + sha256 = "sha256-fGCYsuhqPs3ZYInx6Z3iRb4dtjoA7mJKpBDVx+6d/qA="; }; nativeBuildInputs = [ @@ -80,6 +80,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/bachya/simplisafe-python/releases/tag/${version}"; description = "Python library the SimpliSafe API"; homepage = "https://simplisafe-python.readthedocs.io/"; license = with licenses; [ mit ]; From adb15eda59db7cdd65dc54ee5be533cf3e7dba82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 15:38:20 +0100 Subject: [PATCH 04/11] python310Packages.zigpy: add changelog to meta --- pkgs/development/python-modules/zigpy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index c7abaac023aa..cf3d3b06f7ee 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; + changelog = "https://github.com/zigpy/zigpy/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; From 4ec822f4b7bdbc84b682625e513ce6c372b1a605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 15:42:42 +0100 Subject: [PATCH 05/11] python310Packages.zigpy: 0.51.5 -> 0.51.6 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.51.6 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index cf3d3b06f7ee..9b5bd33f85e7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.5"; + version = "0.51.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; + hash = "sha256-keQFFWPl2SCy1cyvbqDrA9/Yude8bf0qNiyEbFjFv/o="; }; propagatedBuildInputs = [ From 19105c66f2f5fdcd78be47c9641b290d0599b097 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:17:03 +0100 Subject: [PATCH 06/11] python310Packages.zigpy-deconz: add changelog to meta --- pkgs/development/python-modules/zigpy-deconz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index de08bb59320c..78445df7f2a5 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; + changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; From e2ba5b66cd3670352ac606dd4f24b3b329d38f16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:18:07 +0100 Subject: [PATCH 07/11] python310Packages.zigpy-deconz: 0.19.0 -> 0.19.1 Changelog: https://github.com/zigpy/zigpy-deconz/releases/tag/0.19.1 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 78445df7f2a5..babfcf54c04e 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HYLL+1o133Is40wVCPJoUGZO1B/43p+V8K2rJ/mdMFQ="; + hash = "sha256-qbzHG6qoTAm773HAoAjmmanqVtuIDR72ECQH+N+iw3o="; }; propagatedBuildInputs = [ From b2cc0315e3d8b01106b8eeb63c9fa32677f4ebbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:20:17 +0100 Subject: [PATCH 08/11] python310Packages.zha-quirks: add changelog to meta --- pkgs/development/python-modules/zha-quirks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f81a155bdfa5..c58e3e1d6fbb 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -39,8 +39,9 @@ buildPythonPackage rec { meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; homepage = "https://github.com/dmulcahey/zha-device-handlers"; + changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; platforms = platforms.linux; }; } From 5f33a76d16d1de6f3c37ae0814ae3690d06d0e28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:21:15 +0100 Subject: [PATCH 09/11] python310Packages.zha-quirks: 0.0.86 -> 0.0.87 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.87 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index c58e3e1d6fbb..86059d60b0cb 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.86"; + version = "0.0.87"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-gKYpjen5JLMiZITLGZbcgqDZedsxeofZyMhRR2ti3Ew="; + hash = "sha256-MX+UWS1h2HMIhyrhtn/tzti2w9RBHptVE3klATIXvAM="; }; propagatedBuildInputs = [ From 3e8534f333ebf1ce71405629cd594a4265e36cc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:34:49 +0100 Subject: [PATCH 10/11] python310Packages.bellows: add changelog to meta - update inputs --- .../python-modules/bellows/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index dde3a12480ca..1125e45e6282 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,18 +1,17 @@ { lib +, asynctest , buildPythonPackage -, fetchFromGitHub , click , click-log -, dataclasses +, fetchFromGitHub , pure-pcapy3 , pyserial-asyncio -, voluptuous -, zigpy -, asynctest -, pythonOlder -, pytestCheckHook , pytest-asyncio , pytest-timeout +, pytestCheckHook +, pythonOlder +, voluptuous +, zigpy }: buildPythonPackage rec { @@ -20,11 +19,13 @@ buildPythonPackage rec { version = "0.34.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; + hash = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; }; propagatedBuildInputs = [ @@ -34,8 +35,6 @@ buildPythonPackage rec { pyserial-asyncio voluptuous zigpy - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; checkInputs = [ @@ -53,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; + changelog = "https://github.com/zigpy/bellows/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; }; From 9855c146a2ed8e8846c8aa9f835f9411d31e0748 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 12:17:49 +0100 Subject: [PATCH 11/11] home-assistant: 2022.11.4 -> 2022.11.5 https://github.com/home-assistant/core/releases/tag/2022.11.5 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 24 ++----------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7ea4d02a227b..a4b2f5c14cdd 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 = "2022.11.4"; + version = "2022.11.5"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f37145b51ca7..d2cdd24d4f27 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -51,16 +51,6 @@ let ]; }); - backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { - version = "1.11.1"; - src = fetchFromGitHub { - owner = "litl"; - repo = "backoff"; - rev = "v${version}"; - hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; - }; - }); - caldav = super.caldav.overridePythonAttrs (old: rec { version = "0.9.1"; src = fetchFromGitHub { @@ -185,16 +175,6 @@ let doCheck = false; # requires pytest-aiohttp>=1.0.0 }); - pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec { - version = "1.0.20"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = "pysensibo"; - rev = "refs/tags/${version}"; - hash = "sha256-L2NP4XS+dPlBr2h8tsGoa4G7tI9yiI4fwrhvQaKkexk="; - }; - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -284,7 +264,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.11.4"; + hassVersion = "2022.11.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -302,7 +282,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-3vNwWPFSR9Ap89rAxZjUOptigBaDlboxvLZysMyUUX0="; + hash = "sha256-5QV9k3aMMhkB5ZVNOzkwAcA2qTLT7HBays8BoRyshVo="; }; # leave this in, so users don't have to constantly update their downstream patch handling