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 = [ diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index b269cd362f2b..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 -, rich -, rpmfile -, setuptools -, toml -, 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 { @@ -64,31 +65,23 @@ buildPythonApplication rec { plotly python-gnupg pyyaml + requests rich rpmfile setuptools - toml xmlschema zstandard ]; 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; };