From 69d3bc4b6861cd716426fb1c7f8baa238343a155 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 07:49:41 +0000 Subject: [PATCH 1/3] civo: 1.0.32 -> 1.0.40 --- pkgs/applications/networking/cluster/civo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 2018b94d4bb1..9f2eba1a41ac 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.32"; + version = "1.0.40"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Q/eSYm+SupHdRf7O7dU+UU+1GOwtjcsT0iFxWiKAEuw="; + sha256 = "sha256-rsO7vGPr80/ChoNtRGuJDnVDzxwBgLD//iMZEfvxvHc="; }; - vendorSha256 = "sha256-ZZwecjcJqKOj2ywy4el1SVMs+0a/F6tFP37MYDC6tyg="; + vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig="; CGO_ENABLED = 0; From 7d6fc515507987e90c01df3484dee23f360ca39d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 23 Sep 2022 04:20:00 +0000 Subject: [PATCH 2/3] civo: update ldflags --- pkgs/applications/networking/cluster/civo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 9f2eba1a41ac..3fe8c02c8923 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "civo"; @@ -20,9 +20,9 @@ buildGoModule rec { ldflags = [ "-s" - "-X github.com/civo/cli/cmd.VersionCli=${version}" - "-X github.com/civo/cli/cmd.CommitCli=${src.rev}" - "-X github.com/civo/cli/cmd.DateCli=unknown" + "-X github.com/civo/cli/common.VersionCli=${version}" + "-X github.com/civo/cli/common.CommitCli=${src.rev}" + "-X github.com/civo/cli/common.DateCli=unknown" ]; doInstallCheck = false; From e67243f1cffa7f65a53fb6d1acaa538d8b6c22aa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 23 Sep 2022 04:20:00 +0000 Subject: [PATCH 3/3] civo: install completions --- pkgs/applications/networking/cluster/civo/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 3fe8c02c8923..b5e16be137de 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "civo"; @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig="; + nativeBuildInputs = [ installShellFiles ]; + CGO_ENABLED = 0; # Some lint checks fail @@ -29,6 +31,10 @@ buildGoModule rec { postInstall = '' mv $out/bin/cli $out/bin/civo + installShellCompletion --cmd civo \ + --bash <($out/bin/civo completion bash) \ + --fish <($out/bin/civo completion fish) \ + --zsh <($out/bin/civo completion zsh) ''; meta = with lib; {