From 20c710755e0e9d8a6eb515dd1121e8bc06466bc6 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 15 Mar 2026 17:31:47 +0900
Subject: [PATCH 1/3] krew: fix version display

---
 pkgs/by-name/kr/krew/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix
index e3eb7af8e101..8180e4043702 100644
--- a/pkgs/by-name/kr/krew/package.nix
+++ b/pkgs/by-name/kr/krew/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   makeWrapper,
   gitMinimal,
+  writableTmpDirAsHomeHook,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -23,11 +25,25 @@ buildGoModule (finalAttrs: {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  ldflags = [
+    "-s"
+    "-X"
+    "sigs.k8s.io/krew/internal/version.gitTag=v${finalAttrs.version}"
+  ];
+
   postFixup = ''
     wrapProgram $out/bin/krew \
       --prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    writableTmpDirAsHomeHook
+    versionCheckHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckProgramArg = "version";
+
   meta = {
     description = "Package manager for kubectl plugins";
     mainProgram = "krew";

From 1f6eab7f2db8583de23b1b3cb80ed00b71146c03 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 16 Mar 2026 14:29:53 +0900
Subject: [PATCH 2/3] krew: replace rev with tag for GitHub releases

Co-Authored-By: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/by-name/kr/krew/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix
index 8180e4043702..6ea3acaddd1c 100644
--- a/pkgs/by-name/kr/krew/package.nix
+++ b/pkgs/by-name/kr/krew/package.nix
@@ -15,8 +15,8 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "krew";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-KG4/vtEfwWVddfFoNbC4xakxOynDY6jyxek4JAXW5gY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KG4/vtEfwWVddfFoNbC4xakxOynDY6jyxek4JAXW5gY=";
   };
 
   vendorHash = "sha256-z0wiYknXcCx4vqROngn58CRe9TBgya4y3v736VBMhQ8=";

From c470e01622ef10290425a895269b224e7e5d04c9 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 16 Mar 2026 14:37:47 +0900
Subject: [PATCH 3/3] krew: correct commit reference in version flag

---
 pkgs/by-name/kr/krew/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix
index 6ea3acaddd1c..314c6366fa50 100644
--- a/pkgs/by-name/kr/krew/package.nix
+++ b/pkgs/by-name/kr/krew/package.nix
@@ -16,7 +16,12 @@ buildGoModule (finalAttrs: {
     owner = "kubernetes-sigs";
     repo = "krew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KG4/vtEfwWVddfFoNbC4xakxOynDY6jyxek4JAXW5gY=";
+    hash = "sha256-rhl4qVHwl876OSDrcLSS07x3H/x/zmFLPHdRw+fcYsw=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C "$out" rev-parse --short HEAD > "$out/.git_head"
+      rm -rf "$out/.git"
+    '';
   };
 
   vendorHash = "sha256-z0wiYknXcCx4vqROngn58CRe9TBgya4y3v736VBMhQ8=";
@@ -31,6 +36,10 @@ buildGoModule (finalAttrs: {
     "sigs.k8s.io/krew/internal/version.gitTag=v${finalAttrs.version}"
   ];
 
+  preBuild = ''
+    ldflags+=" -X=sigs.k8s.io/krew/internal/version.gitCommit=$(<.git_head)"
+  '';
+
   postFixup = ''
     wrapProgram $out/bin/krew \
       --prefix PATH : ${lib.makeBinPath [ gitMinimal ]}