on master help sign in
Merge remote-tracking branch 'origin/master' into stackage2

Conflicts: Stackage/Config.hs

commit8801ebe0bbaff53b83d0d930e379067638458267 authorMichael Snoyman <michael@snoyman.com> dateFri 12 Dec 2014, 15:48 (12 years ago) parent8acf2210eb8ce6
2 files changed+9−11
Stackage/Config.hs+8−10 stackage.cabal+1−1
Stackage/Config.hs+8−10
@@ -254,6 +254,9 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
254254
255255 -- Often run out of inotify handles
256256 add "fsnotify"
257+
258+ -- Requires a correctly set up Postgres instance
259+ add "opaleye"
257260 where
258261 add = tell . singleton . PackageName
259262
@@ -340,14 +343,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
340343 mapM_ (add "Alan Zimmerman") $ words
341344 "hjsmin language-javascript"
342345
343− {-
344−
345− https://github.com/fpco/stackage/issues/320
346−
347346 when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $
348347 mapM_ (add "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>") $ words
349348 "mandrill"
350− -}
351349
352350 mapM_ (add "Jasper Van der Jeugt") $ words
353351 "blaze-html blaze-markup stylish-haskell"
@@ -475,9 +473,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
475473 "base-unicode-symbols containers-unicode-symbols"
476474
477475 if ghcVer >= GhcMajorVersion 7 8
478− then add "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate"
476+ then add "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au>" "accelerate"
479477 else do
480− addRange "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate" "< 0.15"
478+ addRange "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au>" "accelerate" "< 0.15"
481479 addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
482480
483481 mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
@@ -726,9 +724,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
726724 -- https://github.com/fpco/stackage/issues/354
727725 addRange "Michael Snoyman" "JuicyPixels" "< 3.2"
728726
729− -- https://github.com/fpco/stackage/issues/355
730− addRange "Michael Snoyman" "hashtables" "< 1.2"
731−
732727 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
733728 -- Yay workarounds for unnecessarily old versions
734729 let peg x y = addRange "Haskell Platform" x y
@@ -750,6 +745,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
750745 peg "HandsomeSoup" "< 0.3.3"
751746 peg "network-uri" "< 2.6"
752747
748+ mapM_ (add "Tom Ellis <tom-stackage@jaguarpaw.co.uk>") $ words
749+ "opaleye product-profunctors"
750+
753751add :: String -> String -> Writer PackageMap ()
754752add maintainer package = addRange maintainer package "-any"
755753
stackage.cabal+1−1
@@ -55,7 +55,7 @@ library
5555 , transformers
5656 , process
5757 , old-locale
58− , time
58+ , time < 1.5
5959 , utf8-string
6060
6161 , conduit-extra