From a7cfc9afdf51ebcb571f463847c0ac8cae2cd0e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 00:50:56 +0100 Subject: [PATCH 1/2] python310Packages.ospd: add changelog to meta --- pkgs/development/python-modules/ospd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index 4525d455757c..a9e6ba10d981 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; + rev = "refs/tags/v${version}"; + hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for vulnerability scanners which support OSP"; homepage = "https://github.com/greenbone/ospd"; + changelog = "https://github.com/greenbone/ospd/releases/tag/v${version}"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ fab ]; }; From 23dec20de6262748af0492e26cdbe86a8dcf7840 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 00:56:48 +0100 Subject: [PATCH 2/2] ospd-openvas: init at 22.4.6 https://github.com/greenbone/ospd-openvas --- pkgs/tools/security/ospd-openvas/default.nix | 55 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/tools/security/ospd-openvas/default.nix diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix new file mode 100644 index 000000000000..1a95f099b236 --- /dev/null +++ b/pkgs/tools/security/ospd-openvas/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ospd-openvas"; + version = "22.4.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "ospd-openvas"; + rev = "refs/tags/v${version}"; + hash = "sha256-tgLOO4L/P6USiPf72uZse36r8HhXJnUUT8PfZH4E/jg="; + }; + + pythonRelaxDeps = [ + "packaging" + "python-gnupg" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + defusedxml + deprecated + lxml + packaging + paho-mqtt + psutil + python-gnupg + redis + sentry-sdk + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ospd_openvas" + ]; + + meta = with lib; { + description = "OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"; + homepage = "https://github.com/greenbone/ospd-openvas"; + changelog = "https://github.com/greenbone/ospd-openvas/blob/${version}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..ab6980e56ac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5405,6 +5405,8 @@ with pkgs; ossutil = callPackage ../tools/admin/ossutil {}; + ospd-openvas = callPackage ../tools/security/ospd-openvas {}; + osv-detector = callPackage ../tools/security/osv-detector {}; osv-scanner = callPackage ../tools/security/osv-scanner {};