From d708a80d4424077a4c9ece554aef3e5548727a3b Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sun, 11 May 2025 15:47:48 -0700 Subject: [PATCH 1/3] forgejo-cli: use finalAttrs --- pkgs/by-name/fo/forgejo-cli/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index e53172ef4e48..9d148a3ac926 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -8,18 +8,15 @@ openssl, zlib, }: -let - version = "0.3.0"; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "forgejo-cli"; - inherit version; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Cyborus"; repo = "forgejo-cli"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8KPR7Fx26hj5glKDjczCLP6GgQBUsA5TpjhO5UZOpik="; }; @@ -43,7 +40,7 @@ rustPlatform.buildRustPackage { meta = { description = "CLI application for interacting with Forgejo"; homepage = "https://codeberg.org/Cyborus/forgejo-cli"; - changelog = "https://codeberg.org/Cyborus/forgejo-cli/releases/tag/v${version}"; + changelog = "https://codeberg.org/Cyborus/forgejo-cli/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit @@ -51,4 +48,4 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ isabelroses ]; mainProgram = "fj"; }; -} +}) From e7b5269a92771a30bd0152abd9a34dd4c21b493f Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sun, 11 May 2025 15:48:07 -0700 Subject: [PATCH 2/3] forgejo-cli: add awwpotato as maintainer --- pkgs/by-name/fo/forgejo-cli/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 9d148a3ac926..516875024cd9 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -45,7 +45,10 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = with lib.maintainers; [ isabelroses ]; + maintainers = with lib.maintainers; [ + awwpotato + isabelroses + ]; mainProgram = "fj"; }; }) From 7e5847d457999b21aa83e034f569e188cc023777 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sun, 11 May 2025 15:48:22 -0700 Subject: [PATCH 3/3] forgejo-cli: add shell completions --- pkgs/by-name/fo/forgejo-cli/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 516875024cd9..ebc489b772c5 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -1,8 +1,11 @@ { lib, + stdenv, rustPlatform, fetchFromGitea, pkg-config, + installShellFiles, + writableTmpDirAsHomeHook, libgit2, oniguruma, openssl, @@ -23,7 +26,11 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-kW7Pexydkosaufk1e8P5FaY+dgkeeTG5qgJxestWkVs="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + writableTmpDirAsHomeHook # Needed for shell completions + ]; buildInputs = [ libgit2 @@ -37,6 +44,13 @@ rustPlatform.buildRustPackage (finalAttrs: { BUILD_TYPE = "nixpkgs"; }; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd fj \ + --bash <($out/bin/fj completion bash) \ + --fish <($out/bin/fj completion fish) \ + --zsh <($out/bin/fj completion zsh) + ''; + meta = { description = "CLI application for interacting with Forgejo"; homepage = "https://codeberg.org/Cyborus/forgejo-cli";