From 96f08060792effcb5f678035234df12daaa44131 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Feb 2026 18:41:42 +0000
Subject: [PATCH 1/2] kluctl: cleanup

---
 pkgs/by-name/kl/kluctl/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/kl/kluctl/package.nix b/pkgs/by-name/kl/kluctl/package.nix
index 4f901e00ba24..02562387103f 100644
--- a/pkgs/by-name/kl/kluctl/package.nix
+++ b/pkgs/by-name/kl/kluctl/package.nix
@@ -5,9 +5,9 @@
   buildPackages,
   fetchFromGitHub,
   installShellFiles,
-  testers,
   makeWrapper,
   python310,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -27,22 +27,16 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-s"
-    "-w"
     "-X main.version=v${finalAttrs.version}"
   ];
 
-  # Depends on docker
-  doCheck = false;
-
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-    version = "v${finalAttrs.version}";
-  };
+  # Depends on docker
+  doCheck = false;
 
   postInstall =
     let
@@ -59,6 +53,11 @@ buildGoModule (finalAttrs: {
         --zsh  <(${emulator} $out/bin/kluctl completion zsh)
     '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   meta = {
     description = "Missing glue to put together large Kubernetes deployments";
     mainProgram = "kluctl";

From 4feda4632597ae7f91b65105a28305ed6ddb9da3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Feb 2026 18:42:05 +0000
Subject: [PATCH 2/2] kluctl: use python3 instead of python310

Tracking: https://github.com/NixOS/nixpkgs/issues/488818
---
 pkgs/by-name/kl/kluctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kl/kluctl/package.nix b/pkgs/by-name/kl/kluctl/package.nix
index 02562387103f..c18d75d1619a 100644
--- a/pkgs/by-name/kl/kluctl/package.nix
+++ b/pkgs/by-name/kl/kluctl/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   installShellFiles,
   makeWrapper,
-  python310,
+  python3,
   versionCheckHook,
 }:
 
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
       mv $out/bin/{cmd,kluctl}
       wrapProgram $out/bin/kluctl \
         --set KLUCTL_USE_SYSTEM_PYTHON 1 \
-        --prefix PATH : '${lib.makeBinPath [ python310 ]}'
+        --prefix PATH : '${lib.makeBinPath [ python3 ]}'
       installShellCompletion --cmd kluctl \
         --bash <(${emulator} $out/bin/kluctl completion bash) \
         --fish <(${emulator} $out/bin/kluctl completion fish) \