@@ -80,7 +80,6 @@ postProcess deriv@(MkDerivation {..})
8080 | pname == "svgcairo" = deriv { extraLibs = "libc":extraLibs }
8181 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
8282 | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
83− | pname == "trifecta" = deriv { phaseOverrides = trifectaPostPatch }
8483 | pname == "unix-time" = deriv { phaseOverrides = unixTimeConfigureFlags }
8584 | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs }
8685 | pname == "wxc" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs, phaseOverrides = wxcPostInstall }
@@ -228,21 +227,6 @@ lhs2texPostInstall = unlines
228227ncursesPatchPhase :: String
229228ncursesPatchPhase = "patchPhase = \"find . -type f -exec sed -i -e 's|ncursesw/||' {} \\\\;\";"
230229
231−trifectaPostPatch :: String
232−trifectaPostPatch = unlines
233− [ "postPatch = ''"
234− , " substituteInPlace trifecta.cabal \\"
235− , " --replace \"blaze-html >= 0.5 && < 0.6,\" \"blaze-html >= 0.5 && < 0.8,\" \\"
236− , " --replace \"blaze-html >= 0.5 && < 0.7,\" \"blaze-html >= 0.5 && < 0.8,\" \\"
237− , " --replace \"blaze-markup >= 0.5 && < 0.6,\" \"blaze-markup >= 0.5 && < 0.7,\" \\"
238− , " --replace \"hashable >= 1.2.1 && < 1.3,\" \"hashable >= 1.1 && < 1.3,\" \\"
239− , " --replace \"hashable >= 1.2 && < 1.3,\" \"hashable >= 1.1 && < 1.3,\" \\"
240− , " --replace \"fingertree >= 0.0.1 && < 0.1,\" \"fingertree >= 0.0.1 && < 0.2,\" \\"
241− , " --replace \"comonad == 3.*,\" \"comonad >= 3 && < 5,\" \\"
242− , " --replace \"comonad >= 3 && < 4,\" \"comonad >= 3 && < 5,\""
243− , "'';"
244− ]
245−
246230doctestNoHaddock, markdownUnlitNoHaddock :: String
247231markdownUnlitNoHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.4\";"
248232doctestNoHaddock = markdownUnlitNoHaddock