From 4578b4e63e32be23ff8c7ffe8a60a5b1ee6980e3 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sat, 21 Jun 2025 15:12:02 +0200
Subject: [PATCH] haskellPackages.hexstring: unbreak

---
 .../haskell-modules/configuration-common.nix   | 18 ++++++++++++++++++
 .../configuration-hackage2nix/broken.yaml      |  1 -
 .../haskell-modules/hackage-packages.nix       |  2 --
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dbdfcdc0f0fa..7316bf1f1d8d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2528,6 +2528,24 @@ with haskellLib;
       '';
   }) super.hermes-json;
 
+  # hexstring is not compatible with newer versions of base16-bytestring
+  # See https://github.com/solatis/haskell-hexstring/issues/3
+  hexstring = overrideCabal (old: {
+    # Prevent DOS line endings from Hackage from breaking a patch
+    prePatch =
+      old.prePatch or ""
+      + ''
+        ${pkgs.buildPackages.dos2unix}/bin/dos2unix src/Data/HexString.hs
+      '';
+    patches = old.patches or [ ] ++ [
+      (pkgs.fetchpatch {
+        name = "fix-base16-bytestring-compat";
+        url = "https://github.com/solatis/haskell-hexstring/commit/4f0a27c64ecb4a767eeea2efebebfd7edba18de0.patch";
+        hash = "sha256-DHT566Ov1D++1VNjUor9xSeOsuSi2LPiIAGT55gqr8s=";
+      })
+    ];
+  }) super.hexstring;
+
   # Disabling doctests.
   regex-tdfa = overrideCabal {
     testTargets = [ "regex-tdfa-unittest" ];
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 96fe5f98f6dd..90238ac8c43b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -2600,7 +2600,6 @@ broken-packages:
   - hexpr # failure in job https://hydra.nixos.org/build/233198146 at 2023-09-02
   - hexpress # failure in job https://hydra.nixos.org/build/233219047 at 2023-09-02
   - hexquote # failure in job https://hydra.nixos.org/build/233230240 at 2023-09-02
-  - hexstring # failure in job https://hydra.nixos.org/build/233193009 at 2023-09-02
   - hext # failure in job https://hydra.nixos.org/build/233221345 at 2023-09-02
   - hextra # failure in job https://hydra.nixos.org/build/233238071 at 2023-09-02
   - hextream # failure in job https://hydra.nixos.org/build/252712270 at 2024-03-16
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index afd4702cf3b3..d83d90f7c287 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -322751,8 +322751,6 @@ self: {
       ];
       description = "Fast and safe representation of a hex string";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };