From b6913b9f41b4416be1e93ca49b579e2e1b90d3cd Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Jun 2026 16:05:23 -0400
Subject: [PATCH] diffoscope: sort dependencies, update comments

Remove binwalk: it needs binwalk v2 (a python library), not v3 (Rust).
python3Packages.binwalk3 doesn't help either.
---
 pkgs/by-name/di/diffoscope/package.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index e0f12e8a10ff..63c84ac53015 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -7,6 +7,7 @@
   apksigcopier,
   apksigner,
   apktool,
+  asar,
   binutils-unwrapped-all-targets,
   bzip2,
   cbfstool,
@@ -23,10 +24,10 @@
   enableBloat ? true,
   enjarify,
   fetchurl,
+  ffmpeg,
   file,
   findutils,
   fontforge-fonttools,
-  ffmpeg,
   fpc,
   gettext,
   ghc,
@@ -54,6 +55,7 @@
   oggvideotools,
   openssh,
   openssl,
+  p7zip,
   pdftk,
   perl,
   pgpdump,
@@ -75,7 +77,6 @@
   xz,
   zip,
   zstd,
-  binwalk,
   # updater only
   writeScript,
 }:
@@ -149,18 +150,14 @@ python.pkgs.buildPythonApplication rec {
   # Still missing these tools:
   # Android-specific tools:
   # dexdump
-  # Darwin-specific tools:
+  # Darwin-specific tools (llvm-lipo and llvm-otool don't suffice):
   # lipo
   # otool
   # Other tools:
-  # docx2txt <- makes tests broken:
-  # > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range
-  # > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError
+  # docx2txt (needs Debian's package called this, not the python package)
   # radare2
-  # > FAILED tests/comparators/test_elf_decompiler.py::test_ghidra_diff - IndexError: list index out of range
-  # > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - AssertionError
-  # > FAILED tests/comparators/test_macho_decompiler.py::test_ghidra_diff - assert 0 == 1
-  # > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - AssertionError
+  # > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - KeyError: 'offset'
+  # > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - KeyError: 'offset'
   #
   # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
   # Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it.
@@ -201,13 +198,13 @@ python.pkgs.buildPythonApplication rec {
     ]
     ++ (with python.pkgs; [
       argcomplete
-      python-debian
       defusedxml
       jsbeautifier
       jsondiff
       libarchive-c
       progressbar
       pypdf
+      python-debian
       python-magic
       pyxattr
       rpm
@@ -218,6 +215,7 @@ python.pkgs.buildPythonApplication rec {
         abootimg
         apksigcopier
         apksigner
+        asar
         cbfstool
         colord
         enjarify
@@ -238,6 +236,7 @@ python.pkgs.buildPythonApplication rec {
         odt2txt
         oggvideotools
         openssh
+        p7zip
         pdftk
         perl
         poppler-utils
@@ -249,7 +248,6 @@ python.pkgs.buildPythonApplication rec {
         ubootTools
         wabt
         xmlbeans
-        binwalk
       ]
       ++ (with python.pkgs; [
         androguard