commit 09de9a86f7c7bd65322402ecf9f09e04d9e1b857 · pyrox.dev/nixpkgs

+12 -8

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

···

       5
       5
        
         funcy,

     

       6
       6
        
         intervaltree,

     

       7
       7
        
         pefile,

     

       8
       8
       -
         typing-extensions,

     

       9
       9
       -
         vivisect,

     

       10
       8
        
         pytest-sugar,

     

       11
       9
        
         pytestCheckHook,

     

       12
       10
        
         python-flirt,

     

       11
       11
       +
         pythonOlder,

     

       12
       12
       +
         setuptools-scm,

     

       13
       13
       +
         typing-extensions,

     

       14
       14
       +
         vivisect,

     

       13
       15
        
       }:

     

       16
       16
       +
       

     

       14
       17
        
       buildPythonPackage rec {

     

       15
       18
        
         pname = "viv-utils";

     

       16
       19
        
         version = "0.7.11";

     

       17
       17
       -
         format = "setuptools";

     

       20
       20
       +
         pyproject = true;

     

       21
       21
       +
       

     

       22
       22
       +
         disabled = pythonOlder "3.9";

     

       18
       23
        
       

     

       19
       24
        
         src = fetchFromGitHub {

     

       20
       25
        
           owner = "williballenthin";

     
···

       23
       28
        
           hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y=";

     

       24
       29
        
         };

     

       25
       30
        
       

     

       26
       26
       -
         postPatch = ''

     

       27
       27
       -
           substituteInPlace setup.py \

     

       28
       28
       -
             --replace "==" ">="

     

       29
       29
       -
         '';

     

       31
       31
       +
         build-system = [ setuptools-scm ];

     

       30
       32
        
       

     

       31
       31
       -
         propagatedBuildInputs = [

     

       33
       33
       +
         dependencies = [

     

       32
       34
        
           funcy

     

       33
       35
        
           intervaltree

     

       34
       36
        
           pefile

     
···

       46
       48
        
             flirt = [ python-flirt ];

     

       47
       49
        
           };

     

       48
       50
        
         };

     

       51
       51
       +
       

     

       52
       52
       +
         pythonImportsCheck = [ "viv_utils" ];

     

       49
       53
        
       

     

       50
       54
        
         meta = with lib; {

     

       51
       55
        
           description = "Utilities for working with vivisect";

+8 -4

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

···

       12
       12
        
         pythonOlder,

     

       13
       13
        
         withGui ? false,

     

       14
       14
        
         wrapQtAppsHook,

     

       15
       15
       +
         setuptools,

     

       15
       16
        
       }:

     

       16
       17
        
       

     

       17
       18
        
       buildPythonPackage rec {

     

       18
       19
        
         pname = "vivisect";

     

       19
       20
        
         version = "1.2.1";

     

       20
       20
       -
         format = "setuptools";

     

       21
       21
       +
         pyproject = true;

     

       21
       22
        
       

     

       22
       22
       -
         disabled = pythonOlder "3.6";

     

       23
       23
       +
         disabled = pythonOlder "3.8";

     

       23
       24
        
       

     

       24
       25
        
         src = fetchPypi {

     

       25
       26
        
           inherit pname version;

     
···

       28
       29
        
       

     

       29
       30
        
         pythonRelaxDeps = [

     

       30
       31
        
           "cxxfilt"

     

       32
       32
       +
           "msgpack"

     

       31
       33
        
           "pyasn1"

     

       32
       34
        
           "pyasn1-modules"

     

       33
       35
        
         ];

     

       34
       36
        
       

     

       37
       37
       +
         build-system = [ setuptools ];

     

       38
       38
       +
       

     

       35
       39
        
         nativeBuildInputs = [

     

       36
       40
        
           wrapQtAppsHook

     

       37
       41
        
         ];

     

       38
       42
        
       

     

       39
       39
       -
         propagatedBuildInputs = [

     

       43
       43
       +
         dependencies = [

     

       40
       44
        
           pyasn1

     

       41
       45
        
           pyasn1-modules

     

       42
       46
        
           cxxfilt

     
···

       53
       57
        
           wrapQtApp $out/bin/vivbin

     

       54
       58
        
         '';

     

       55
       59
        
       

     

       56
       56
       -
         # requires another repo for test files

     

       60
       60
       +
         # Tests requires another repo for test files

     

       57
       61
        
         doCheck = false;

     

       58
       62
        
       

     

       59
       63
        
         pythonImportsCheck = [ "vivisect" ];

+5 -5

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

···

       6
       6
        
       

     

       7
       7
        
       python3.pkgs.buildPythonPackage rec {

     

       8
       8
        
         pname = "flare-floss";

     

       9
       9
       -
         version = "3.1.0";

     

       9
       9
       +
         version = "3.1.1";

     

       10
       10
        
         pyproject = true;

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     
···

       14
       14
        
           repo = "flare-floss";

     

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

     

       16
       16
        
           fetchSubmodules = true; # for tests

     

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

     

       17
       17
       +
           hash = "sha256-ciyF1Pt5KdUsmpTgvfgE81hhTHBM5zMBcZpom99R5GY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         postPatch = ''

     

       21
       21
       -
           substituteInPlace pyproject.toml \

     

       22
       22
       -
             --replace "==" ">="

     

       23
       23
       -
       

     

       24
       21
        
           substituteInPlace floss/main.py \

     

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

     

       26
       23
        
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         pythonRelaxDeps = [ "networkx" ];

     

       27
       26
        
       

     

       28
       27
        
         build-system = with python3.pkgs; [

     

       29
       28
        
           setuptools

     
···

       34
       33
        
           with python3.pkgs;

     

       35
       34
        
           [

     

       36
       35
        
             binary2strings

     

       36
       36
       +
             dncil

     

       37
       37
        
             halo

     

       38
       38
        
             networkx

     

       39
       39
        
             pefile