From 269c68aa2006755fb44d51cb39872d85c84b5026 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 25 Nov 2025 09:22:53 +0100 Subject: [PATCH 1/3] python3Packages.ds-server-lib: init at 6.0.0b3 --- .../python-modules/ds-server-lib/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/ds-server-lib/default.nix diff --git a/pkgs/development/python-modules/ds-server-lib/default.nix b/pkgs/development/python-modules/ds-server-lib/default.nix new file mode 100644 index 000000000000..04cf758c3630 --- /dev/null +++ b/pkgs/development/python-modules/ds-server-lib/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + dep-scan, + + # build + setuptools, + + # deps + appthreat-vulnerability-db, + custom-json-diff, + ds-analysis-lib, + quart, + rich, + + # test + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "ds-server-lib"; + inherit (dep-scan) version src; + pyproject = true; + + sourceRoot = "${src.name}/packages/server-lib"; + + build-system = [ + setuptools + ]; + + dependencies = [ + appthreat-vulnerability-db + custom-json-diff + ds-analysis-lib + quart + rich + ]; + + pythonImportsCheck = [ "server_lib" ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + pytest-cov-stub + pytest-asyncio + ]; + + meta = { + description = "Server library for owasp depscan"; + inherit (dep-scan.meta) + homepage + license + maintainers + teams + ; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52102aced862..e5a68cc9e3ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4542,6 +4542,8 @@ self: super: with self; { ds-reporting-lib = callPackage ../development/python-modules/ds-reporting-lib { }; + ds-server-lib = callPackage ../development/python-modules/ds-server-lib { }; + ds-store = callPackage ../development/python-modules/ds-store { }; ds-xbom-lib = callPackage ../development/python-modules/ds-xbom-lib { }; From e700f7522ce92c70f0606410ced6a43b7752bcfc Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 25 Nov 2025 09:23:18 +0100 Subject: [PATCH 2/3] dep-scan: 6.0.0b3 -> 6.0.0b5 --- pkgs/by-name/de/dep-scan/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 9defda91b7f5..e03491fea2f0 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -3,21 +3,20 @@ fetchFromGitHub, python3Packages, writableTmpDirAsHomeHook, - makeWrapper, cdxgen, nixosTests, }: python3Packages.buildPythonApplication rec { pname = "dep-scan"; - version = "6.0.0b3"; + version = "6.0.0b5"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; tag = "v${version}"; - hash = "sha256-GdrFsECcBZ2J47ojM33flqOtrY3avchGpsZk6pt8Aks="; + hash = "sha256-D+ILgWifIV27CG4aJUHeI6F7ASomS0iyAG0beIIzJNk="; }; build-system = with python3Packages; [ setuptools ]; @@ -29,6 +28,7 @@ python3Packages.buildPythonApplication rec { defusedxml ds-analysis-lib ds-reporting-lib + ds-server-lib ds-xbom-lib jinja2 oras @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ httpretty + pytest-asyncio pytest-cov-stub pytestCheckHook writableTmpDirAsHomeHook From ecf8e65d8457dfe17e2d41f81b5f653ac4d14ef6 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 25 Nov 2025 09:24:58 +0100 Subject: [PATCH 3/3] python3Packages.ds-{reporting,analysis,xbom}: build from dep-scan source, which also means they're updated from `6.0.0b3` to `6.0.0b5`. --- .../ds-analysis-lib/default.nix | 37 +++++++++---------- .../ds-reporting-lib/default.nix | 27 +++++++------- .../python-modules/ds-xbom-lib/default.nix | 27 +++++++------- 3 files changed, 46 insertions(+), 45 deletions(-) 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 + ; }; }