From a6169e2d63ce2017c9d0b6b80ad285e906405bd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Aug 2023 13:29:40 +0200 Subject: [PATCH] trivy: add myself as maintainer --- pkgs/tools/admin/trivy/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index e4683fae20b0..473cdb977bc1 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -10,11 +10,13 @@ buildGoModule rec { src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-zSrXfSG9GXReJ+XRx7FTBZovSvNq725zzWMje3maTx4="; + rev = "refs/tags/v${version}"; + hash = "sha256-zSrXfSG9GXReJ+XRx7FTBZovSvNq725zzWMje3maTx4="; }; + # hash missmatch on across linux and darwin proxyVendor = true; + vendorHash = "sha256-CEr8UvQtKZo5jahLeLx3RYT592i6SwwNLRA4IRD0mYU="; subPackages = [ "cmd/trivy" ]; @@ -22,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X=main.version=v${version}" ]; # Tests require network access @@ -49,6 +51,6 @@ buildGoModule rec { application dependencies (Bundler, Composer, npm, yarn, etc.). ''; license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + maintainers = with maintainers; [ fab jk ]; }; }