diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 9a23a9603b95..04bc64532073 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -1,20 +1,21 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, requests , appdirs -, tabulate +, buildPythonPackage +, cvss +, fetchFromGitHub , msgpack , orjson -, semver , packageurl-python -, pythonOlder , pytestCheckHook +, pythonOlder +, requests +, semver +, tabulate }: buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.9"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,17 +24,18 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - sha256 = "sha256-A5mphFJEjOkTG5Rv7tb4hm5eDMSir69gqkbHYn6109I="; + sha256 = "sha256-y+ZOTvWnqSHBpuqquA0IvkWj1B/BmovTUqg1Oddjd5c="; }; propagatedBuildInputs = [ - requests appdirs - tabulate + cvss msgpack orjson - semver packageurl-python + requests + semver + tabulate ]; checkInputs = [ @@ -62,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; 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 ]; }; diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix new file mode 100644 index 000000000000..d48d6be586e5 --- /dev/null +++ b/pkgs/development/python-modules/cvss/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "cvss"; + version = "2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RedHatProductSecurity"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-6S646cvm+UwdpRGOtCuNijWcUxhZD6IG407hNBz+NA4="; + }; + + checkInputs = [ + jsonschema + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cvss" + ]; + + disabledTests = [ + # Tests require additional data + "test_calculator" + "test_cvsslib" + "test_json_ordering" + "test_json_schema_repr" + "test_random" + "test_rh_vector" + "test_simple" + "test_simple_31" + ]; + + meta = with lib; { + description = "Library for CVSS2/3"; + homepage = "https://github.com/RedHatProductSecurity/cvss"; + changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f1471b32658..5dcbcdf5abb3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2082,6 +2082,8 @@ self: super: with self; { cvelib = callPackage ../development/python-modules/cvelib { }; + cvss = callPackage ../development/python-modules/cvss { }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { };