From 605429fb2c4f8ea98ce87c46131c643e292526d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:37:54 +0200 Subject: [PATCH 1/3] python313Packages.timetagger: migrate to writableTmpDirAsHomeHook --- pkgs/development/python-modules/timetagger/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index ae02585f8ba0..2b82044811ec 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -15,6 +15,7 @@ pythonOlder, requests, uvicorn, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -43,14 +44,11 @@ buildPythonPackage rec { uvicorn ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - nativeCheckInputs = [ nodejs pytestCheckHook requests + writableTmpDirAsHomeHook ]; meta = with lib; { From 06110ff25069bdf5a392be762529884cd547d5f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:38:37 +0200 Subject: [PATCH 2/3] python313Packages.timetagger: remove with lib; --- pkgs/development/python-modules/timetagger/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 2b82044811ec..3c59130bc3ee 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -51,12 +51,12 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - meta = with lib; { + meta = { description = "Library to interact with TimeTagger"; - mainProgram = "timetagger"; homepage = "https://github.com/almarklein/timetagger"; changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ matthiasbeyer ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + mainProgram = "timetagger"; }; } From 29364e1c301aa5199bb12104234ddd5e8321227e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Aug 2025 09:41:18 +0200 Subject: [PATCH 3/3] python313Packages.timetagger: modernize --- .../python-modules/timetagger/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 3c59130bc3ee..af3444f39a1d 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -12,8 +12,8 @@ pscript, pyjwt, pytestCheckHook, - pythonOlder, requests, + setuptools, uvicorn, writableTmpDirAsHomeHook, }: @@ -21,9 +21,7 @@ buildPythonPackage rec { pname = "timetagger"; version = "25.06.1"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "almarklein"; @@ -32,7 +30,9 @@ buildPythonPackage rec { hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ asgineer bcrypt iptools @@ -51,6 +51,8 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; + pythonImportsCheck = [ "timetagger" ]; + meta = { description = "Library to interact with TimeTagger"; homepage = "https://github.com/almarklein/timetagger";