From 467cb31c7c2885d3e2e20d6ddeb3ed6ab23e8121 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 17 Jan 2025 17:23:30 +0000 Subject: [PATCH] haskellPackages.reflex: use upstream version --- .../haskell-modules/configuration-common.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad7d10ef3297..248a89dc60c5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1880,21 +1880,16 @@ self: super: { # https://github.com/adnelson/semver-range/issues/15 semver-range = dontCheck super.semver-range; - reflex = lib.pipe super.reflex [ - doJailbreak - # Until hackage release has https://github.com/reflex-frp/reflex/pull/517 - (overrideCabal (drv: { - postPatch = drv.postPatch or "" + '' - substituteInPlace \ - src/Data/AppendMap.hs \ - src/Reflex/Class.hs \ - src/Reflex/FunctorMaybe.hs \ - src/Reflex/Spider/Internal.hs \ - test/DebugCycles.hs \ - --replace-fail Data.Witherable Witherable - ''; - })) - ]; + reflex = lib.warnIf (lib.versionAtLeast super.reflex.version "0.9.3.2") "reflex version override is no longer needed and should be removed" + (overrideSrc rec { + version = "0.9.3.2"; + src = (pkgs.fetchFromGitHub { + owner = "reflex-frp"; + repo = "reflex"; + rev = "v0.9.3.2"; + hash = "sha256-IJMoYoIN8OWOmyOMSvr1aFXofWsyEetCUY7hO141ThE="; + }); + } super.reflex); # 2024-03-02: vty <5.39 - https://github.com/reflex-frp/reflex-ghci/pull/33 reflex-ghci = assert super.reflex-ghci.version == "0.2.0.1"; doJailbreak super.reflex-ghci;