From f1c38c7b9af596c706887d86c48cb1a017afc92d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 12 Nov 2023 22:59:01 -0500
Subject: clippy-sarif: improve build/test flags, add passthru, improve meta

---
 pkgs/clippy-sarif/default.nix | 21 +++++++++++++++++----
 pkgs/default.nix              |  2 ++
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/clippy-sarif/default.nix b/pkgs/clippy-sarif/default.nix
index d850862..ebbb16f 100644
--- a/pkgs/clippy-sarif/default.nix
+++ b/pkgs/clippy-sarif/default.nix
@@ -3,6 +3,9 @@
   fetchFromGitHub,
   rustPlatform,
   clippy,
+  clippy-sarif,
+  testers,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
@@ -16,13 +19,23 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "sha256-F3NrqkqLdvMRIuozCMMqwlrrf5QrnmcEhy4TGSzPhiU=";
-  cargoBuildFlags = ["--package ${pname}"];
+  cargoBuildFlags = ["--package" pname];
+  cargoTestFlags = cargoBuildFlags;
 
-  doCheck = false;
+  passthru = {
+    tests.version = testers.testVersion {
+      package = clippy-sarif;
+    };
+
+    updateScript = nix-update-script {
+      extraArgs = ["--regex" "'${pname}-(.*)'"];
+    };
+  };
 
   meta = with lib; {
-    description = "CLI tool to convert clippy diagnostics into SARIF";
-    homepage = "https://github.com/psastras/sarif-rs";
+    mainProgram = "clippy-sarif";
+    description = "A CLI tool to convert clippy diagnostics into SARIF";
+    homepage = "https://psastras.github.io/sarif-rs";
     maintainers = with maintainers; [getchoo];
     license = licenses.mit;
     inherit (clippy.meta) platforms;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 7ff9579..b66d5be 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -19,6 +19,8 @@ with prev; let
 in
   imported
   // {
+    clippy-sarif = callPackage ./clippy-sarif {inherit (final) clippy-sarif;};
+
     klassy = libsForQt5.callPackage ./klassy {};
 
     modrinth-app-unwrapped = callPackage ./modrinth-app {
-- 
cgit v1.2.3