Unverified Commit 392b2c97 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #202823 from fabaff/faraday-agent-dispatcher-bump 

faraday-agent-dispatcher: 2.3.0 -> 2.4.0, faraday-cli: 2.1.7 -> 2.1.8
parents eaea87ee 3ecb803d

pkgs/development/python-modules/faraday-plugins/default.nix

+9 −0
Original line number Diff line number Diff line
@@ -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 ];

  };

pkgs/tools/security/faraday-agent-dispatcher/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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
@@ -64,6 +65,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 ];

  };

pkgs/tools/security/faraday-cli/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -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; [
@@ -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 ];

  };