diffoscope: 319 -> 321

Release note for 320: https://diffoscope.org/news/diffoscope-320-released/
Release note for 321: https://diffoscope.org/news/diffoscope-321-released/

pkgs/by-name/di/diffoscope/package.nix

@@ -108,12 +108,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "319";
+  version = "321";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-oIEC3ssdp0p2cE0VunTv6oo5CFuMQyftr4e5kqWmfP4=";
+    hash = "sha256-M/rsyUGlJDpU3o1RMfaN9fNMpOn9Xpz2ydflPUXVhD4=";
   };
 
   outputs = [
@@ -121,7 +121,11 @@ python.pkgs.buildPythonApplication rec {
     "man"
   ];
 
-  patches = [ ./ignore_links.patch ];
+  patches = [
+    ./ignore_links.patch
+    # Remove flags output from an OCaml test's diff, as it's Debian-specific
+    ./remove-flags-from-ocaml-diff.patch
+  ];
 
   postPatch = ''
     # When generating manpage, use the installed version

pkgs/by-name/di/diffoscope/remove-flags-from-ocaml-diff.patch

@@ -0,0 +1,27 @@
+From 18cf9ab675691c7173a9b7fafd6d521c3ea75862 Mon Sep 17 00:00:00 2001
+From: Michael Daniels <mdaniels5757@gmail.com>
+Date: Sat, 20 Jun 2026 11:42:29 -0400
+Subject: [PATCH] tests/data/ocaml_expected_diff: remove flags from diff
+
+This output comes from a Debian-specific OCaml patch, see
+https://salsa.debian.org/ocaml-team/ocaml/-/blob/archive/debian/5.4.1-1/debian/patches/Print-.cmi-flags-in-objinfo.patch
+---
+ tests/data/ocaml_expected_diff | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/data/ocaml_expected_diff b/tests/data/ocaml_expected_diff
+index 79631882..a48de841 100644
+--- a/tests/data/ocaml_expected_diff
++++ b/tests/data/ocaml_expected_diff
+@@ -1,7 +1,6 @@
+-@@ -1,6 +1,6 @@
++@@ -1,5 +1,5 @@
+ -Unit name: Test1
+ +Unit name: Test2
+- Flags: [ Alerts _ ]
+  Interfaces imported:
+ -	351c2dc2fb4a56dac258b47c26262db6	Test1
+ +	ac02205dc900024a67ede9f394c59d72	Test2
+-- 
+2.54.0
+