From 52d36112b37f2d996e5ae9fc2168cd1ded208b5d Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Sat, 26 Apr 2025 14:24:46 +0200
Subject: [PATCH 1/3] argocd: 2.14.10 -> 2.14.11

---
 pkgs/by-name/ar/argocd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index bbc228e6f17d..8a13bb3ffe36 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.14.10";
+  version = "2.14.11";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-Z+xSA0LrvXHHmNg7+i53Y1mSYnLYURZUglXRKvkld14=";
+    hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch

From 8970ef98e74ba431ae3805bdd9100e4a57583b39 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Sat, 26 Apr 2025 15:25:48 +0200
Subject: [PATCH 2/3] argocd: automate kubectl version to use in ldflags

---
 pkgs/by-name/ar/argocd/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 8a13bb3ffe36..9a28932443ce 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
   stdenv,
 }:
 
@@ -26,25 +27,27 @@ buildGoModule rec {
 
   ldflags =
     let
-      package_url = "github.com/argoproj/argo-cd/v2/common";
+      packageUrl = "github.com/argoproj/argo-cd/v2/common";
     in
     [
       "-s"
       "-w"
-      "-X ${package_url}.version=${version}"
-      "-X ${package_url}.buildDate=unknown"
-      "-X ${package_url}.gitCommit=${src.rev}"
-      "-X ${package_url}.gitTag=${src.rev}"
-      "-X ${package_url}.gitTreeState=clean"
-      "-X ${package_url}.kubectlVersion=v0.31.2"
-      # NOTE: Update kubectlVersion when upgrading this package with
-      # https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22k8s.io%2Fkubectl%22+path%3Ago.mod&type=code
-      # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
-      # Will need a way to automate it :P
+      "-X ${packageUrl}.version=${version}"
+      "-X ${packageUrl}.buildDate=unknown"
+      "-X ${packageUrl}.gitCommit=${src.rev}"
+      "-X ${packageUrl}.gitTag=${src.rev}"
+      "-X ${packageUrl}.gitTreeState=clean"
     ];
 
   nativeBuildInputs = [ installShellFiles ];
 
+  # set ldflag for kubectlVersion since it is needed for argo
+  # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
+  prePatch = ''
+    export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" )
+    echo using $KUBECTL_VERSION
+    ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}"
+  '';
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin

From 0c5cbd76d68070160825501229153d6e8ba3c962 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Mon, 12 May 2025 23:58:13 +0200
Subject: [PATCH 3/3] argocd: add updateScript

---
 pkgs/by-name/ar/argocd/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 9a28932443ce..b6ec6f336c7e 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -67,6 +67,8 @@ buildGoModule rec {
       --zsh <($out/bin/argocd completion zsh)
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Declarative continuous deployment for Kubernetes";
     mainProgram = "argocd";
@@ -77,6 +79,7 @@ buildGoModule rec {
       shahrukh330
       bryanasdev000
       qjoly
+      FKouhai
     ];
   };
 }