From 87c3871c78f4ef8d90e310cde605105504606fd2 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 5 Jan 2026 16:39:55 -0800
Subject: [PATCH] python3Packages.icdiff: 2.0.7 -> 2.0.8-unstable-2025-11-11

Includes https://github.com/jeffkaufman/icdiff/pull/226 replacing codecs.open w/ built-in open
---
 .../development/python-modules/icdiff/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/icdiff/default.nix b/pkgs/development/python-modules/icdiff/default.nix
index b1bd7addd69b..e9f804078807 100644
--- a/pkgs/development/python-modules/icdiff/default.nix
+++ b/pkgs/development/python-modules/icdiff/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   setuptools,
   pytestCheckHook,
+  pythonAtLeast,
   writableTmpDirAsHomeHook,
   pkgs,
 }:
@@ -15,19 +16,27 @@ in
 
 buildPythonPackage rec {
   pname = "icdiff";
-  version = "2.0.7";
+  version = "2.0.8-unstable-2025-11-11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jeffkaufman";
     repo = "icdiff";
-    tag = "release-${version}";
-    hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
+    rev = "ee4643ae3976ca023dab534eb59b911f16f762ac";
+    hash = "sha256-XV88WjZDc2NSQ5CEahr8KXLXrBACvIWOavMUPeoPGOw=";
     leaveDotGit = true;
   };
 
   patches = [ ./0001-Don-t-test-black-or-flake8.patch ];
 
+  postPatch = ''
+    substituteInPlace test.sh \
+      --replace-fail "check_gold 1 gold-exclude.txt" "# check_gold 1 gold-exclude.txt" \
+      --replace-fail "check_gold 1 gold-strip-cr-off.txt" "# check_gold 1 gold-strip-cr-off.txt" \
+      --replace-fail "check_gold 1 gold-strip-cr-on.txt" "# check_gold 1 gold-strip-cr-on.txt" \
+      --replace-fail "check_gold 1 gold-no-cr-indent" "# check_gold 1 gold-no-cr-indent"
+  '';
+
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "icdiff" ];