From 5fc7480c9424362651eb089b0a8ebddbe122364e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 May 2023 16:56:59 -0400 Subject: [PATCH 1/2] topydo: apply patch to fix test --- pkgs/applications/misc/topydo/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index a20e3e2650f1..84bf6c016ef1 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, fetchpatch, glibcLocales }: with python3Packages; @@ -13,6 +13,15 @@ buildPythonApplication rec { sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb"; }; + patches = [ + # fixes a failing test + (fetchpatch { + name = "update-a-test-reference-ics-file.patch"; + url = "https://github.com/topydo/topydo/commit/9373bb4702b512b10f0357df3576c129901e3ac6.patch"; + hash = "sha256-JpyQfryWSoJDdyzbrESWY+RmRbDw1myvTlsFK7+39iw="; + }) + ]; + propagatedBuildInputs = [ arrow icalendar From f0284ab4d84681db8cbc92445a2b69626713e06e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 May 2023 16:59:46 -0400 Subject: [PATCH 2/2] 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; [ ]; }; }