From 96006098ef13da65f7f47ac44ed774bc5b0854e5 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Oct 2020 15:24:22 +0100 Subject: [PATCH 1/2] trivy: only build cmd/trivy Was also building misc/eol which is unneeded. --- pkgs/tools/admin/trivy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 80920c56bbe..7cef5eaf60c 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "1jmmx83c0qbqyppx0w8d9djz2j2i7dgibq9lb3vhdz78wc40zywy"; + subPackages = [ "cmd/trivy" ]; + buildFlagsArray = [ "-ldflags=" "-s" From c0c7741f8e8c6e3e4a337a40c0480c3d746fd74e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Oct 2020 15:25:34 +0100 Subject: [PATCH 2/2] trivy: 0.11.0 -> 0.12.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 7cef5eaf60c..7af02e567c3 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0mqzs0yjlqpsn2540kgl4gn77qjg3kfls1zwgjfxy66lazic3f1h"; + sha256 = "0vgir7sc14lb0wqwr786sq77pda6rw7svwr6hxklckkn20d9z7z0"; }; - vendorSha256 = "1jmmx83c0qbqyppx0w8d9djz2j2i7dgibq9lb3vhdz78wc40zywy"; + vendorSha256 = "0k6n73im14gaayl8rday2fhhizsv3klza146gx0dqm0694rqph0r"; subPackages = [ "cmd/trivy" ];