From 509320f015df5fcd4f07e35b68d6799bce031f50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Nov 2023 15:21:24 +0100 Subject: [PATCH 1/2] python311Packages.lru-dict: 1.2.0 -> 1.3.0 https://github.com/amitdev/lru-dict/releases/tag/v1.3.0 --- .../development/python-modules/lru-dict/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix index 7ce32f9cdef5..801d68dccb66 100644 --- a/pkgs/development/python-modules/lru-dict/default.nix +++ b/pkgs/development/python-modules/lru-dict/default.nix @@ -3,23 +3,28 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools }: let pname = "lru-dict"; - version = "1.2.0"; + version = "1.3.0"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-E8VngvGdaN302NsBcAQRkoWWFlFMcGsSbQ3y7HKhG9c="; + hash = "sha256-VP0ZZta9H83ngVlsuGBoIU7e6/8dsTos6hEHnj/Qe2s="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From a1977eebaad503e564db3b3f28d0810a2eee466f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Nov 2023 16:05:22 +0100 Subject: [PATCH 2/2] home-assistant: backport litterrobot tests fix The litterrobot tests broke when DST changed, so now they've pinned the date and the tests should keep working. --- pkgs/servers/home-assistant/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ec3c6abb2158..3fb3e244928c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , fetchPypi +, fetchpatch , python311 , substituteAll , ffmpeg-headless @@ -399,6 +400,13 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; }) + (fetchpatch { + # freeze time in litterrobot tests + # https://github.com/home-assistant/core/pull/103444 + name = "home-assistant-litterrobot-freeze-test-time.patch"; + url = "https://github.com/home-assistant/core/commit/806205952ff863e2cf1875be406ea0254be5f13a.patch"; + hash = "sha256-OVbmJWy275nYWrif9awAGIYlgZqrRPcYBhB0Vil8rmk="; + }) ]; postPatch = let