From c9998d08693c680857e567d034c2bf0de661c10b Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Thu, 11 Jul 2024 07:48:36 -0400
Subject: [PATCH 1/2] binwalk: migrate to pep517 builder

---
 pkgs/development/python-modules/binwalk/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index d3ebcbe91e37..8e758b77aa5e 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -14,6 +14,7 @@
   cramfsprogs,
   cramfsswap,
   sasquatch,
+  setuptools,
   squashfsTools,
   matplotlib,
   nose,
@@ -26,7 +27,7 @@
 buildPythonPackage rec {
   pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
   version = "2.3.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ReFirmLabs";
@@ -46,6 +47,8 @@ buildPythonPackage rec {
     })
   ];
 
+  build-system = [ setuptools ];
+
   propagatedBuildInputs =
     [
       zlib

From c734673fef56864c7d0d2a70e66b344472f3456e Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Thu, 11 Jul 2024 07:50:33 -0400
Subject: [PATCH 2/2] binwalk: switch to fork, 2.3.4 -> 2.4.1

---
 .../python-modules/binwalk/default.nix        | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 8e758b77aa5e..844765011ca6 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   stdenv,
   zlib,
   xz,
@@ -17,36 +16,25 @@
   setuptools,
   squashfsTools,
   matplotlib,
-  nose,
   pycrypto,
   pyqtgraph,
   pyqt5,
+  pytestCheckHook,
   visualizationSupport ? false,
 }:
 
 buildPythonPackage rec {
   pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
-  version = "2.3.4";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "ReFirmLabs";
+    owner = "OSPG";
     repo = "binwalk";
     rev = "v${version}";
-    hash = "sha256-hlPbzqGRSXcIqlI+SNKq37CnnHd1IoMBNSjhyeAM1TE=";
+    hash = "sha256-VApqQrVBV7w15Bpwc6Fd/cA1Ikqu7Ds8qu0TH68YVog=";
   };
 
-  patches = [
-    # test_firmware_zip fails with 2.3.3 upgrade
-    # https://github.com/ReFirmLabs/binwalk/issues/566
-    (fetchpatch {
-      url = "https://github.com/ReFirmLabs/binwalk/commit/dd4f2efd275c9dd1001130e82e0f985110cd2754.patch";
-      sha256 = "1707n4nf1d1ay1yn4i8qlrvj2c1120g88hjwyklpsc2s2dcnqj9r";
-      includes = [ "testing/tests/test_firmware_zip.py" ];
-      revert = true;
-    })
-  ];
-
   build-system = [ setuptools ];
 
   propagatedBuildInputs =
@@ -83,12 +71,12 @@ buildPythonPackage rec {
     HOME=$(mktemp -d)
   '';
 
-  nativeCheckInputs = [ nose ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "binwalk" ];
 
   meta = with lib; {
-    homepage = "https://github.com/ReFirmLabs/binwalk";
+    homepage = "https://github.com/OSPG/binwalk";
     description = "Tool for searching a given binary image for embedded files";
     mainProgram = "binwalk";
     maintainers = [ maintainers.koral ];