diff --git a/pkgs/by-name/hu/hubble/package.nix b/pkgs/by-name/hu/hubble/package.nix index 8e540d015303..9bf6a0bfc5af 100644 --- a/pkgs/by-name/hu/hubble/package.nix +++ b/pkgs/by-name/hu/hubble/package.nix @@ -3,27 +3,33 @@ buildGo124Module, fetchFromGitHub, installShellFiles, + versionCheckHook, }: buildGo124Module rec { pname = "hubble"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "cilium"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZrLb2dITQPd9g4azlidpTHFWNwop0AMKEIzwMX1Y7Jw="; + repo = "hubble"; + tag = "v${version}"; + hash = "sha256-ZkowUftSEGo+UjYM+kk3tQJc8QJgoJATeIKPwu2ikQ4="; }; + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ]; + vendorHash = null; ldflags = [ "-s" "-w" - "-X github.com/cilium/cilium/hubble/pkg.GitBranch=none" - "-X github.com/cilium/cilium/hubble/pkg.GitHash=none" - "-X github.com/cilium/cilium/hubble/pkg.Version=${version}" + "-X=github.com/cilium/cilium/hubble/pkg.GitBranch=none" + "-X=github.com/cilium/cilium/hubble/pkg.GitHash=none" + "-X=github.com/cilium/cilium/hubble/pkg.Version=${version}" ]; # Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe @@ -31,12 +37,9 @@ buildGo124Module rec { # https://github.com/cilium/hubble/pull/656 # https://github.com/cilium/hubble/pull/655 doCheck = false; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/hubble version | grep ${version} > /dev/null - ''; - nativeBuildInputs = [ installShellFiles ]; + doInstallCheck = true; + postInstall = '' installShellCompletion --cmd hubble \ --bash <($out/bin/hubble completion bash) \ @@ -46,13 +49,14 @@ buildGo124Module rec { meta = with lib; { description = "Network, Service & Security Observability for Kubernetes using eBPF"; - mainProgram = "hubble"; - license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; + changelog = "https://github.com/cilium/hubble/releases/tag/${src.tag}"; + license = licenses.asl20; maintainers = with maintainers; [ humancalico bryanasdev000 FKouhai ]; + mainProgram = "hubble"; }; }