From 9f2f1fe2b0377d977c99c2a4844b4b85dbb94f31 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Mon, 20 Oct 2025 21:03:08 -0700 Subject: [PATCH] openshift: cleanup --- pkgs/by-name/op/openshift/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/op/openshift/package.nix b/pkgs/by-name/op/openshift/package.nix index 6c32485cda43..ff4a9677fd3f 100644 --- a/pkgs/by-name/op/openshift/package.nix +++ b/pkgs/by-name/op/openshift/package.nix @@ -5,10 +5,11 @@ gpgme, installShellFiles, pkg-config, - testers, - openshift, + versionCheckHook, + nix-update-script, }: -buildGoModule rec { + +buildGoModule (finalAttrs: { pname = "openshift"; version = "4.19.0-202505210330"; gitCommit = "8f1c8b5"; @@ -16,7 +17,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - tag = "openshift-clients-${version}"; + tag = "openshift-clients-${finalAttrs.version}"; hash = "sha256-EIsK73zSozqBOFZalURNcamk5FRDusUEhXtup60c2zQ="; }; @@ -32,8 +33,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}" - "-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}" + "-X github.com/openshift/oc/pkg/version.commitFromGit=${finalAttrs.gitCommit}" + "-X github.com/openshift/oc/pkg/version.versionFromGit=v${finalAttrs.version}" ]; doCheck = false; @@ -54,11 +55,11 @@ buildGoModule rec { --zsh <($out/bin/oc completion zsh) ''; - passthru.tests.version = testers.testVersion { - package = openshift; - command = "oc version"; - version = "v${version}"; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; meta = { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; @@ -71,4 +72,4 @@ buildGoModule rec { ]; mainProgram = "oc"; }; -} +})