From 6ae53e4cca6ceb603d108a6b7fcaf52960d972bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2023 12:24:33 +0100 Subject: [PATCH] grype: 0.54.0 -> 0.55.0 Diff: https://github.com/anchore/grype.git/compare/v0.54.0...v0.55.0 Changelog: https://github.com/anchore/grype/releases/tag/v0.55.0 --- pkgs/tools/security/grype/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index f225c0e0383..862cde157a2 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-/c7WP9m+8AULjmchpZmcTcnXG0K8gGxjseXS/QJXj+k="; + hash = "sha256-Y72h1YCf42RinGw2mKZb8Bz8ip+LUW377xwJht67Q1s="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-+WMaQaBf4uMCCQTyycHlkYeKbRtk6oAlqbHBYBqh64M="; + vendorHash = "sha256-xzBOZyzwxVFTFgtmu7DLBpdkV9bwzJ9RETkdyV2HtQo="; nativeBuildInputs = [ installShellFiles @@ -70,14 +70,6 @@ buildGoModule rec { --replace "TestCmd" "SkipCmd" substituteInPlace grype/pkg/provider_test.go \ --replace "TestSyftLocationExcludes" "SkipSyftLocationExcludes" - substituteInPlace grype/presenter/cyclonedx/presenter_test.go \ - --replace "TestCycloneDxPresenterImage" "SkipCycloneDxPresenterImage" - substituteInPlace grype/presenter/cyclonedxvex/presenter_test.go \ - --replace "TestCycloneDxPresenterImage" "SkipCycloneDxPresenterImage" - substituteInPlace grype/presenter/sarif/presenter_test.go \ - --replace "Test_imageToSarifReport" "Skip_imageToSarifReport" \ - --replace "TestSarifPresenterImage" "SkipSarifPresenterImage" - # remove tests that depend on git substituteInPlace test/cli/db_validations_test.go \ --replace "TestDBValidations" "SkipDBValidations"