diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index fb097191cb58..b8c6111d1465 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -1,35 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + cilium-cli, + fetchFromGitHub, + installShellFiles, + testers, +}: buildGoModule rec { pname = "cilium-cli"; - version = "0.16.15"; + version = "0.16.19"; src = fetchFromGitHub { owner = "cilium"; - repo = pname; - rev = "v${version}"; - hash = "sha256-5LqRHa0ytprwAAIl7iNZQ9zKnn5wNtFubQdvLuX9qGM="; + repo = "cilium-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-I5HC1H517oCizZf2mcHOKmgJqnvPjkNVfDy2/9Kkw44="; }; + nativeBuildInputs = [ installShellFiles ]; + vendorHash = null; subPackages = [ "cmd/cilium" ]; ldflags = [ "-s" "-w" - "-X github.com/cilium/cilium-cli/defaults.CLIVersion=${version}" + "-X=github.com/cilium/cilium-cli/defaults.CLIVersion=${version}" ]; # Required to workaround install check error: # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied HOME = "$TMPDIR"; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/cilium version --client | grep ${version} > /dev/null - ''; - - nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd cilium \ --bash <($out/bin/cilium completion bash) \ @@ -37,11 +40,17 @@ buildGoModule rec { --zsh <($out/bin/cilium completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = cilium-cli; + command = "cilium version --client"; + version = "${version}"; + }; + meta = { - changelog = "https://github.com/cilium/cilium-cli/releases/tag/v${version}"; description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; - license = lib.licenses.asl20; homepage = "https://www.cilium.io/"; + changelog = "https://github.com/cilium/cilium-cli/releases/tag/v${version}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ]; mainProgram = "cilium"; };