Merge pull request #309019 from teatwig/cve-bin-tool (b63c3d4f) · Commits · nix / nixpkgs

pkgs/by-name/li/lib4sbom/package.nix→pkgs/development/python-modules/lib4sbom/default.nix

+8 −4

Original line number	Diff line number	Diff line
		{ lib
		, python3Packages
		, buildPythonPackage
		, fetchFromGitHub
		, pyyaml
		, semantic-version
		, defusedxml
		, pytestCheckHook
		}:

		python3Packages.buildPythonPackage rec {
		buildPythonPackage rec {
		pname = "lib4sbom";
		version = "0.7.1";
		format = "setuptools";
		@@ -15,13 +19,13 @@ python3Packages.buildPythonPackage rec {
		hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4=";
		};

		propagatedBuildInputs = with python3Packages; [
		dependencies = [
		pyyaml
		semantic-version
		defusedxml
		];

		nativeCheckInputs = with python3Packages; [
		nativeCheckInputs = [
		pytestCheckHook
		];

+42 −46

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonApplication
		, fetchFromGitHub
		# aiohttp[speedups]
		, aiodns
		, aiohttp
		, beautifulsoup4
		, brotlipy
		, cvss
		, distro
		, filetype
		, google-cloud-sdk
		, jinja2
		, jsonschema
		, lib4sbom
		, packageurl-python
		, python-gnupg
		, packaging
		, plotly
		, beautifulsoup4
		, pytestCheckHook
		, python-gnupg
		, pyyaml
		, isort
		, py
		, jinja2
		, rpmfile
		, reportlab
		, zstandard
		, rich
		, aiohttp
		, rpmfile
		, setuptools
		, toml
		, distro
		# aiohttp[speedups]
		, aiodns
		, brotlipy
		, faust-cchardet
		, pillow
		, pytestCheckHook
		, xmlschema
		, setuptools
		, packaging
		, cvss
		, google-cloud-sdk
		, zstandard
		, reportlab
		, pip
		, testers
		, cve-bin-tool
		@@ -50,45 +46,45 @@ buildPythonApplication rec {
		# Wants to open a sqlite database, access the internet, etc
		doCheck = false;

		propagatedNativeBuildInputs = [
		pip
		];

		propagatedBuildInputs = [
		google-cloud-sdk
		dependencies = [
		# aiohttp[speedups]
		aiodns
		aiohttp
		beautifulsoup4
		brotlipy
		cvss
		distro
		filetype
		google-cloud-sdk # gsutil
		jinja2
		jsonschema
		lib4sbom
		packageurl-python
		python-gnupg
		packaging
		plotly
		beautifulsoup4
		python-gnupg
		pyyaml
		isort
		py
		jinja2
		rpmfile
		reportlab
		zstandard
		rich
		aiohttp
		toml
		distro
		# aiohttp[speedups]
		aiodns
		brotlipy
		faust-cchardet
		# needed by brotlipy
		pillow
		rpmfile
		setuptools
		toml
		xmlschema
		cvss
		packaging
		zstandard
		];

		optional-dependencies = {
		pdf = [
		reportlab
		];
		};

		propagatedBuildInputs = [
		pip
		];

		nativeCheckInputs = [
		pytestCheckHook
		];
		] ++ lib.flatten (lib.attrValues optional-dependencies);

		pythonImportsCheck = [
		"cve_bin_tool"

+2 −0

Original line number	Diff line number	Diff line
		@@ -6564,6 +6564,8 @@ self: super: with self; {

		pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };

		lib4sbom = callPackage ../development/python-modules/lib4sbom { };

		libais = callPackage ../development/python-modules/libais { };

		libarchive-c = callPackage ../development/python-modules/libarchive-c {