From bee041dfc4705d7c9e75d8879ddf098e8f747870 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:04:34 -0400
Subject: [PATCH 1/4] clang-tidy-sarif: 0.4.2 -> 0.5.0

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

diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
index 64b8da01af3f3..12cb3411cb8a2 100644
--- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix
+++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clang-tidy-sarif";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "clang-tidy-sarif-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-NzdgfHRDgLB6sMhBflk9rACEocLP23KlZL22iAfBfh8=";
+  cargoHash = "sha256-zH0d519vld00opTRWPyL78WKXPYJ+7uTjcDnjDl8hjE=";
   cargoBuildFlags = [
     "--package"
     "clang-tidy-sarif"

From 594ddbd12fd7794c3f9385714ab535d0ace596d1 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:17:41 -0400
Subject: [PATCH 2/4] clang-tidy-sarif: fetchFromGitHub -> fetchCrate

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

diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
index 12cb3411cb8a2..91c0a933dddec 100644
--- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix
+++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
   clang-tidy-sarif,
   testers,
@@ -9,19 +9,12 @@ rustPlatform.buildRustPackage rec {
   pname = "clang-tidy-sarif";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "clang-tidy-sarif-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-lxZtuE6hvmeX2CCO8UeGDORnCV5N7ZNiVZR+9LOCrdk=";
   };
 
-  cargoHash = "sha256-zH0d519vld00opTRWPyL78WKXPYJ+7uTjcDnjDl8hjE=";
-  cargoBuildFlags = [
-    "--package"
-    "clang-tidy-sarif"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-R0IyXinUhIVqGal2Vt0EdU0EFyzs3KIbp/UIseWlj1Y=";
 
   passthru = {
     tests.version = testers.testVersion { package = clang-tidy-sarif; };

From 6cd6e4112735dd75fc2209a97127daadbab5cbdf Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:18:35 -0400
Subject: [PATCH 3/4] clang-tidy-sarif: add updateScript

---
 pkgs/by-name/cl/clang-tidy-sarif/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

From b77dea2ecce1b73a7df74f611561d7b2416006f8 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:27:02 -0400
Subject: [PATCH 4/4] clang-tidy-sarif: testers.testVersion -> versionCheckHook

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

diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
index a51c433e8ecbc..9073d5c894172 100644
--- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix
+++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
@@ -2,9 +2,8 @@
   lib,
   fetchCrate,
   rustPlatform,
-  clang-tidy-sarif,
   nix-update-script,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clang-tidy-sarif";
@@ -17,8 +16,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-R0IyXinUhIVqGal2Vt0EdU0EFyzs3KIbp/UIseWlj1Y=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion { package = clang-tidy-sarif; };
     updateScript = nix-update-script { };
   };