diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5048002f0887..b964a5c101ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1242,13 +1242,7 @@ self: super: { patch = doJailbreak super.patch; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 - reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch (doJailbreak super.reflex-dom-core) (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch; - sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l"; - stripLen = 2; - extraPrefix = ""; - includes = ["reflex-dom-core.cabal" ]; - })))); + reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch { @@ -1475,14 +1469,6 @@ self: super: { # https://github.com/obsidiansystems/dependent-sum/issues/55 dependent-sum = doJailbreak super.dependent-sum; - # Overspecified constraint on 'constraints'. Kinda funny, huh? - dependent-sum-aeson-orphans = appendPatch (doJailbreak super.dependent-sum-aeson-orphans) (pkgs.fetchpatch { - # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9 - # Bump version bounds for ghc 8.10 - url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch; - sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb"; - }); - # 2020-11-18: https://github.com/srid/rib/issues/169 # aeson bound out of sync rib-core = doJailbreak super.rib-core; @@ -1491,20 +1477,8 @@ self: super: { # base upper bound is incompatible with ghc 8.10 neuron = doJailbreak super.neuron; - reflex = dontCheck (doJailbreak (appendPatches super.reflex [ - # https://github.com/reflex-frp/reflex/pull/444 - # Fixes for ghc 8.10 - (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch; - sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy"; - }) - # https://github.com/reflex-frp/reflex/pull/444 - # Bound bumps for ghc 8.10 - (pkgs.fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch; - sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq"; - }) - ])); + # 2020-04-16: https://github.com/reflex-frp/reflex/issues/449 + reflex = dontCheck (doJailbreak super.reflex); # 2020-11-19: jailbreaking because of pretty-simple bound out of date # https://github.com/kowainik/stan/issues/408