From 19c42b883f668d17ac8670c19707c6dd9e7bd28b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 16 May 2022 19:24:52 +0100 Subject: [PATCH 1/2] trivy: 0.27.1 -> 0.28.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 66b99c79453..f74c430a146 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eyvxBpGuOXicuqINYhl4/fUgN/j+Awe5vgMaMxtAMr0="; + sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8="; }; - vendorSha256 = "sha256-91tq4ipi3JobVgffASn8KRd3JQkgbOx/7PsjKq5vJdE="; + vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0="; excludedPackages = "misc"; From 73714678f13f0e8e5cf043d51afcf23e5c18943b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 17 May 2022 17:53:10 +0100 Subject: [PATCH 2/2] trying to fix darwin build --- pkgs/tools/admin/trivy/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f74c430a146..f769850224b 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -1,6 +1,9 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub +, CoreFoundation +, Security }: buildGoModule rec { @@ -13,11 +16,13 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8="; }; - vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0="; excludedPackages = "misc"; + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) + [ CoreFoundation Security ]; + ldflags = [ "-s" "-w" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03b807a0686..c8964e7793c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5471,6 +5471,7 @@ with pkgs; trivy = callPackage ../tools/admin/trivy { buildGoModule = buildGo118Module; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; trompeloeil = callPackage ../development/libraries/trompeloeil { };