From 9118fc1ebe37cba726f4b13fb196ecee84f80af8 Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Thu, 18 Apr 2024 00:10:25 +0200 Subject: [PATCH 1/6] maintainers: add buurro --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e26b5fd8768..666cad6d9b79 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2999,6 +2999,11 @@ githubId = 37375448; name = "Buildit"; }; + buurro = { + github = "buurro"; + githubId = 9320677; + name = "Marco Burro"; + }; bwc9876 = { email = "bwc9876@gmail.com"; github = "Bwc9876"; From 319c87362fba17225e677c277256b50a8062c63b Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Thu, 18 Apr 2024 00:11:25 +0200 Subject: [PATCH 2/6] trak: init at 0.0.4 --- pkgs/by-name/tr/trak/package.nix | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/tr/trak/package.nix diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix new file mode 100644 index 000000000000..df74077ec8da --- /dev/null +++ b/pkgs/by-name/tr/trak/package.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "trak"; + version = "0.0.4"; + pyproject = true; + + src = + let + repo = fetchFromGitHub { + owner = "lcfd"; + repo = "trak"; + rev = "v${version}"; + hash = "sha256-Lc5/i/OuAwHoPo8SeBZe+JSstZov8K/ku7EMyb2I9Ng="; + }; + in + "${repo}/cli"; + + propagatedBuildInputs = with python3Packages; [ + typer + ] ++ typer.optional-dependencies.all; + + build-system = [ python3Packages.poetry-core ]; + + meta = with lib; { + description = "Keep a record of the time you dedicate to your projects."; + homepage = "https://github.com/lcfd/trak"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ buurro ]; + mainProgram = "trak"; + }; +} From ec9dc94cdaed06942fd2b4109a4238d944782627 Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Thu, 18 Apr 2024 11:11:10 +0200 Subject: [PATCH 3/6] trak: suggested refactoring --- pkgs/by-name/tr/trak/package.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix index df74077ec8da..519736602378 100644 --- a/pkgs/by-name/tr/trak/package.nix +++ b/pkgs/by-name/tr/trak/package.nix @@ -8,16 +8,14 @@ python3Packages.buildPythonApplication rec { version = "0.0.4"; pyproject = true; - src = - let - repo = fetchFromGitHub { - owner = "lcfd"; - repo = "trak"; - rev = "v${version}"; - hash = "sha256-Lc5/i/OuAwHoPo8SeBZe+JSstZov8K/ku7EMyb2I9Ng="; - }; - in - "${repo}/cli"; + src = fetchFromGitHub { + owner = "lcfd"; + repo = "trak"; + rev = "v${version}"; + hash = "sha256-Lc5/i/OuAwHoPo8SeBZe+JSstZov8K/ku7EMyb2I9Ng="; + }; + + sourceRoot = "${src.name}/cli"; propagatedBuildInputs = with python3Packages; [ typer @@ -25,11 +23,11 @@ python3Packages.buildPythonApplication rec { build-system = [ python3Packages.poetry-core ]; - meta = with lib; { - description = "Keep a record of the time you dedicate to your projects."; + meta = { + description = "Keep a record of the time you dedicate to your projects"; homepage = "https://github.com/lcfd/trak"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ buurro ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ buurro ]; mainProgram = "trak"; }; } From eeb87387aca914cab46a96692fe47c2dc13122b9 Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Thu, 18 Apr 2024 11:15:40 +0200 Subject: [PATCH 4/6] trak: 0.0.4 -> 0.0.5 --- pkgs/by-name/tr/trak/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix index 519736602378..e7539a6072fe 100644 --- a/pkgs/by-name/tr/trak/package.nix +++ b/pkgs/by-name/tr/trak/package.nix @@ -5,19 +5,20 @@ python3Packages.buildPythonApplication rec { pname = "trak"; - version = "0.0.4"; + version = "0.0.5"; pyproject = true; src = fetchFromGitHub { owner = "lcfd"; repo = "trak"; rev = "v${version}"; - hash = "sha256-Lc5/i/OuAwHoPo8SeBZe+JSstZov8K/ku7EMyb2I9Ng="; + hash = "sha256-YJMX7pNRWdNPyWNZ1HfpdYsKSStRWLcianLz6nScMa8="; }; sourceRoot = "${src.name}/cli"; propagatedBuildInputs = with python3Packages; [ + questionary typer ] ++ typer.optional-dependencies.all; From 18c0dc279259716faeceac14eeb08b9c772f6c8d Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Thu, 18 Apr 2024 12:26:27 +0200 Subject: [PATCH 5/6] trak: use dependencies attr --- pkgs/by-name/tr/trak/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix index e7539a6072fe..2129850159bd 100644 --- a/pkgs/by-name/tr/trak/package.nix +++ b/pkgs/by-name/tr/trak/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { sourceRoot = "${src.name}/cli"; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ questionary typer ] ++ typer.optional-dependencies.all; From 62d9b8f7c980c1057549a78870526ed5765f7374 Mon Sep 17 00:00:00 2001 From: Marco Burro Date: Fri, 19 Apr 2024 15:04:21 +0200 Subject: [PATCH 6/6] maintainers: buurro email --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 666cad6d9b79..18cd2705a6ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3000,6 +3000,7 @@ name = "Buildit"; }; buurro = { + email = "marcoburro98@gmail.com"; github = "buurro"; githubId = 9320677; name = "Marco Burro";