From c73892df3f62df19a22c06d5b477cbbed233e1ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Sep 2024 21:27:44 +0200 Subject: [PATCH] grype: 0.80.0 -> 0.80.2 Diff: anchore/grype@refs/tags/v0.80.0...v0.80.2 Changelog: https://github.com/anchore/grype/releases/tag/v0.80.2 --- pkgs/by-name/gr/grype/package.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 6d5809e30381..b8a19586772e 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.80.0"; + version = "0.80.2"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-28/BR4oKOW7CK4gv4ESVZsvsyd6gKwW2XPvA1vU8/Wc="; + hash = "sha256-Q3KixUjyiPMLxoBIafyAUOeYRK6fhqgc150bLdwEk7M="; # 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; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-F8r332smhjVRxAQ42CvJDmBl2rjxgwUZpoMDhFsBYSA="; + vendorHash = "sha256-PXx5SyuKvxOZwJBspIiL8L7QzXzort6ZU3ZfrE8o700="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d644f76c64..d0b734f12a5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5214,6 +5214,10 @@ with pkgs; grobi = callPackage ../tools/X11/grobi { }; + grype = callPackage ../by-name/gr/grype/package.nix { + buildGoModule = buildGo123Module; + }; + gscan2pdf = callPackage ../applications/graphics/gscan2pdf { # needs this fork of libtiff, because original libtiff # stopped packaging required tools with version 4.6