From d753ffac205762e8d6a010ae1c01ef66788a8ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 4 May 2022 20:42:39 +1000 Subject: [PATCH 1/2] exoscale-cli: add man pages and completions --- pkgs/tools/admin/exoscale-cli/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index a745c693305..c8efae5fdb8 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "exoscale-cli"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - excludedPackages = [ "./completion" "./docs" ]; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; @@ -21,6 +21,19 @@ buildGoModule rec { # because these are passed to "go install" which does not recognize -o postBuild = '' mv $GOPATH/bin/cli $GOPATH/bin/exo + + mkdir -p manpage + $GOPATH/bin/docs --man-page + rm $GOPATH/bin/docs + + $GOPATH/bin/completion bash + $GOPATH/bin/completion zsh + rm $GOPATH/bin/completion + ''; + + postInstall = '' + installManPage manpage/* + installShellCompletion --cmd exo --bash bash_completion --zsh zsh_completion ''; meta = { From 940c886a0b4fa368d51b7a66f3f67e3243c54038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 4 May 2022 20:43:10 +1000 Subject: [PATCH 2/2] exoscale-cli: add self as maintainer --- pkgs/tools/admin/exoscale-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c8efae5fdb8..6a093710151 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; homepage = "https://github.com/exoscale/cli"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dramaturg ]; + maintainers = with lib.maintainers; [ dramaturg viraptor ]; mainProgram = "exo"; }; }