From 183b8e644fd081c55be0268787d346d05f9e5331 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:05:00 -0400
Subject: [PATCH 1/4] hadolint-sarif: 0.4.2 -> 0.5.0

Diff: https://github.com/psastras/sarif-rs/compare/hadolint-sarif-v0.4.2...hadolint-sarif-v0.5.0
---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index bf8f43429633..94d34e2d4a1c 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "hadolint-sarif";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "hadolint-sarif-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-AMRL1XANyze8bJe3fdgZvBnl/NyuWP13jixixqiPmiw=";
+  cargoHash = "sha256-x2JHMc8OcOVCJ0X68tTyMI8P7bM8javjkYlrHBLMjus=";
   cargoBuildFlags = [
     "--package"
     "hadolint-sarif"

From ee0085a562c876966234cea936afd57cc62d843d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:29:04 -0400
Subject: [PATCH 2/4] hadolint-sarif: fetchFromGitHub -> fetchCrate

this makes things much easier to build as we don't need to account for
the monorepo
---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 94d34e2d4a1c..926d459dbab5 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
   hadolint-sarif,
   testers,
@@ -9,19 +9,12 @@ rustPlatform.buildRustPackage rec {
   pname = "hadolint-sarif";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "hadolint-sarif-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-Zh3y31Q+ue1TqncZpdX+fAp2yfEnv8W8jkzUW7UvrKg=";
   };
 
-  cargoHash = "sha256-x2JHMc8OcOVCJ0X68tTyMI8P7bM8javjkYlrHBLMjus=";
-  cargoBuildFlags = [
-    "--package"
-    "hadolint-sarif"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-bwEQ9lZXvZL6JN24N8gRdbV5gcFiH1fQ59PQILfW1z8=";
 
   passthru = {
     tests.version = testers.testVersion { package = hadolint-sarif; };

From 8960ca71be59d29e9920160806f9cae7b929cf2e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:29:45 -0400
Subject: [PATCH 3/4] hadolint-sarif: add updateScript

---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 926d459dbab5..5996be333c13 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -3,6 +3,7 @@
   fetchCrate,
   rustPlatform,
   hadolint-sarif,
+  nix-update-script,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
@@ -18,13 +19,14 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     tests.version = testers.testVersion { package = hadolint-sarif; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "A CLI tool to convert hadolint diagnostics into SARIF";
     homepage = "https://psastras.github.io/sarif-rs";
-    mainProgram = "hadolint-sarif";
-    maintainers = with lib.maintainers; [ getchoo ];
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "hadolint-sarif";
   };
 }

From 9cb1661a00e58d7760e400313e237f4a19133a5a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:30:31 -0400
Subject: [PATCH 4/4] hadolint-sarif: testers.testVersion -> versionCheckHook

this results in less ugly recursion
---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 5996be333c13..870d3d833acc 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -2,9 +2,8 @@
   lib,
   fetchCrate,
   rustPlatform,
-  hadolint-sarif,
   nix-update-script,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "hadolint-sarif";
@@ -17,8 +16,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-bwEQ9lZXvZL6JN24N8gRdbV5gcFiH1fQ59PQILfW1z8=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion { package = hadolint-sarif; };
     updateScript = nix-update-script { };
   };