Skip to content

Commit e7e6e9d

Browse files
authored
hubble: fix cross build, re-enable tests, misc. cleanup (#396796)
2 parents 449b9d0 + 4e22e27 commit e7e6e9d

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

pkgs/by-name/hu/hubble/package.nix

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
stdenv,
23
lib,
34
buildGo124Module,
45
fetchFromGitHub,
@@ -19,7 +20,6 @@ buildGo124Module rec {
1920

2021
nativeBuildInputs = [
2122
installShellFiles
22-
versionCheckHook
2323
];
2424

2525
vendorHash = null;
@@ -32,27 +32,25 @@ buildGo124Module rec {
3232
"-X=github.com/cilium/cilium/hubble/pkg.Version=${version}"
3333
];
3434

35-
# Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe
36-
# https://github.com/NixOS/nixpkgs/issues/178976
37-
# https://github.com/cilium/hubble/pull/656
38-
# https://github.com/cilium/hubble/pull/655
39-
doCheck = false;
35+
doCheck = true;
4036

4137
doInstallCheck = true;
38+
nativeInstallCheckInputs = [ versionCheckHook ];
39+
versionCheckProgramArg = "version";
4240

43-
postInstall = ''
41+
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
4442
installShellCompletion --cmd hubble \
4543
--bash <($out/bin/hubble completion bash) \
4644
--fish <($out/bin/hubble completion fish) \
4745
--zsh <($out/bin/hubble completion zsh)
4846
'';
4947

50-
meta = with lib; {
48+
meta = {
5149
description = "Network, Service & Security Observability for Kubernetes using eBPF";
5250
homepage = "https://github.com/cilium/hubble/";
53-
changelog = "https://github.com/cilium/hubble/releases/tag/${src.tag}";
54-
license = licenses.asl20;
55-
maintainers = with maintainers; [
51+
changelog = "https://github.com/cilium/hubble/blob/${src.tag}/CHANGELOG.md";
52+
license = lib.licenses.asl20;
53+
maintainers = with lib.maintainers; [
5654
humancalico
5755
bryanasdev000
5856
FKouhai

0 commit comments

Comments
 (0)