From 52c06f900688424fb55a7025cab2e1c86fbcbcb2 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 10 May 2025 09:51:14 +0200
Subject: [PATCH 1/3] haskellPackages.selda-sqlite: unbreak

(cherry picked from commit 802c06b865f1aa7a19d052deb61ea02c723adca6)
---
 .../haskell-modules/configuration-common.nix      | 15 ++++++++++++++-
 .../configuration-hackage2nix/broken.yaml         |  1 -
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 71d4d6db916e9..3e26a0d579fa1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1045,7 +1045,20 @@ self: super:
               }
               + "/${name}";
             # 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1
-            jailbreak = true;
+            # Note: jailbreak ignores constraints under an if(flag)
+            postPatch = ''
+              check_sed() {
+                if ! test -s "$1"; then
+                  echo "sed: pattern '$2' doesn't match anything" >&2
+                  exit 1
+                fi
+              }
+              sed -i ${name}.cabal \
+                -e 's/\(bytestring\) .*/\1/w c1' \
+                -e 's/\(text\) .*/\1/w c2'
+              check_sed c1 'bytestring .*'
+              check_sed c2 'text .*'
+            '';
           }) super.${name};
       in
       lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 25f1b95bc68a1..6b2b7fea27249 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5373,7 +5373,6 @@ broken-packages:
   - secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02
   - SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02
   - selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02
-  - selda-sqlite # failure in job https://hydra.nixos.org/build/295096791 at 2025-04-22
   - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02
   - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02
   - sel # failure in job https://hydra.nixos.org/build/255671988 at 2024-04-16

From f41aea9a26b428cdd399b26ffadea36d6b143ae6 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 15 May 2025 12:22:51 +0200
Subject: [PATCH 2/3] haskellPackages.selda-sqlite: regenerate package
 expression

(cherry picked from commit f976f173f4a044237c6847bf4ced0f86fc991eaa)
---
 pkgs/development/haskell-modules/hackage-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 32a135ebd8bf8..9c812848605de 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -588336,8 +588336,6 @@ self: {
       ];
       description = "SQLite backend for the Selda database EDSL";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 

From a98936ab27a547bd78007ba6c7024740374c72e3 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 31 May 2025 22:38:48 +0200
Subject: [PATCH 3/3] haskellPackages.selda-json: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3e26a0d579fa1..c71837d5b8f41 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1045,8 +1045,9 @@ self: super:
               }
               + "/${name}";
             # 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1
+            jailbreak = true;
             # Note: jailbreak ignores constraints under an if(flag)
-            postPatch = ''
+            postPatch = lib.optionalString (name == "selda-sqlite") ''
               check_sed() {
                 if ! test -s "$1"; then
                   echo "sed: pattern '$2' doesn't match anything" >&2
@@ -1054,10 +1055,8 @@ self: super:
                 fi
               }
               sed -i ${name}.cabal \
-                -e 's/\(bytestring\) .*/\1/w c1' \
-                -e 's/\(text\) .*/\1/w c2'
+                -e 's/\(bytestring\) .*/\1,/w c1'
               check_sed c1 'bytestring .*'
-              check_sed c2 'text .*'
             '';
           }) super.${name};
       in