From 6ba663bbc5982840629705da06e9c11d24bed4e6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 1 Nov 2024 08:20:21 +0100
Subject: [PATCH 1/3] python312Packages.vivisect: fix build-system

- update disabled
- relax msgpack
---
 pkgs/development/python-modules/vivisect/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index 17fd9d3edd9e..06b15686ec24 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -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" ];

From 60dd20fc99849233dac713321fb9a0acddbbc264 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 1 Nov 2024 08:26:47 +0100
Subject: [PATCH 2/3] python312Packages.viv-utils: adjust build-system

- add pythonImportsCheck
---
 .../python-modules/viv-utils/default.nix      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index 47fbbecd820a..7bb87b98bc56 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -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";

From 81a20c20bf32fc740475b260395ffdcb054bfbe7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 1 Nov 2024 08:31:45 +0100
Subject: [PATCH 3/3] flare-floss: 3.1.0 -> 3.1.1

Diff: https://github.com/mandiant/flare-floss/compare/refs/tags/v3.1.0...v3.1.1

Changelog: https://github.com/mandiant/flare-floss/releases/tag/v3.1.1
---
 pkgs/tools/security/flare-floss/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix
index 08ca48bc097a..020793273066 100644
--- a/pkgs/tools/security/flare-floss/default.nix
+++ b/pkgs/tools/security/flare-floss/default.nix
@@ -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