From 49a891ba59018952aa8236029c4ca6abff8a4fea Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Sep 2022 22:36:43 -0400 Subject: [PATCH 1/2] kubespy: fix version command --- pkgs/applications/networking/cluster/kubespy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index 5a9b1c463c4a..b2686649dd9b 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -15,6 +15,8 @@ buildGoModule rec { doCheck = false; + ldflags = [ "-X" "github.com/pulumi/kubespy/version.Version=${version}" ]; + # TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed. # postInstall = '' # for shell in bash zsh; do From 87c8afa3b4ebd856c677074c2e9660a244caebe1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Sep 2022 22:45:56 -0400 Subject: [PATCH 2/2] kubespy: install completion files --- .../networking/cluster/kubespy/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index b2686649dd9b..0ed978a4a59e 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -13,17 +13,18 @@ buildGoModule rec { vendorSha256 = "sha256-HmMh5jrRGs4rtN9GLddS9IwITyvVmOrL5TShhQeyxKU="; + nativeBuildInputs = [ installShellFiles ]; + doCheck = false; ldflags = [ "-X" "github.com/pulumi/kubespy/version.Version=${version}" ]; - # TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed. - # postInstall = '' - # for shell in bash zsh; do - # $out/bin/kubespy completion $shell > kubespy.$shell - # installShellCompletion kubespy.$shell - # done - # ''; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/kubespy completion $shell > kubespy.$shell + installShellCompletion kubespy.$shell + done + ''; meta = with lib; { description = "A tool to observe Kubernetes resources in real time";