From ea91fdc217737a2484c07ef5efd2fd0b18666755 Mon Sep 17 00:00:00 2001
From: QuincePie <flaky@quincepie.dev>
Date: Sun, 1 Sep 2024 19:23:15 -0500
Subject: [PATCH 1/3] cdxgen: 10.8.1 -> 10.9.6

---
 pkgs/tools/security/cdxgen/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix
index c494598c10d2..948cbc9dd7cf 100644
--- a/pkgs/tools/security/cdxgen/default.nix
+++ b/pkgs/tools/security/cdxgen/default.nix
@@ -1,23 +1,24 @@
-{ fetchFromGitHub
-, lib
-, makeWrapper
-, nodejs
-, node-gyp
-, pnpm_9
-, python3
-, stdenv
-, xcbuild
+{
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  nodejs,
+  node-gyp,
+  pnpm_9,
+  python3,
+  stdenv,
+  xcbuild,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdxgen";
-  version = "10.8.1";
+  version = "10.9.6";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cdxgen";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PFvSHuIaHaGfKI5s7DOW1adSKpnURaQtk5lAO9lr1OM=";
+    hash = "sha256-WgY0soHwedYbQNDvDIqtaxMSzVcaOVV2/22wOXU2nbA=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-IO7hn5xHdlQ+uyH8RWc7ZnnthXydCnMSde22YYMWOoc=";
+    hash = "sha256-IgmTYmCmZ65Da5zL6Tx7P4bt2o+YhX0UvU0DEONmr7w=";
   };
 
   buildPhase = ''
@@ -56,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-
   meta = with lib; {
     description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images";
     mainProgram = "cdxgen";

From 2d66d181739027fd171a4c11f37c8f4653fe2505 Mon Sep 17 00:00:00 2001
From: QuincePie <flaky@quincepie.dev>
Date: Sun, 1 Sep 2024 19:44:08 -0500
Subject: [PATCH 2/3] maintainers: add quincepie

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 39c7ff2d4ae4..c3021d52cf67 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17011,6 +17011,12 @@
     githubId = 1332289;
     name = "Quentin Machu";
   };
+  quincepie = {
+    email = "flaky@quincepie.dev";
+    github = "Quince-Pie";
+    githubId = 127546159;
+    name = "QuincePie";
+  };
   quinn-dougherty = {
     email = "quinnd@riseup.net";
     github = "quinn-dougherty";

From 107a78f1c07f2abfabc72564561c9a386da2f43d Mon Sep 17 00:00:00 2001
From: QuincePie <flaky@quincepie.dev>
Date: Sun, 1 Sep 2024 19:49:06 -0500
Subject: [PATCH 3/3] cdxgen: add quincepie to maintainers

---
 pkgs/tools/security/cdxgen/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix
index 948cbc9dd7cf..3a6c14ea5f1c 100644
--- a/pkgs/tools/security/cdxgen/default.nix
+++ b/pkgs/tools/security/cdxgen/default.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cdxgen";
     homepage = "https://github.com/CycloneDX/cdxgen";
     license = licenses.asl20;
-    maintainers = with maintainers; [ dit7ya ];
+    maintainers = with maintainers; [
+      dit7ya
+      quincepie
+    ];
   };
 })