From 2eeaffdf0a80c986ded645c61a76ef9a634b3861 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 14 Sep 2022 13:44:59 +0200 Subject: [PATCH 1/2] circleci-cli: Rename executable to `circleci` This is the official name of the tool, so it matches the docs and usages out there. --- pkgs/development/tools/misc/circleci-cli/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index fa73ef702d91b05..5a0f853dd55d5ca 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -17,6 +17,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; + postInstall = '' + mv $out/bin/circleci-cli $out/bin/circleci + ''; + meta = with lib; { # Box blurb edited from the AUR package circleci-cli description = '' @@ -24,6 +28,7 @@ buildGoModule rec { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; + mainProgram = "circleci"; license = licenses.mit; homepage = "https://circleci.com/"; }; From 0620a73bc4ab1af548bd6b678d8d1866715c843c Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 14 Sep 2022 22:29:41 +0200 Subject: [PATCH 2/2] circleci-cli: Add shell completions --- pkgs/development/tools/misc/circleci-cli/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5a0f853dd55d5ca..2c83d2305563348 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec { pname = "circleci-cli"; @@ -13,12 +13,18 @@ buildGoModule rec { vendorSha256 = "sha256-jrAd1G/NCjXfaJmzOhMjMZfJoGHsQ1bi3HudBM0e8rE="; + nativeBuildInputs = [ installShellFiles ]; + doCheck = false; ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; postInstall = '' mv $out/bin/circleci-cli $out/bin/circleci + + installShellCompletion --cmd circleci \ + --bash <($out/bin/circleci completion bash --skip-update-check) \ + --zsh <($out/bin/circleci completion zsh --skip-update-check) ''; meta = with lib; {