on master help sign in
GHC 7.8 tweaks
commiteba90d1aee5b4108392b734445a770fa37d74134 authorMichael Snoyman <michael@snoyman.com> dateFri 4 Apr 2014, 14:53 (13 years ago) parentf714963
2 files changed+42−10
Stackage/Config.hs+21−10 patching/patches/concurrent-extra-0.7.0.6.patch+21
Stackage/Config.hs+21−10
@@ -153,7 +153,7 @@ defaultStablePackages :: GhcMajorVersion
153153 -> Map PackageName (VersionRange, Maintainer)
154154defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
155155 mapM_ (add "michael@snoyman.com") $ words =<<
156− [ "yesod yesod-newsfeed yesod-sitemap yesod-static yesod-test yesod-bin"
156+ [ "yesod yesod-newsfeed yesod-sitemap yesod-static yesod-test"
157157 , "markdown mime-mail-ses"
158158 , "persistent persistent-template persistent-sqlite"
159159 , "network-conduit-tls yackage warp-tls keter"
@@ -163,6 +163,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
163163 , "bzlib-conduit case-insensitive"
164164 , "conduit-combinators yesod-websockets"
165165 ]
166+ when (ghcVer < GhcMajorVersion 7 8) $ add "michael@snoyman.com" "yesod-bin"
166167 when (ghcVer >= GhcMajorVersion 7 6) $ add "michael@snoyman.com" "cabal-src"
167168#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
168169 -- Does not compile on Windows
@@ -177,16 +178,20 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
177178 , "hxt hxt-relaxng dimensional"
178179 , "cairo diagrams-cairo"
179180 , "persistent-mongoDB" -- FIXME fpco-api"
180− , "threepenny-gui base16-bytestring convertible"
181− , "distributed-process distributed-process-simplelocalnet"
181+ , "base16-bytestring convertible"
182182 ]
183+ when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support
184+ mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
185+ [ "distributed-process distributed-process-simplelocalnet"
186+ , "threepenny-gui"
187+ ]
183188 -- Deprecated version
184189 addRange "FP Complete <michael@fpcomplete.com>" "persistent-mongoDB" "< 1.3.1 || > 1.3.1"
185190 when (ghcVer < GhcMajorVersion 7 6) $ do
186191 addRange "FP Complete <michael@fpcomplete.com>" "hxt" "<= 9.3.0.1"
187192 addRange "FP Complete <michael@fpcomplete.com>" "shelly" "<= 1.0"
188193 addRange "FP Complete <michael@fpcomplete.com>" "lockfree-queue" "== 0.2"
189− when (ghcVer >= GhcMajorVersion 7 6) $ do
194+ when (ghcVer == GhcMajorVersion 7 6) $ do -- No GHC 7.8 support
190195 add "FP Complete <michael@fpcomplete.com>" "repa-devil"
191196 addRange "FP Complete <michael@fpcomplete.com>" "kure" "<= 2.4.10"
192197
@@ -203,7 +208,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
203208 "uuid byteorder"
204209
205210 mapM_ (add "Stefan Wehr <wehr@factisresearch.com>") $ words
206− "HTF hscurses xmlgen stm-stats"
211+ "HTF xmlgen stm-stats"
212+ when (ghcVer < GhcMajorVersion 7 8) $ add "Stefan Wehr <wehr@factisresearch.com>" "hscurses"
207213
208214 mapM_ (add "Bart Massey <bart.massey+stackage@gmail.com>") $ words
209215 "parseargs"
@@ -261,8 +267,10 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
261267 mapM_ (add "Alexander Altman <alexanderaltman@me.com>") $ words
262268 "base-unicode-symbols containers-unicode-symbols"
263269
264− mapM_ (add "Ryan Newton <ryan.newton@alum.mit.edu>") $ words
265− "accelerate"
270+ -- NOTE: accelerate not yet supported on GHC 7.8
271+ when (ghcVer == GhcMajorVersion 7 6) $ do
272+ mapM_ (add "Ryan Newton <ryan.newton@alum.mit.edu>") $ words
273+ "accelerate"
266274 when (ghcVer < GhcMajorVersion 7 6) $ do
267275 addRange "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate" "< 0.14"
268276 addRange "Ryan Newton <ryan.newton@alum.mit.edu>" "fclabels" "< 2.0"
@@ -289,7 +297,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
289297
290298 mapM_ (add "Michal J. Gajda") $ words
291299 "iterable Octree FenwickTree hPDB"
292− when (ghcVer >= GhcMajorVersion 7 6) $ do
300+ when (ghcVer == GhcMajorVersion 7 6) $ do -- No GHC 7.8 support
293301 mapM_ (add "Michal J. Gajda") $ words
294302 "hPDB-examples"
295303
@@ -323,8 +331,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
323331 , "blastxml bioace biophd"
324332 , "biopsl" -- https://github.com/ingolia/SamTools/issues/3 samtools
325333 , "seqloc bioalign BlastHTTP"
326− , "RNAFold"
327− , "parsestar hTalos"
334+ , "parsestar"
328335 -- The following have out-of-date dependencies currently
329336 -- biostockholm memexml RNAwolf
330337 -- , "Biobase BiobaseDotP BiobaseFR3D BiobaseInfernal BiobaseMAF"
@@ -334,6 +341,10 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
334341 ]
335342 -- https://github.com/fpco/stackage/issues/163
336343 addRange "Michael Snoyman" "biophd" "< 0.0.6 || > 0.0.6"
344+ when (ghcVer == GhcMajorVersion 7 6) $ do
345+ mapM_ (add "Ketil Malde") $ words =<<
346+ [ "RNAFold hTalos"
347+ ]
337348
338349 -- Newest hxt requires network 2.4 or newest
339350 addRange "Michael Snoyman" "hxt" "< 9.3.1"
patching/patches/concurrent-extra-0.7.0.6.patchnew file+21
@@ -0,0 +1,21 @@
1+diff -ru orig/concurrent-extra.cabal new/concurrent-extra.cabal
2+--- orig/concurrent-extra.cabal 2014-04-04 14:42:42.732063525 +0300
3++++ new/concurrent-extra.cabal 2014-04-04 14:42:42.000000000 +0300
4+@@ -50,7 +50,7 @@
5+ -------------------------------------------------------------------------------
6+
7+ library
8+- build-depends: base >= 3 && < 4.7
9++ build-depends: base >= 3 && < 4.8
10+ , base-unicode-symbols >= 0.1.1 && < 0.3
11+ , stm >= 2.1.2.1 && < 2.5
12+ , unbounded-delays >= 0.1 && < 0.2
13+@@ -80,7 +80,7 @@
14+
15+ ghc-options: -Wall -threaded
16+
17+- build-depends: base >= 3 && < 4.7
18++ build-depends: base >= 3 && < 4.8
19+ , base-unicode-symbols >= 0.1.1 && < 0.3
20+ , stm >= 2.1.2.1 && < 2.5
21+ , unbounded-delays >= 0.1 && < 0.2