Merge pull request #304493 from fabaff/flare-floss-bump

flare-floss: 3.0.1 -> 3.1.0

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

@@ -1,11 +1,12 @@
-{ lib
+{
-, python3
+  lib,
-, fetchFromGitHub
+  python3,
+  fetchFromGitHub,
 }:
 
 python3.pkgs.buildPythonPackage rec {
   pname = "flare-floss";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -13,33 +14,37 @@ python3.pkgs.buildPythonPackage rec {
     repo = "flare-floss";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true; # for tests
-    hash = "sha256-bmOWOFqyvOvSrNTbwLqo0WMq4IAZxZ0YYaWCdCrpziU=";
+    hash = "sha256-a20q7kavWwCsfnAW02+IY0jKERMxkJ+2nid/CwQxC9E=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
+    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"'
   '';
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
+    setuptools-scm
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies =
-    binary2strings
+    with python3.pkgs;
-    halo
+    [
-    networkx
+      binary2strings
-    pefile
+      halo
-    pydantic_1
+      networkx
-    rich
+      pefile
-    tabulate
+      pydantic
-    tqdm
+      rich
-    viv-utils
+      tabulate
-    vivisect
+      tqdm
-  ] ++ viv-utils.optional-dependencies.flirt;
+      viv-utils
+      vivisect
+    ]
+    ++ viv-utils.optional-dependencies.flirt;
 
   nativeCheckInputs = with python3.pkgs; [
     pytest-sugar