From a30984499e8c12b960332eb446775e08a1c1f166 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 16 Sep 2023 09:26:33 -0500 Subject: [PATCH 1/4] dooit: add khaneliman to maintainers --- pkgs/tools/misc/dooit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index 6610c13b6a74..ad39bf765cbf 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -43,6 +43,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kraanzu/dooit"; changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ wesleyjrz ]; + maintainers = with maintainers; [ khaneliman wesleyjrz ]; }; } From a70c8e2a646c134ffb4e571c1b53acee35274e44 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 13 Sep 2023 19:46:08 -0500 Subject: [PATCH 2/4] dooit: 1.0.1 -> 2.0.0 --- pkgs/tools/misc/dooit/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index ad39bf765cbf..0666c5b419a4 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -5,34 +5,27 @@ python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "1.0.1"; + version = "2.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kraanzu"; repo = pname; rev = "v${version}"; - hash = "sha256-7a6xoqbAmnGVUVppQTSo4hH44XFCqBnF7xO7sOVySY0="; + hash = "sha256-Ipj3ltuewbMIUYRffxxPcJgIPxP5dJAkHpo14ZZKq+k="; }; - # Required versions not available - pythonRelaxDeps = [ - "textual" - "tzlocal" - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ - textual - pyperclip - pyyaml - dateparser - tzlocal appdirs + pyperclip + python-dateutil + pyyaml + textual + tzlocal ]; # No tests available From 7254eeb1c98b0da21157ddb1b43332b5b677f2f5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 16 Sep 2023 09:25:16 -0500 Subject: [PATCH 3/4] dooit: 2.0.0 -> 2.0.1 --- pkgs/tools/misc/dooit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index 0666c5b419a4..89dc5832edfa 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "kraanzu"; repo = pname; rev = "v${version}"; - hash = "sha256-Ipj3ltuewbMIUYRffxxPcJgIPxP5dJAkHpo14ZZKq+k="; + hash = "sha256-iQAGD6zrBBd4fJONaB7to1OJpAJUO0zeA1xhVQZBkMc="; }; nativeBuildInputs = with python3.pkgs; [ From c8c3149982e838455412843c40cbf1f5d5d1213d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 16 Sep 2023 15:47:52 -0500 Subject: [PATCH 4/4] dooit: add version test --- pkgs/tools/misc/dooit/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index 89dc5832edfa..ab7db4a2cb7c 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub +, dooit , python3 +, testers }: python3.pkgs.buildPythonApplication rec { @@ -10,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "kraanzu"; - repo = pname; + repo = "dooit"; rev = "v${version}"; hash = "sha256-iQAGD6zrBBd4fJONaB7to1OJpAJUO0zeA1xhVQZBkMc="; }; @@ -28,9 +30,20 @@ python3.pkgs.buildPythonApplication rec { tzlocal ]; + # NOTE pyproject version was bumped after release tag 2.0.1 - remove after next release. + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "version = \"2.0.0\"" "version = \"2.0.1\"" + ''; + # No tests available doCheck = false; + passthru.tests.version = testers.testVersion { + package = dooit; + command = "HOME=$(mktemp -d) dooit --version"; + }; + meta = with lib; { description = "A TUI todo manager"; homepage = "https://github.com/kraanzu/dooit";