From 89eb6cff8ea168f4c74582850be505308a2e322f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 8 Feb 2026 21:27:37 +0100
Subject: [PATCH 1/2] trivy: migrate to finalAttrs

---
 pkgs/by-name/tr/trivy/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index 4ed0f45e95c9..78f235cbc139 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -8,14 +8,14 @@
   testers,
   trivy,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "trivy";
   version = "0.69.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "trivy";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-auCbZmVr7LzYrw+IOpXBZPUs2YmcPAzr5fo12vSyHeM=";
   };
 
@@ -29,7 +29,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}"
+    "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${finalAttrs.version}"
   ];
 
   env.GOEXPERIMENT = "jsonv2";
@@ -51,13 +51,13 @@ buildGoModule rec {
   passthru.tests.version = testers.testVersion {
     package = trivy;
     command = "trivy --version";
-    version = "Version: ${version}";
+    version = "Version: ${finalAttrs.version}";
   };
 
   meta = {
     description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI";
     homepage = "https://github.com/aquasecurity/trivy";
-    changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}";
+    changelog = "https://github.com/aquasecurity/trivy/releases/tag/${finalAttrs.src.tag}";
     longDescription = ''
       Trivy is a simple and comprehensive vulnerability scanner for containers
       and other artifacts. A software vulnerability is a glitch, flaw, or
@@ -72,4 +72,4 @@ buildGoModule rec {
       jk
     ];
   };
-}
+})

From b765d82e7ecf8e983df88604f0a9fc6ad1bf84fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 8 Feb 2026 21:32:16 +0100
Subject: [PATCH 2/2] trivy: migrate to versionCheckHook

---
 pkgs/by-name/tr/trivy/package.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index 78f235cbc139..7946b892bab2 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -5,9 +5,9 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  testers,
-  trivy,
+  versionCheckHook,
 }:
+
 buildGoModule (finalAttrs: {
   pname = "trivy";
   version = "0.69.0";
@@ -36,6 +36,8 @@ buildGoModule (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   # Tests require network access
   doCheck = false;
 
@@ -48,12 +50,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
 
-  passthru.tests.version = testers.testVersion {
-    package = trivy;
-    command = "trivy --version";
-    version = "Version: ${finalAttrs.version}";
-  };
-
   meta = {
     description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI";
     homepage = "https://github.com/aquasecurity/trivy";