haskellPackages.reflex-dom: Fix build

pkgs/development/haskell-modules/configuration-common.nix

@@ -965,6 +965,8 @@ self: super: {
   # Fix build with attr-2.4.48 (see #53716)
   xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr;
 
+  patch = dontCheck super.patch;
+
   esqueleto =
     overrideCabal
       (drv: {
@@ -1131,23 +1133,40 @@ self: super: {
     });
   };
 
+  jsaddle-webkit2gtk = overrideCabal (old: {
+    postPatch = old.postPatch or "" + ''
+      sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal
+    '';
+  }) super.jsaddle-webkit2gtk;
+
+
   # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19
   jsaddle-dom = overrideCabal (old: {
     postPatch = old.postPatch or "" + ''
       sed -i 's/lens.*4.20/lens/' jsaddle-dom.cabal
     '';
-  }) super.jsaddle-dom;
+  }) (doJailbreak super.jsaddle-dom);
 
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
   # 2022-03-16: Pullrequest for ghc 9 compat https://github.com/reflex-frp/reflex-dom/pull/433
-  reflex-dom-core = doDistribute (unmarkBroken (dontCheck
-    (appendPatch
+  reflex-dom-core = overrideCabal (old: {
+    postPatch = old.postPatch or "" + ''
+      sed -i 's/template-haskell.*2.17/template-haskell/' reflex-dom-core.cabal
+    '';
+    }) 
+    ((appendPatches [
       (fetchpatch {
-        url = "https://github.com/reflex-frp/reflex-dom/compare/a0459deafd296656b3e99db01ea7f65b89b0948c...56fa8a484ccfc7d3365d07fea3caa430155dbcac.patch";
-        sha256 = "sha256-azMF3uX7S1rKKRAVjY+xP2XbQKHvEY/9nU7cH81KKPA=";
+        url = "https://github.com/reflex-frp/reflex-dom/commit/1814640a14c6c30b1b2299e74d08fb6fcaadfb94.patch";
+        sha256 = "sha256-QyX2MLd7Tk0M1s0DU0UV3szXs8ngz775i3+KI62Q3B8=";
         relative = "reflex-dom-core";
       })
-      super.reflex-dom-core)));
+      (fetchpatch {
+        url = "https://github.com/reflex-frp/reflex-dom/commit/56fa8a484ccfc7d3365d07fea3caa430155dbcac.patch";
+        sha256 = "sha256-IogAYJZac17Bg99ZnnFX/7I44DAnHo2PRBWD0iVHbNA=";
+        relative = "reflex-dom-core";
+      })
+    ]
+          (doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))))));
 
   # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp.
   jsaddle-warp = dontCheck super.jsaddle-warp;
@@ -1382,7 +1401,7 @@ self: super: {
   dependent-sum = doJailbreak super.dependent-sum;
 
   # 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475
-  reflex = dontCheck super.reflex;
+  reflex = doJailbreak (dontCheck super.reflex);
 
   # 2020-11-19: jailbreaking because of pretty-simple bound out of date
   # https://github.com/kowainik/stan/issues/408
@@ -1704,6 +1723,7 @@ self: super: {
     postPatch = ''
       sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal
       sed -i 's/attoparsec.*,/attoparsec,/' jsaddle.cabal
+      sed -i 's/time.*,/time,/' jsaddle.cabal
       sed -i 's/(!name)/(! name)/' src/Language/Javascript/JSaddle/Object.hs
     '' + (drv.postPatch or "");
   }) (doJailbreak super.jsaddle);

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -78,10 +78,6 @@ default-package-overrides:
   - retrie < 1.2.0.0
   # needs http-client >= 0.7.11 which isn't part of Stackage LTS 18
   - http-client-restricted < 0.0.5
-  # patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet
-  - patch < 0.0.7
-  - reflex < 0.8.2.1
-  - reflex-dom-core < 0.7.0.2
   # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
   - hasql-dynamic-statements < 0.3.1.2
   # Its dependency brick >= 1.0 is not yet in stackage

pkgs/development/haskell-modules/hackage-packages.nix

@@ -214199,29 +214199,6 @@ self: {
      }) {};
 
   "patch" = callPackage
-    ({ mkDerivation, base, constraints-extras, containers
-     , dependent-map, dependent-sum, directory, filemanip, filepath
-     , hedgehog, hlint, HUnit, indexed-traversable, lens
-     , monoidal-containers, semialign, semigroupoids, these
-     , transformers, witherable
-     }:
-     mkDerivation {
-       pname = "patch";
-       version = "0.0.6.0";
-       sha256 = "0wgxmk9vfrgnq5vg93jwzkszxmyrk91b36fnnlm8qr6mlg7j8m0z";
-       libraryHaskellDepends = [
-         base constraints-extras containers dependent-map dependent-sum
-         indexed-traversable lens monoidal-containers semialign
-         semigroupoids these transformers witherable
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath hedgehog hlint HUnit
-       ];
-       description = "Data structures for describing changes to other data structures";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "patch_0_0_8_0" = callPackage
     ({ mkDerivation, base, commutative-semigroups, constraints-extras
      , containers, dependent-map, dependent-sum, directory, filemanip
      , filepath, hedgehog, hlint, HUnit, indexed-traversable, lens
@@ -214243,7 +214220,6 @@ self: {
        ];
        description = "Data structures for describing changes to other data structures";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -237954,46 +237930,6 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, constraints
-     , constraints-extras, containers, criterion, data-default, deepseq
-     , dependent-map, dependent-sum, directory, exception-transformers
-     , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint
-     , hspec, lens, loch-th, MemoTrie, mmorph, monad-control
-     , monoidal-containers, mtl, patch, prim-uniq, primitive, process
-     , proctest, profunctors, random, ref-tf, reflection, semialign
-     , semigroupoids, split, stm, syb, template-haskell, text, these
-     , these-lens, time, transformers, unbounded-delays, witherable
-     }:
-     mkDerivation {
-       pname = "reflex";
-       version = "0.8.2.0";
-       sha256 = "1hvagxcs413bqairxf77vp19484mxnbfckhd44wv22ncwfh5mq6d";
-       revision = "3";
-       editedCabalFile = "1sax4fx7pgn85dvih4y6mnvhdq8nssan1rcys5kdfhirnr4vgn1m";
-       libraryHaskellDepends = [
-         base bifunctors comonad constraints constraints-extras containers
-         data-default dependent-map dependent-sum exception-transformers
-         haskell-src-exts haskell-src-meta lens MemoTrie mmorph
-         monad-control monoidal-containers mtl patch prim-uniq primitive
-         profunctors random ref-tf reflection semialign semigroupoids stm
-         syb template-haskell these time transformers unbounded-delays
-         witherable
-       ];
-       testHaskellDepends = [
-         base bifunctors constraints constraints-extras containers deepseq
-         dependent-map dependent-sum directory filemanip filepath hlint
-         hspec lens monoidal-containers mtl patch proctest ref-tf semialign
-         split text these these-lens transformers witherable
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq dependent-map dependent-sum
-         loch-th mtl primitive process ref-tf split stm time transformers
-       ];
-       description = "Higher-order Functional Reactive Programming";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "reflex_0_8_2_2" = callPackage
     ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad
      , constraints, constraints-extras, containers, criterion
      , data-default, deepseq, dependent-map, dependent-sum, directory
@@ -238032,7 +237968,6 @@ self: {
        ];
        description = "Higher-order Functional Reactive Programming";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-animation" = callPackage
@@ -238194,47 +238129,6 @@ self: {
      }) {};
 
   "reflex-dom-core" = callPackage
-    ({ mkDerivation, aeson, async, base, bifunctors, bimap
-     , blaze-builder, bytestring, case-insensitive, chrome-test-utils
-     , constraints, constraints-extras, containers, contravariant
-     , data-default, dependent-map, dependent-sum
-     , dependent-sum-template, directory, exception-transformers
-     , exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-core
-     , hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp
-     , keycode, lens, lifted-base, monad-control, mtl, network
-     , network-uri, primitive, process, random, ref-tf, reflex
-     , semialign, semigroups, silently, stm, template-haskell, temporary
-     , text, these, transformers, unix, wai, wai-websockets, warp
-     , webdriver, websockets, which, zenc
-     }:
-     mkDerivation {
-       pname = "reflex-dom-core";
-       version = "0.7.0.1";
-       sha256 = "0lhi04i5wfkgblcifah6znkwi6v7294pna48527ns74f0bjc7yy3";
-       libraryHaskellDepends = [
-         aeson base bifunctors bimap blaze-builder bytestring
-         case-insensitive constraints containers contravariant data-default
-         dependent-map dependent-sum dependent-sum-template directory
-         exception-transformers ghcjs-dom jsaddle keycode lens monad-control
-         mtl network-uri primitive random ref-tf reflex semialign semigroups
-         stm template-haskell text these transformers unix zenc
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring chrome-test-utils constraints
-         constraints-extras containers dependent-map dependent-sum
-         dependent-sum-template directory exceptions filepath ghcjs-dom
-         hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle
-         jsaddle-warp lens lifted-base network process random ref-tf reflex
-         silently temporary text wai wai-websockets warp webdriver
-         websockets which
-       ];
-       description = "Functional Reactive Web Apps with Reflex";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {chrome-test-utils = null;};
-
-  "reflex-dom-core_0_7_0_2" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, bimap
      , blaze-builder, bytestring, case-insensitive, chrome-test-utils
      , commutative-semigroups, constraints, constraints-extras