From 8add72d64b89b0296d489ef6b831878cfbb662c3 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Sat, 15 Feb 2025 14:50:31 +0100
Subject: [PATCH 1/2] maintainers: add FKouhai

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77493c7f1090..1f7bf3b9e35e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7529,6 +7529,12 @@
     github = "fkautz";
     githubId = 135706;
   };
+  FKouhai = {
+    name = "Fran Cirka";
+    email = "frandres00@gmail.com";
+    github = "FKouhai";
+    githubId = 24593008;
+  };
   flacks = {
     name = "Jean Lucas";
     email = "jean@4ray.co";

From 429b582e3774201d9b52692300521b55b6451453 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Tue, 7 Jan 2025 20:53:38 +0100
Subject: [PATCH 2/2] hubble: 0.13.6 -> 1.17.1

---
 pkgs/by-name/hu/hubble/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hu/hubble/package.nix b/pkgs/by-name/hu/hubble/package.nix
index a841d66b74c2..8e540d015303 100644
--- a/pkgs/by-name/hu/hubble/package.nix
+++ b/pkgs/by-name/hu/hubble/package.nix
@@ -1,19 +1,19 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "hubble";
-  version = "0.13.6";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-evtXuVcaKKuAW+04S+IADKf+wJ1MrnGpHLNUbxWd9ZM=";
+    sha256 = "sha256-ZrLb2dITQPd9g4azlidpTHFWNwop0AMKEIzwMX1Y7Jw=";
   };
 
   vendorHash = null;
@@ -21,9 +21,9 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/cilium/hubble/pkg.GitBranch=none"
-    "-X github.com/cilium/hubble/pkg.GitHash=none"
-    "-X github.com/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
@@ -52,6 +52,7 @@ buildGoModule rec {
     maintainers = with maintainers; [
       humancalico
       bryanasdev000
+      FKouhai
     ];
   };
 }