From f88e10fe5999f9d8fb369f5de7167034ea32d144 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 18 Aug 2023 09:48:34 +1000 Subject: [PATCH 1/3] maintainers: add kashw2 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9140acf8572e..efa748549395 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8751,6 +8751,12 @@ githubId = 1927188; name = "karolchmist"; }; + kashw2 = { + email = "supra4keanu@hotmail.com"; + github = "kashw2"; + githubId = 15855440; + name = "Keanu Ashwell"; + }; katexochen = { github = "katexochen"; githubId = 49727155; From a8983633d95d66aba1435c67f1f9fb5acfe6e264 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 18 Aug 2023 09:49:22 +1000 Subject: [PATCH 2/3] grype: 0.65.1 -> 0.65.2 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index cb21ecb119c7..404148d298e0 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.65.1"; + version = "0.65.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hmjg1W1E1pdrHxPA7qbEJP0R1mEiV0P54+y+RXxKH4c="; + hash = "sha256-ST+fJfkViQubCWVMY2BbOgE7tOpXjCX1ATLBmLmvMiY="; # 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-VxsXhNOFj7Iwq7Sa2J8ADcfLt9Bz+D0RHwEGawveryU="; + vendorHash = "sha256-HaqJ1Pc0A29D0HielGhP6uxkVccB8JyUrm0Q5nW8teU="; nativeBuildInputs = [ installShellFiles From 6d72a90de9d5b2b55dafb15a2d5cacc35dc2686a Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 18 Aug 2023 09:49:44 +1000 Subject: [PATCH 3/3] grype: added kashw2 as maintainer --- pkgs/tools/security/grype/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 404148d298e0..b1668c1274aa 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -104,6 +104,6 @@ buildGoModule rec { container image or filesystem to find known vulnerabilities. ''; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab jk ]; + maintainers = with maintainers; [ fab jk kashw2 ]; }; }