From bc0f09212c8c9f067a66c7e16a94beae1cb9d2ba Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sun, 28 Jul 2024 13:30:45 +0200
Subject: [PATCH 1/3] python312Packages.lib4sbom: 0.7.1 -> 0.7.2

---
 pkgs/development/python-modules/lib4sbom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix
index e444e10bbe00..6cdbefeb65da 100644
--- a/pkgs/development/python-modules/lib4sbom/default.nix
+++ b/pkgs/development/python-modules/lib4sbom/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.7.1";
+  version = "0.7.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4=";
+    hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY=";
   };
 
   dependencies = [

From e7182ec60cfd0dbca8f6c78d4f10d7cfbed01db6 Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sun, 28 Jul 2024 13:32:05 +0200
Subject: [PATCH 2/3] cve-bin-tool: fix dependencies

* requests is no longer transitively provided
* toml is not required for python 3.11+
---
 pkgs/tools/security/cve-bin-tool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index b269cd362f2b..e2b36b4edf96 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -19,10 +19,10 @@
 , pytestCheckHook
 , python-gnupg
 , pyyaml
+, requests
 , rich
 , rpmfile
 , setuptools
-, toml
 , xmlschema
 , zstandard
 , reportlab
@@ -64,10 +64,10 @@ buildPythonApplication rec {
     plotly
     python-gnupg
     pyyaml
+    requests
     rich
     rpmfile
     setuptools
-    toml
     xmlschema
     zstandard
   ];

From c4b2816ead7d64be922a2418638a9fef35f9f2a2 Mon Sep 17 00:00:00 2001
From: tea <tea@teatwig.net>
Date: Sun, 28 Jul 2024 13:52:09 +0200
Subject: [PATCH 3/3] cve-bin-tool: format with `nixfmt-rfc-style`

---
 pkgs/tools/security/cve-bin-tool/default.nix | 77 +++++++++-----------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index e2b36b4edf96..65d38a29d1f6 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -1,34 +1,35 @@
-{ lib
-, buildPythonApplication
-, fetchFromGitHub
+{
+  lib,
+  buildPythonApplication,
+  fetchFromGitHub,
   # aiohttp[speedups]
-, aiodns
-, aiohttp
-, beautifulsoup4
-, brotlipy
-, cvss
-, distro
-, filetype
-, google-cloud-sdk
-, jinja2
-, jsonschema
-, lib4sbom
-, packageurl-python
-, packaging
-, plotly
-, pytestCheckHook
-, python-gnupg
-, pyyaml
-, requests
-, rich
-, rpmfile
-, setuptools
-, xmlschema
-, zstandard
-, reportlab
-, pip
-, testers
-, cve-bin-tool
+  aiodns,
+  aiohttp,
+  beautifulsoup4,
+  brotlipy,
+  cvss,
+  distro,
+  filetype,
+  google-cloud-sdk,
+  jinja2,
+  jsonschema,
+  lib4sbom,
+  packageurl-python,
+  packaging,
+  plotly,
+  pytestCheckHook,
+  python-gnupg,
+  pyyaml,
+  requests,
+  rich,
+  rpmfile,
+  setuptools,
+  xmlschema,
+  zstandard,
+  reportlab,
+  pip,
+  testers,
+  cve-bin-tool,
 }:
 
 buildPythonApplication rec {
@@ -73,22 +74,14 @@ buildPythonApplication rec {
   ];
 
   optional-dependencies = {
-    pdf = [
-      reportlab
-    ];
+    pdf = [ reportlab ];
   };
 
-  propagatedBuildInputs = [
-    pip
-  ];
+  propagatedBuildInputs = [ pip ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  pythonImportsCheck = [
-    "cve_bin_tool"
-  ];
+  pythonImportsCheck = [ "cve_bin_tool" ];
 
   passthru.tests.version = testers.testVersion { package = cve-bin-tool; };