From 699af90c198ac3ce22dd46f5c726ca18ea28a510 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 3 Aug 2025 15:13:40 +0900
Subject: [PATCH 1/2] yamlfmt: correct commit reference in version flag

---
 pkgs/by-name/ya/yamlfmt/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index 1dd51cfd7202..5e7219f4cf28 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -14,7 +14,12 @@ buildGoModule (finalAttrs: {
     owner = "google";
     repo = "yamlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EYOtxb2Xq4bQpWbITmPieVMqJz3/2chgNirZEjiyjAY=";
+    hash = "sha256-WSw4WhWNyvkCwRCQYFAKhtkvOSSCrSlX3+i6cMHRtOQ=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C "$out" rev-parse --short HEAD > "$out/.git_head"
+      rm -rf "$out/.git"
+    '';
   };
 
   vendorHash = "sha256-Cy1eBvKkQ90twxjRL2bHTk1qNFLQ22uFrOgHKmnoUIQ=";
@@ -23,9 +28,12 @@ buildGoModule (finalAttrs: {
     "-s"
     "-w"
     "-X=main.version=${finalAttrs.version}"
-    "-X=main.commit=${finalAttrs.src.rev}"
   ];
 
+  preBuild = ''
+    ldflags+=" -X=main.commit=$(<.git_head)"
+  '';
+
   # Test failure in vendored yaml package, see:
   # https://github.com/google/yamlfmt/issues/256
   checkFlags = [ "-run=!S/TestNodeRoundtrip" ];

From 06ad68fa17a6522fa3d89d71b465372a7962f04b Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 3 Aug 2025 19:56:31 +0900
Subject: [PATCH 2/2] yamlfmt: prefer versionCheckHook over testers.testVersion

---
 pkgs/by-name/ya/yamlfmt/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index 5e7219f4cf28..4e5cea9eae03 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -2,8 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  testers,
-  yamlfmt,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -38,9 +37,11 @@ buildGoModule (finalAttrs: {
   # https://github.com/google/yamlfmt/issues/256
   checkFlags = [ "-run=!S/TestNodeRoundtrip" ];
 
-  passthru.tests.version = testers.testVersion {
-    package = yamlfmt;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Extensible command line tool or library to format yaml files";