argocd: migrate to finalAttrs, switch to hash

This commit is contained in:
Guy Chronister
2026-02-12 08:28:07 -06:00
parent 69e585c677
commit b9192e868e
+13 -13
View File
@@ -11,25 +11,25 @@
nodejs,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "argocd";
version = "3.3.0";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-FvN4JCG/5SxpnmdEH9X1sMX5dNlp/x0ALNysv+LWroU=";
};
ui = stdenv.mkDerivation {
pname = "${pname}-ui";
inherit version;
src = src + "/ui";
pname = "argocd-ui";
inherit (finalAttrs) version;
src = finalAttrs.src + "/ui";
offlineCache = fetchYarnDeps {
yarnLock = "${src}/ui/yarn.lock";
hash = "sha256-kqBolkQiwZUBic0f+Ek5HwYsOmro1+FStkDLXAre79o=";
yarnLock = "${finalAttrs.src}/ui/yarn.lock";
hash = "sha256-ekhSPWzIgFhwSw0bIlBqu8LTYk3vuJ9VM8eHc3mnHGM=";
};
nativeBuildInputs = [
@@ -58,17 +58,17 @@ buildGoModule rec {
[
"-s"
"-w"
"-X ${packageUrl}.version=${version}"
"-X ${packageUrl}.version=${finalAttrs.version}"
"-X ${packageUrl}.buildDate=unknown"
"-X ${packageUrl}.gitCommit=${src.rev}"
"-X ${packageUrl}.gitTag=${src.rev}"
"-X ${packageUrl}.gitCommit=${finalAttrs.src.rev}"
"-X ${packageUrl}.gitTag=${finalAttrs.src.rev}"
"-X ${packageUrl}.gitTreeState=clean"
];
nativeBuildInputs = [ installShellFiles ];
preBuild = ''
cp -r ${ui}/dist ./ui
cp -r ${finalAttrs.ui}/dist ./ui
stat ./ui/dist/app/index.html # Sanity check
'';
@@ -88,7 +88,7 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
$out/bin/argocd version --client | grep ${src.rev} > /dev/null
$out/bin/argocd version --client | grep ${finalAttrs.src.rev} > /dev/null
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
@@ -112,4 +112,4 @@ buildGoModule rec {
FKouhai
];
};
}
})