From 6c21273e1ecea72de026fc4b4839678aa0eb4bca Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Wed, 6 Apr 2022 03:23:51 -0300 Subject: [PATCH] argocd: 2.3.2 -> 2.3.3 change commit and tag to src.rev no more manual update --- .../networking/cluster/argocd/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 211c2ce211eb..9ce9286e610c 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,20 +2,16 @@ buildGoModule rec { pname = "argocd"; - version = "2.3.2"; - tag = "v${version}"; - # Update commit to match the tag above - # TODO make updadeScript - commit = "ecc2af9dcaa12975e654cde8cbbeaffbb315f75c"; + version = "2.3.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; - rev = tag; - sha256 = "sha256-n+C4l4U3cDU+fgCnGWOYLdyjknw7n/xPEtC1i8AaU4o="; + rev = "v${version}"; + sha256 = "sha256-ChgWqhkzVKhbyEA+g2flWK/WMxur7UHWXJUcLzp9RTE="; }; - vendorSha256 = "sha256-Km+1o6yuuxJs+DNTQ/XVTUFurD5gM5ohwDc7MwJuu5s="; + vendorSha256 = "sha256-XrIIMnn65Y10KnVTsmw6vLE53Zra1lWNFgklmaj3gF8="; # Set target as ./cmd per release-cli # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 @@ -27,8 +23,8 @@ buildGoModule rec { "-s" "-w" "-X ${package_url}.version=${version}" "-X ${package_url}.buildDate=unknown" - "-X ${package_url}.gitCommit=${commit}" - "-X ${package_url}.gitTag=${tag}" + "-X ${package_url}.gitCommit=${src.rev}" + "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" ]; @@ -43,7 +39,7 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/argocd version --client | grep ${tag} > /dev/null + $out/bin/argocd version --client | grep ${src.rev} > /dev/null ''; postInstall = ''