diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-09 01:13:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-09 01:13:27 +0100 |
commit | 12a0a9da151da0750988c8dd489c5794d7cc7c83 (patch) | |
tree | af839e39dab30600aa61ac6ff380068752cd6ea9 | |
parent | e7fabe8d3f4a643bda9e6e247299b21ff9ee8359 (diff) | |
parent | 77b73675647ac03bff94068ddfa1136dbb614a67 (diff) |
Merge pull request #271395 from kashw2/grype
grype: 0.69.1 -> 0.73.4
-rw-r--r-- | pkgs/tools/security/grype/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index ff996562572b3..db955a1a20866 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.69.1"; + version = "0.73.4"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AXw2mtN4FC6EKWN8dObrU04+WSHDWLY19FSWqQlkq/Q="; + hash = "sha256-cYhgLMKj8fo49zr+NC7SARiyybCnqXf+DgB+6IkwkAw="; # 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-iitWThvWVfeJMLcJLgmFnVguFVF4DejObZPZ3qB5cY0="; + vendorHash = "sha256-Zx8gJZVkobKjrGysrqYd6Hv2bGqEgOQ+EGSKDvOM33M="; nativeBuildInputs = [ installShellFiles @@ -73,6 +73,8 @@ buildGoModule rec { --replace "TestCmd" "SkipCmd" substituteInPlace grype/pkg/provider_test.go \ --replace "TestSyftLocationExcludes" "SkipSyftLocationExcludes" + substituteInPlace test/cli/cmd_test.go \ + --replace "Test_descriptorNameAndVersionSet" "Skip_descriptorNameAndVersionSet" # remove tests that depend on git substituteInPlace test/cli/db_validations_test.go \ --replace "TestDBValidations" "SkipDBValidations" @@ -83,6 +85,8 @@ buildGoModule rec { --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" substituteInPlace test/cli/subprocess_test.go \ --replace "TestSubprocessStdin" "SkipSubprocessStdin" + substituteInPlace grype/internal/packagemetadata/names_test.go \ + --replace "TestAllNames" "SkipAllNames" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go |