From 5f45f1cd289f0219642ae0f43f55996fdb6e246d Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 29 May 2022 00:16:28 -0300 Subject: [PATCH] argocd: 2.3.3 -> 2.3.4 - bump version - add ldflag kubectlVersion, this introduces a new thing to change when upgrading this package --- .../networking/cluster/argocd/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 9ce9286e610c..3500b1b75542 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "argocd"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-ChgWqhkzVKhbyEA+g2flWK/WMxur7UHWXJUcLzp9RTE="; + sha256 = "sha256-pWDwmsLCXoK8EzipOPXUdYu75hPm5AIExXmgoA102Dg="; }; vendorSha256 = "sha256-XrIIMnn65Y10KnVTsmw6vLE53Zra1lWNFgklmaj3gF8="; - # Set target as ./cmd per release-cli - # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 + # Set target as ./cmd per cli-local + # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 subPackages = [ "cmd" ]; ldflags = @@ -26,6 +26,11 @@ buildGoModule rec { "-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" + "-X ${package_url}.kubectlVersion=v0.23.1" + # NOTE: Update kubectlVersion when upgrading this package with + # go list -m k8s.io/client-go | head -n 1 | rev | cut -d' ' -f1 | rev + # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 + # Will need a way to automate it :P ]; nativeBuildInputs = [ installShellFiles ];