From 1b78c75b0cdaca2a708bef6af74306649361e4f9 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 22 Jun 2024 12:59:13 +0200 Subject: [PATCH 1/6] ear2ctl: init at 0.1.0 --- pkgs/by-name/ea/ear2ctl/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/ea/ear2ctl/package.nix diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix new file mode 100644 index 000000000000..fdf547377ecb --- /dev/null +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitLab, pkg-config, dbus }: + +rustPlatform.buildRustPackage rec { + pname = "ear2ctl"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "bharadwaj-raju"; + repo = pname; + rev = version; + hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; + }; + + cargoHash = "sha256-ax+/lvdEOjLnwE3Gvji7aaeF9KXjoOXdlTvxYDo8wGI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + meta = with lib; { + description = "Controls for the Nothing Ear (2)"; + homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "ear2ctl"; + }; +} From 1eb18c3715ed21581413e6733f740e88639bf1ea Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Fri, 28 Jun 2024 23:47:33 +0200 Subject: [PATCH 2/6] replace repo name variable with a string literal saw nixpkgs maintainer suggest someone who wanted to contribute to nixpkgs do this so I decided to learn from their mistakes. --- pkgs/by-name/ea/ear2ctl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix index fdf547377ecb..c87217fcb377 100644 --- a/pkgs/by-name/ea/ear2ctl/package.nix +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitLab { owner = "bharadwaj-raju"; - repo = pname; + repo = "ear2ctl"; rev = version; hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; }; From 1ca2f7ca7ca1ee80a77224ccf9170b671173f99c Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 29 Jun 2024 11:43:57 +0200 Subject: [PATCH 3/6] Fix grammar in ear2ctl description Co-authored-by: Aleksana --- pkgs/by-name/ea/ear2ctl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix index c87217fcb377..5056eeb925ca 100644 --- a/pkgs/by-name/ea/ear2ctl/package.nix +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus ]; meta = with lib; { - description = "Controls for the Nothing Ear (2)"; + description = "Linux controller for the Nothing Ear (2)"; homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; license = licenses.gpl3Plus; platforms = platforms.linux; From fdef98ea30cc39b28e24367f548d809d33d5adb6 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 29 Jun 2024 11:45:20 +0200 Subject: [PATCH 4/6] remove with.lib; --- pkgs/by-name/ea/ear2ctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix index 5056eeb925ca..ebb255b37cdb 100644 --- a/pkgs/by-name/ea/ear2ctl/package.nix +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus ]; - meta = with lib; { + meta = { description = "Linux controller for the Nothing Ear (2)"; homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "ear2ctl"; }; } From 93e88d3b5bfb2df51bfa0b9b02859ba563cf3ef6 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 29 Jun 2024 12:10:40 +0200 Subject: [PATCH 5/6] add maintainer --- maintainers/maintainer-list.nix | 5 +++++ pkgs/by-name/ea/ear2ctl/package.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec5d9e6b7552..95673c211f41 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14003,6 +14003,11 @@ githubId = 1386642; name = "Noah Brenowitz"; }; + jaredmontoya = { + name = "Jared Montoya"; + github = "jaredmontoya"; + githubId = 49511278; + }; nbsp = { email = "aoife@enby.space"; matrix = "@nbsp:enby.space"; diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix index ebb255b37cdb..4d4e038f85f0 100644 --- a/pkgs/by-name/ea/ear2ctl/package.nix +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Linux controller for the Nothing Ear (2)"; homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; + maintainers = with lib.maintainers; [ jaredmontoya ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "ear2ctl"; From 27a8cf3bb9ff7ff2905a742a30cad118fde99ca8 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 29 Jun 2024 12:12:44 +0200 Subject: [PATCH 6/6] sort maintainers list --- maintainers/maintainer-list.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 95673c211f41..3627492cc14f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8953,6 +8953,11 @@ githubId = 3874017; name = "Jappie Klooster"; }; + jaredmontoya = { + name = "Jared Montoya"; + github = "jaredmontoya"; + githubId = 49511278; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -14003,11 +14008,6 @@ githubId = 1386642; name = "Noah Brenowitz"; }; - jaredmontoya = { - name = "Jared Montoya"; - github = "jaredmontoya"; - githubId = 49511278; - }; nbsp = { email = "aoife@enby.space"; matrix = "@nbsp:enby.space";