From 67f2f8d5c33d4277b360feacac10b7ee2e450f9a Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 7 Aug 2026 16:20:59 -0400
Subject: [PATCH] faas-cli: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/fa/faas-cli/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index 2303c76ae5ac..37592ba39503 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -6,8 +6,7 @@
   makeWrapper,
   git,
   installShellFiles,
-  testers,
-  faas-cli,
+  versionCheckHook,
 }:
 let
   faasPlatform =
@@ -26,11 +25,13 @@ buildGoModule (finalAttrs: {
   pname = "faas-cli";
   version = "0.18.12";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
-    rev = finalAttrs.version;
-    sha256 = "sha256-I7P30c7rEVqemgUu/1AtM6jq2f4KB8xyDpjGBMvkLRU=";
+    tag = finalAttrs.version;
+    hash = "sha256-I7P30c7rEVqemgUu/1AtM6jq2f4KB8xyDpjGBMvkLRU=";
   };
 
   vendorHash = null;
@@ -41,7 +42,6 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-s"
-    "-w"
     "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${finalAttrs.version}"
     "-X github.com/openfaas/faas-cli/version.Version=${finalAttrs.version}"
     "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}"
@@ -61,10 +61,9 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/faas-cli completion --shell zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    command = "${faas-cli}/bin/faas-cli version --short-version --warn-update=false";
-    package = faas-cli;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
 
   meta = {
     description = "Official CLI for OpenFaaS";