From 83562c61752b398dabe88be79ab03c914ff901af Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Tue, 28 Jun 2022 00:58:39 -0300 Subject: [PATCH] k9s: 0.25.18 -> 0.25.21 - add missing ldflags - add missing go tags - add install check - add shell completion --- .../networking/cluster/k9s/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 48236cdc25e..e31c9dc4b93 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,28 +1,46 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, k9s }: buildGoModule rec { pname = "k9s"; - version = "0.25.18"; + version = "0.25.21"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-iUhMPtFX7qFULegiyhlT4aG9q3deZ8aRqyEcbZ9jY/s="; + sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc="; }; ldflags = [ "-s" "-w" "-X github.com/derailed/k9s/cmd.version=${version}" "-X github.com/derailed/k9s/cmd.commit=${src.rev}" + "-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z" ]; - vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; + tags = [ "netgo" ]; - preCheck = "export HOME=$(mktemp -d)"; + vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + # Required to workaround test check error: + preCheck = "export HOME=$(mktemp -d)"; + # For arch != x86 + # {"level":"fatal","error":"could not create any of the following paths: /homeless-shelter/.config, /etc/xdg","time":"2022-06-28T15:52:36Z","message":"Unable to create configuration directory for k9s"} + passthru.tests.version = testers.testVersion { + package = k9s; + command = "HOME=$(mktemp -d) k9s version -s"; + inherit version; + }; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd k9s \ + --bash <($out/bin/k9s completion bash) \ + --fish <($out/bin/k9s completion fish) \ + --zsh <($out/bin/k9s completion zsh) + ''; meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style";