Unverified Commit 54563b90 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #250110 from tjni/faraday-agent-dispatcher 

faraday-agent-dispatcher: 2.4.0 -> 2.6.2
parents da69b146 684d700c

pkgs/development/python-modules/pytenable/default.nix

+3 −8
Original line number Diff line number Diff line 
{ lib

, appdirs

, buildPythonPackage

, defusedxml

, fetchFromGitHub
@@ -33,26 +32,22 @@ buildPythonPackage rec { 
  };



  propagatedBuildInputs = [

    semver

  ];



  buildInputs = [

    appdirs

    defusedxml

    marshmallow

    python-box

    python-dateutil

    requests

    requests-pkcs12

    restfly

    semver

    typing-extensions

  ];



  nativeCheckInputs = [

    responses

    pytest-datafiles

    pytest-vcr

    pytestCheckHook

    requests-pkcs12

    responses

  ];



  disabledTests = [

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

+8 −7
Original line number Diff line number Diff line
@@ -5,16 +5,21 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "faraday-agent-dispatcher";

  version = "2.4.0";

  version = "2.6.2";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "infobyte";

    repo = "faraday_agent_dispatcher";

    rev = "refs/tags/${version}";

    hash = "sha256-gZXA+2zW25Dl8JmBgg7APZt6ZdpFOEFZXAkiZ+tn/4g=";

    hash = "sha256-+lsejepg/iBHo6CRAGNHjiUC7ZgboHbKu7EDmlN3lVk=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace '"pytest-runner",' ""

  '';



  nativeBuildInputs = with python3.pkgs; [

    setuptools-scm

  ];
@@ -26,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { 
    faraday-plugins

    itsdangerous

    psutil

    pytenable

    python-gvm

    python-owasp-zap-v2-4

    pyyaml
@@ -39,11 +45,6 @@ python3.pkgs.buildPythonApplication rec { 
    pytestCheckHook

  ];



  postPatch = ''

    substituteInPlace setup.py \

      --replace '"pytest-runner",' ""

  '';



  preCheck = ''

    export HOME=$(mktemp -d);

  '';