From ed8c7e0abbc0af47983f496483e95cd2e4f69e03 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:51:35 +0800
Subject: [PATCH 1/2] tflint: 0.58.1 -> 0.59.1

---
 pkgs/by-name/tf/tflint/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 45dc9d696097..dcb1ebc37310 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   runCommand,
   makeWrapper,
@@ -11,19 +11,19 @@
 
 let
   pname = "tflint";
-  version = "0.58.1";
+  version = "0.59.1";
 in
-buildGoModule {
+buildGo125Module {
   inherit pname version;
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = "tflint";
     tag = "v${version}";
-    hash = "sha256-1SuNcqU8JtMypoltbNBZHZZi78jvbbAD+nmj2v8NU5g=";
+    hash = "sha256-tE8h0sAKCJEZzZqUAcgyVWVRXdG3F7F1Vh7Je0+0Xeg=";
   };
 
-  vendorHash = "sha256-8sHiCEtVs+rUnmJ9NPYJJcr4sDlFaEWklE3JaoXEu9w=";
+  vendorHash = "sha256-KVKxtH/Hgxe7We3K8ArovsRDPz6a2wEfQ8Zx3ScCo74=";
 
   doCheck = false;
 

From 9fa1a45d99b1beb20f73000971324a83d6ce9c2b Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:54:21 +0800
Subject: [PATCH 2/2] tflint: add versionCheckHook

---
 pkgs/by-name/tf/tflint/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index dcb1ebc37310..0c164ffb3d5b 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGo125Module,
   fetchFromGitHub,
+  versionCheckHook,
   runCommand,
   makeWrapper,
   tflint,
@@ -9,17 +10,14 @@
   symlinkJoin,
 }:
 
-let
+buildGo125Module (finalAttrs: {
   pname = "tflint";
   version = "0.59.1";
-in
-buildGo125Module {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = "tflint";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tE8h0sAKCJEZzZqUAcgyVWVRXdG3F7F1Vh7Je0+0Xeg=";
   };
 
@@ -34,6 +32,12 @@ buildGo125Module {
     "-w"
   ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = "--version";
+
   passthru.withPlugins =
     plugins:
     let
@@ -43,10 +47,10 @@ buildGo125Module {
         paths = [ actualPlugins ];
       };
     in
-    runCommand "tflint-with-plugins-${version}"
+    runCommand "tflint-with-plugins-${finalAttrs.version}"
       {
         nativeBuildInputs = [ makeWrapper ];
-        inherit version;
+        inherit (finalAttrs) version;
       }
       ''
         makeWrapper ${tflint}/bin/tflint $out/bin/tflint \
@@ -57,8 +61,8 @@ buildGo125Module {
     description = "Terraform linter focused on possible errors, best practices, and so on";
     mainProgram = "tflint";
     homepage = "https://github.com/terraform-linters/tflint";
-    changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ momeemt ];
   };
-}
+})