From f0284ab4d84681db8cbc92445a2b69626713e06e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 May 2023 16:59:46 -0400 Subject: [PATCH] topydo: clean up --- pkgs/applications/misc/topydo/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 84bf6c016ef1..9ece11043fa0 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,13 +1,11 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch, glibcLocales }: +{ lib, python3, fetchFromGitHub, fetchpatch, glibcLocales }: -with python3Packages; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "topydo"; version = "0.14"; src = fetchFromGitHub { - owner = "bram85"; + owner = "topydo"; repo = pname; rev = version; sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb"; @@ -22,16 +20,19 @@ buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ arrow - icalendar glibcLocales + icalendar prompt-toolkit urwid watchdog ]; - nativeCheckInputs = [ unittestCheckHook mock freezegun pylint ]; + nativeCheckInputs = with python3.pkgs; [ + freezegun + unittestCheckHook + ]; # Skip test that has been reported multiple times upstream without result: # bram85/topydo#271, bram85/topydo#274. @@ -43,7 +44,9 @@ buildPythonApplication rec { meta = with lib; { description = "A cli todo application compatible with the todo.txt format"; - homepage = "https://github.com/bram85/topydo"; - license = licenses.gpl3; + homepage = "https://github.com/topydo/topydo"; + changelog = "https://github.com/topydo/topydo/blob/${src.rev}/CHANGES.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; }