From db3dea9b26a10473943b00e2051792ade361679b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Oct 2021 11:07:38 +0200 Subject: [PATCH] python3Packages.python-gvm: 21.10.0 -> 21.10.0 --- .../python-modules/python-gvm/default.nix | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 27b85215e655..5f3ff50d1a8d 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -1,19 +1,18 @@ { lib , stdenv , buildPythonPackage +, defusedxml , fetchFromGitHub -, fetchpatch +, lxml +, paramiko , poetry-core , pytestCheckHook , pythonOlder -, paramiko -, lxml -, defusedxml }: buildPythonPackage rec { pname = "python-gvm"; - version = "21.6.0"; + version = "21.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "070qpj2y7834i50lhkkbv93s77j91js06zs1bpbmplppiraxqmyz"; + sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA="; }; nativeBuildInputs = [ @@ -30,24 +29,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - paramiko - lxml defusedxml + lxml + paramiko ]; checkInputs = [ pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/greenbone/python-gvm/pull/552 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/greenbone/python-gvm/commit/e48afa614ba9cf69d9b22ce1a4642c625acbaa06.patch"; - sha256 = "0f5wfdymp5dcjk1xb7ynsf0g6idjg2ifwgggp4agic5nkh1k1inl"; - }) - ]; - disabledTests = [ # No running SSH available "test_connect_error" @@ -55,7 +45,9 @@ buildPythonPackage rec { "test_feed_xml_error" ]; - pythonImportsCheck = [ "gvm" ]; + pythonImportsCheck = [ + "gvm" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager";