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

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

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 551530dcc9c3..73a0b882f36e 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "clippy-sarif-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-F3NrqkqLdvMRIuozCMMqwlrrf5QrnmcEhy4TGSzPhiU=";
+  cargoHash = "sha256-F97Cwk87M3SpLqXSECH5nZ8x+3c3oz28zxlPvQUZWlg=";
   cargoBuildFlags = [
     "--package"
     "clippy-sarif"

From 799eff71f63fd5cfc478839aa9667729ccf86d6d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:13:56 -0400
Subject: [PATCH 2/4] clippy-sarif: fetchFromGitHub -> fetchCrate

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

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 73a0b882f36e..6be420f5bf27 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
   clippy,
   clippy-sarif,
@@ -10,19 +10,12 @@ rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "clippy-sarif-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-ylfL4N1BtbB1R7+Glwtgn5E6/v3wQ6oXWdmeyKNHdOw=";
   };
 
-  cargoHash = "sha256-F97Cwk87M3SpLqXSECH5nZ8x+3c3oz28zxlPvQUZWlg=";
-  cargoBuildFlags = [
-    "--package"
-    "clippy-sarif"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-O0bLgj7rWwbEswVMfexsBGgJyObxseOohYht21Y6HpU=";
 
   passthru = {
     tests.version = testers.testVersion { package = clippy-sarif; };

From 22ccac6ba7db781977cd50e0c913ba81d8d8d902 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:15:39 -0400
Subject: [PATCH 3/4] clippy-sarif: add updateScript

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

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 6be420f5bf27..819dd6177dac 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   clippy,
   clippy-sarif,
+  nix-update-script,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
@@ -19,14 +20,15 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     tests.version = testers.testVersion { package = clippy-sarif; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "A CLI tool to convert clippy diagnostics into SARIF";
-    mainProgram = "clippy-sarif";
     homepage = "https://psastras.github.io/sarif-rs";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "clippy-sarif";
     inherit (clippy.meta) platforms;
   };
 }

From 0ee138df823fc200f18cbdcce22affb5396107e7 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:25:42 -0400
Subject: [PATCH 4/4] clippy-sarif: testers.testVersion -> versionCheckHook

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

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 819dd6177dac..6b4a1aa1afdd 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -3,9 +3,8 @@
   fetchCrate,
   rustPlatform,
   clippy,
-  clippy-sarif,
   nix-update-script,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
@@ -18,8 +17,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-O0bLgj7rWwbEswVMfexsBGgJyObxseOohYht21Y6HpU=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion { package = clippy-sarif; };
     updateScript = nix-update-script { };
   };