From 4fc2a318a70a2aae544d5e65a6ce65616a3e468c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 22:55:39 +0200 Subject: [PATCH 1/3] notus-scanner: 22.6.2 -> 22.6.3 Diff: https://github.com/greenbone/notus-scanner/compare/refs/tags/v22.6.2...v22.6.3 Changelog: https://github.com/greenbone/notus-scanner/releases/tag/v22.6.3 --- pkgs/development/python-modules/notus-scanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 51a41bedc920..f93093089ea2 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notus-scanner"; - version = "22.6.2"; + version = "22.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-V70cFSfQ9SuLhCSUa8DuYA7qaabwiK9IbIkYcQMgVUk="; + hash = "sha256-LYYof/s0OvXMbEH7jyFIymUVrWYUd/6lychIzfPlylc="; }; pythonRelaxDeps = [ From d2213b78e87d74d0972048a34c28dab5362a1455 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 22:56:46 +0200 Subject: [PATCH 2/3] notus-scanner: refactor --- .../development/python-modules/notus-scanner/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index f93093089ea2..5abbdc0d3826 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "notus-scanner"; version = "22.6.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "notus-scanner"; rev = "refs/tags/v${version}"; hash = "sha256-LYYof/s0OvXMbEH7jyFIymUVrWYUd/6lychIzfPlylc="; }; @@ -31,8 +31,11 @@ buildPythonPackage rec { "python-gnupg" ]; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; From f2059c619d5ea8b0d3a4d40319ce59a45bff751b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 22:57:18 +0200 Subject: [PATCH 3/3] notus-scanner: format with nixfmt --- .../python-modules/notus-scanner/default.nix | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 5abbdc0d3826..9d402201dcce 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, paho-mqtt -, poetry-core -, psutil -, pytestCheckHook -, python-gnupg -, pythonOlder -, pythonRelaxDepsHook -, sentry-sdk -, tomli +{ + lib, + buildPythonPackage, + fetchFromGitHub, + paho-mqtt, + poetry-core, + psutil, + pytestCheckHook, + python-gnupg, + pythonOlder, + pythonRelaxDepsHook, + sentry-sdk, + tomli, }: buildPythonPackage rec { @@ -31,30 +32,20 @@ buildPythonPackage rec { "python-gnupg" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ paho-mqtt psutil python-gnupg sentry-sdk - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "notus.scanner" - ]; + pythonImportsCheck = [ "notus.scanner" ]; meta = with lib; { description = "Helper to create results from local security checks";