diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 67f88409d99e..74aa2530fbd0 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -5,26 +5,29 @@ python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.2.12"; + version = "5.2.14"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-UoppQAokiWBcgTcSmwfoqrDKt/QHYd2NBR3CpNOqI4k="; + hash = "sha256-G8i/tGEDgjPnIP04nrbx4HseiaU6N1GJGSg78yhaqII="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov-append --cov-report term --cov depscan" "" + --replace-fail " --cov-append --cov-report term --cov depscan" "" + # Already fixed by upstream + substituteInPlace pyproject.toml \ + --replace-fail "==5.6.4" ">=5.6.4" ''; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ appthreat-vulnerability-db cvss defusedxml diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index a62c3dc8251d..22ef8222b04b 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,21 +17,21 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.4"; + version = "5.6.6"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-Uq0DXrNQRVhQaPXXGNjbnPhOYoPpa8H3WuDdotCKS8c="; + hash = "sha256-wVl2C1AG9LbSh/p95fstJyJr6JnhZFIhNvq8mhpg13Q="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-warn " --cov-report=term-missing --no-cov-on-fail --cov vdb" "" + --replace-fail " --cov-report=term-missing --no-cov-on-fail --cov vdb" "" ''; pythonRelaxDeps = [ @@ -39,12 +39,15 @@ buildPythonPackage rec { "semver" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ appdirs cvss httpx @@ -75,10 +78,10 @@ buildPythonPackage rec { meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; - mainProgram = "vdb"; homepage = "https://github.com/appthreat/vulnerability-db"; changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "vdb"; }; }