From 956fad668dffee7fce0b346917428b7eeb5afc40 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 2 May 2023 20:11:40 -0400 Subject: [PATCH 1/2] terraform-backend-git: install shell completions --- .../cluster/terraform-backend-git/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/pkgs/applications/networking/cluster/terraform-backend-git/default.nix index 0cbba942d0ac..1cce10b391a9 100644 --- a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix +++ b/pkgs/applications/networking/cluster/terraform-backend-git/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -16,8 +17,19 @@ buildGoModule rec { vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0="; + nativeBuildInputs = [ + installShellFiles + ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' + installShellCompletion --cmd terraform-backend-git \ + --bash <($out/bin/terraform-backend-git completion bash) \ + --fish <($out/bin/terraform-backend-git completion fish) \ + --zsh <($out/bin/terraform-backend-git completion zsh) + ''; + meta = with lib; { description = "Terraform HTTP Backend implementation that uses Git repository as storage"; homepage = "https://github.com/plumber-cd/terraform-backend-git"; From 4b802889d3e9e583a7afbdca7afcf408f3c4a326 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 2 May 2023 20:11:53 -0400 Subject: [PATCH 2/2] terraform-backend-git: fix version --- .../networking/cluster/terraform-backend-git/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/pkgs/applications/networking/cluster/terraform-backend-git/default.nix index 1cce10b391a9..5fe6b263a631 100644 --- a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix +++ b/pkgs/applications/networking/cluster/terraform-backend-git/default.nix @@ -21,7 +21,11 @@ buildGoModule rec { installShellFiles ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X=github.com/plumber-cd/terraform-backend-git/cmd.Version=${version}" + ]; postInstall = '' installShellCompletion --cmd terraform-backend-git \