From 5e159ac0bc94a91dbbad05cf615d214a52a54e45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Nov 2022 10:42:17 +0100 Subject: [PATCH 1/5] faraday-agent-dispatcher: add changelog to meta --- pkgs/tools/security/faraday-agent-dispatcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index ff9bdaa1ab33..85c4a0e48aaf 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -64,6 +64,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to send result from tools to the Faraday Platform"; homepage = "https://github.com/infobyte/faraday_agent_dispatcher"; + changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; From c11824f64494caa38e6b2d07a92375b996ae4e15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Nov 2022 11:26:51 +0100 Subject: [PATCH 2/5] python310Packages.faraday-plugins: set version --- .../python-modules/faraday-plugins/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index bbcd6d600d6c..86d53b20c517 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -8,6 +8,7 @@ , lxml , pytestCheckHook , python-dateutil +, pythonOlder , pytz , requests , simplejson @@ -19,6 +20,8 @@ buildPythonPackage rec { version = "1.8.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; @@ -26,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-KAfy2AQWZYFT/+rX8dNe8aWTFI0kkGg5IaSHhwYGk3A="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=version," "version='${version}'," + ''; + propagatedBuildInputs = [ beautifulsoup4 click @@ -64,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Security tools report parsers for Faraday"; homepage = "https://github.com/infobyte/faraday_plugins"; + changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; From 41189f1178e4c21acc244c723b8d31df7e448eb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Nov 2022 11:27:43 +0100 Subject: [PATCH 3/5] faraday-agent-dispatcher: 2.3.0 -> 2.4.0 Changelog: https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/2.4.0 --- pkgs/tools/security/faraday-agent-dispatcher/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index 85c4a0e48aaf..7b571380b319 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-agent-dispatcher"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_dispatcher"; rev = "refs/tags/${version}"; - hash = "sha256-lsSpD3XJ6Yw9viRCRB7zhl/KTC6Nwle2vnZ9xWr4Ujo="; + hash = "sha256-gZXA+2zW25Dl8JmBgg7APZt6ZdpFOEFZXAkiZ+tn/4g="; }; nativeBuildInputs = with python3.pkgs; [ @@ -25,6 +25,7 @@ python3.pkgs.buildPythonApplication rec { faraday-agent-parameters-types faraday-plugins itsdangerous + psutil python-gvm python-owasp-zap-v2-4 pyyaml From 5eb20083cb9f1adc351ae67abf8b04379cda94da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Nov 2022 11:29:35 +0100 Subject: [PATCH 4/5] faraday-cli: add changelog to meta --- pkgs/tools/security/faraday-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index 8127ffe3310e..49b4b23fd78d 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command Line Interface for Faraday"; homepage = "https://github.com/infobyte/faraday-cli"; + changelog = "https://github.com/infobyte/faraday-cli/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; From 3ecb803d1c50d3baae89436a2e90b6d3bf6c8fd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Nov 2022 11:30:05 +0100 Subject: [PATCH 5/5] faraday-cli: 2.1.7 -> 2.1.8 Changelog: https://github.com/infobyte/faraday-cli/releases/tag/2.1.8 --- pkgs/tools/security/faraday-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index 49b4b23fd78d..a1439ecd1ec5 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; - version = "2.1.7"; + version = "2.1.8"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kZqJVJ6XrCC3iDSTJP8AmIs4WkxiAFimFIexl0L/HT0="; + hash = "sha256-b2vFejsksLcEchUqo+kw01S+dT2UMD5MPAzSWmpREgQ="; }; propagatedBuildInputs = with python3.pkgs; [