From 21139d5cb426468f75b723dafd85bfcc54b729ac Mon Sep 17 00:00:00 2001
From: Quentin JOLY <quentin.joly@dgfip.finances.gouv.fr>
Date: Tue, 20 Feb 2024 17:16:40 +0100
Subject: [PATCH 1/3] cilium-cli: 0.15.22 -> 0.15.23

---
 pkgs/applications/networking/cluster/cilium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix
index 986ed3f09c98..baca4db53bc2 100644
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.15.22";
+  version = "0.15.23";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE=";
+    hash = "sha256-M9nxSzRW/BlwfoyGZ4FCqn0favhG0P1yZRsab13n4Gw=";
   };
 
   vendorHash = null;

From fa8ae021c5c0a4352b9f3a911dcc0f98943dbda6 Mon Sep 17 00:00:00 2001
From: Quentin JOLY <qjoly>
Date: Tue, 20 Feb 2024 17:24:06 +0100
Subject: [PATCH 2/3] maintainer: update email address of @qjoly

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b5a8ee6b8e7e..1dfc3de2eacb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15878,7 +15878,7 @@
     githubId = 10837173;
   };
   qjoly = {
-    email = "github@thoughtless.eu";
+    email = "github@une-pause-cafe.fr";
     github = "qjoly";
     githubId = 82603435;
     name = "Quentin JOLY";

From b4c8de852ce3566293f5d531b52b0fae8100b007 Mon Sep 17 00:00:00 2001
From: QJoly <github@thoughtless.eu>
Date: Wed, 13 Mar 2024 07:41:09 +0100
Subject: [PATCH 3/3] cilium-cli: 0.15.23 -> 0.16.0

---
 pkgs/applications/networking/cluster/cilium/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                         | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix
index baca4db53bc2..2174bd7bc658 100644
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.15.23";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-M9nxSzRW/BlwfoyGZ4FCqn0favhG0P1yZRsab13n4Gw=";
+    hash = "sha256-RJJETvgLdE/fJtd1LMShJ7Hm8/s1zUybhec6YPT44wg=";
   };
 
   vendorHash = null;
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s" "-w"
-    "-X github.com/cilium/cilium-cli/cli.Version=${version}"
+    "-X github.com/cilium/cilium-cli/defaults.CLIVersion=${version}"
   ];
 
   # Required to workaround install check error:
@@ -26,7 +26,7 @@ buildGoModule rec {
 
   doInstallCheck = true;
   installCheckPhase = ''
-    $out/bin/cilium version | grep ${version} > /dev/null
+    $out/bin/cilium version --client | grep ${version} > /dev/null
   '';
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3badc6dd0d6..fe8e8be85996 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6782,7 +6782,9 @@ with pkgs;
 
   cicero-tui = callPackage ../tools/misc/cicero-tui { };
 
-  cilium-cli = callPackage ../applications/networking/cluster/cilium { };
+  cilium-cli = callPackage ../applications/networking/cluster/cilium {
+    buildGoModule = buildGo122Module;
+  };
 
   cjdns = callPackage ../tools/networking/cjdns { };
   cjdns-tools = callPackage ../tools/admin/cjdns-tools { };