diff --git a/pkgs/development/python-modules/ds-analysis-lib/default.nix b/pkgs/development/python-modules/ds-analysis-lib/default.nix index 66df91b9d28e..c9b9442bca1c 100644 --- a/pkgs/development/python-modules/ds-analysis-lib/default.nix +++ b/pkgs/development/python-modules/ds-analysis-lib/default.nix @@ -1,13 +1,19 @@ { lib, buildPythonPackage, - fetchPypi, + dep-scan, + + # build setuptools, + + # deps appthreat-vulnerability-db, custom-json-diff, cvss, rich, toml, + + # test writableTmpDirAsHomeHook, pytestCheckHook, pytest-cov-stub, @@ -15,17 +21,14 @@ buildPythonPackage rec { pname = "ds-analysis-lib"; - version = "6.0.0b3"; + inherit (dep-scan) version src; pyproject = true; - # pypi because library is embedded into another project's repo - src = fetchPypi { - inherit version; - pname = "ds_analysis_lib"; - hash = "sha256-XZZzAxQJk65Xoq6z2OadlHUN0REYTjKmSvwz17tvVqc="; - }; + sourceRoot = "${src.name}/packages/analysis-lib"; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ appthreat-vulnerability-db @@ -37,12 +40,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "analysis_lib" ]; - # relies on data files that pypi doesn't include - disabledTestPaths = [ - "tests/test_analysis.py" - "tests/test_csaf.py" - ]; - nativeCheckInputs = [ writableTmpDirAsHomeHook pytestCheckHook @@ -51,9 +48,11 @@ buildPythonPackage rec { meta = { description = "Analysis library for owasp depscan"; - homepage = "https://pypi.org/project/ds-analysis-lib/"; - maintainers = with lib.maintainers; [ ethancedwards8 ]; - teams = [ lib.teams.ngi ]; - license = with lib.licenses; [ mit ]; + inherit (dep-scan.meta) + homepage + license + maintainers + teams + ; }; } diff --git a/pkgs/development/python-modules/ds-reporting-lib/default.nix b/pkgs/development/python-modules/ds-reporting-lib/default.nix index 45477ea9dd8c..61c75c41bc80 100644 --- a/pkgs/development/python-modules/ds-reporting-lib/default.nix +++ b/pkgs/development/python-modules/ds-reporting-lib/default.nix @@ -1,23 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + dep-scan, + + # build setuptools, }: buildPythonPackage rec { pname = "ds-reporting-lib"; - version = "6.0.0b5"; + inherit (dep-scan) version src; pyproject = true; - # pypi because library is embedded into another project's repo - src = fetchPypi { - inherit version; - pname = "ds_reporting_lib"; - hash = "sha256-hxjNRUOorjjbuJkFpscTN3VB5NJywLZ6Ux+dB1Q1FyU="; - }; + sourceRoot = "${src.name}/packages/reporting-lib"; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; pythonImportsCheck = [ "reporting_lib" ]; @@ -26,9 +25,11 @@ buildPythonPackage rec { meta = { description = "Reporting library for owasp depscan"; - homepage = "https://pypi.org/project/ds-reporting-lib/"; - maintainers = with lib.maintainers; [ ethancedwards8 ]; - teams = [ lib.teams.ngi ]; - license = with lib.licenses; [ mit ]; + inherit (dep-scan.meta) + homepage + license + maintainers + teams + ; }; } diff --git a/pkgs/development/python-modules/ds-xbom-lib/default.nix b/pkgs/development/python-modules/ds-xbom-lib/default.nix index c903f2e0a20f..96aa18f76817 100644 --- a/pkgs/development/python-modules/ds-xbom-lib/default.nix +++ b/pkgs/development/python-modules/ds-xbom-lib/default.nix @@ -1,23 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + dep-scan, + + # build setuptools, }: buildPythonPackage rec { pname = "ds-xbom-lib"; - version = "6.0.0b5"; + inherit (dep-scan) version src; pyproject = true; - # pypi because library is embedded into another project's repo - src = fetchPypi { - inherit version; - pname = "ds_xbom_lib"; - hash = "sha256-IAqKqwetoQu1Fwb2tr4UjA3WztIIq5so/WE++Ov0VTw="; - }; + sourceRoot = "${src.name}/packages/xbom-lib"; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; pythonImportsCheck = [ "xbom_lib" ]; @@ -26,9 +25,11 @@ buildPythonPackage rec { meta = { description = "xBOM library for owasp depscan"; - homepage = "https://pypi.org/project/ds-xbom-lib/"; - maintainers = with lib.maintainers; [ ethancedwards8 ]; - teams = [ lib.teams.ngi ]; - license = with lib.licenses; [ mit ]; + inherit (dep-scan.meta) + homepage + license + maintainers + teams + ; }; }