Unverified Commit 09de9a86 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

flare-floss: 3.1.0 -> 3.1.1 (#352806)

parents 70a17cf3 81a20c20

pkgs/development/python-modules/viv-utils/default.nix

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

  intervaltree,

  pefile,

  typing-extensions,

  vivisect,

  pytest-sugar,

  pytestCheckHook,

  python-flirt,

  pythonOlder,

  setuptools-scm,

  typing-extensions,

  vivisect,

}:



buildPythonPackage rec {

  pname = "viv-utils";

  version = "0.7.11";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "williballenthin";
@@ -23,12 +28,9 @@ buildPythonPackage rec { 
    hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace "==" ">="

  '';

  build-system = [ setuptools-scm ];



  propagatedBuildInputs = [

  dependencies = [

    funcy

    intervaltree

    pefile
@@ -47,6 +49,8 @@ buildPythonPackage rec { 
    };

  };



  pythonImportsCheck = [ "viv_utils" ];



  meta = with lib; {

    description = "Utilities for working with vivisect";

    homepage = "https://github.com/williballenthin/viv-utils";

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

+8 −4
Original line number Diff line number Diff line
@@ -12,14 +12,15 @@ 
  pythonOlder,

  withGui ? false,

  wrapQtAppsHook,

  setuptools,

}:



buildPythonPackage rec {

  pname = "vivisect";

  version = "1.2.1";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.6";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;
@@ -28,15 +29,18 @@ buildPythonPackage rec { 


  pythonRelaxDeps = [

    "cxxfilt"

    "msgpack"

    "pyasn1"

    "pyasn1-modules"

  ];



  build-system = [ setuptools ];



  nativeBuildInputs = [

    wrapQtAppsHook

  ];



  propagatedBuildInputs = [

  dependencies = [

    pyasn1

    pyasn1-modules

    cxxfilt
@@ -53,7 +57,7 @@ buildPythonPackage rec { 
    wrapQtApp $out/bin/vivbin

  '';



  # requires another repo for test files

  # Tests requires another repo for test files

  doCheck = false;



  pythonImportsCheck = [ "vivisect" ];

pkgs/tools/security/flare-floss/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


python3.pkgs.buildPythonPackage rec {

  pname = "flare-floss";

  version = "3.1.0";

  version = "3.1.1";

  pyproject = true;



  src = fetchFromGitHub {
@@ -14,17 +14,16 @@ python3.pkgs.buildPythonPackage rec { 
    repo = "flare-floss";

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

    fetchSubmodules = true; # for tests

    hash = "sha256-a20q7kavWwCsfnAW02+IY0jKERMxkJ+2nid/CwQxC9E=";

    hash = "sha256-ciyF1Pt5KdUsmpTgvfgE81hhTHBM5zMBcZpom99R5GY=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "==" ">="



    substituteInPlace floss/main.py \

      --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"'

  '';



  pythonRelaxDeps = [ "networkx" ];



  build-system = with python3.pkgs; [

    setuptools

    setuptools-scm
@@ -34,6 +33,7 @@ python3.pkgs.buildPythonPackage rec { 
    with python3.pkgs;

    [

      binary2strings

      dncil

      halo

      networkx

      pefile