git.iko.soy/stackage
on master help sign in
Merge remote-tracking branch 'origin/master' into stackage2
8801ebeMichael Snoyman
Stackage/Config.hs+8−10
compare with master
unifiedsplit
@@ -254,6 +254,9 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
254
254
255 -- Often run out of inotify handles
255 -- Often run out of inotify handles
256 add "fsnotify"
256 add "fsnotify"
257+
258+ -- Requires a correctly set up Postgres instance
259+ add "opaleye"
257 where
260 where
258 add = tell . singleton . PackageName
261 add = tell . singleton . PackageName
259
262
@@ -340,14 +343,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
340 mapM_ (add "Alan Zimmerman") $ words
343 mapM_ (add "Alan Zimmerman") $ words
341 "hjsmin language-javascript"
344 "hjsmin language-javascript"
342
345
343− {-
344−
345− https://github.com/fpco/stackage/issues/320
346−
347 when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $
346 when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $
348 mapM_ (add "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>") $ words
347 mapM_ (add "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>") $ words
349 "mandrill"
348 "mandrill"
350− -}
351
349
352 mapM_ (add "Jasper Van der Jeugt") $ words
350 mapM_ (add "Jasper Van der Jeugt") $ words
353 "blaze-html blaze-markup stylish-haskell"
351 "blaze-html blaze-markup stylish-haskell"
@@ -475,9 +473,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
475 "base-unicode-symbols containers-unicode-symbols"
473 "base-unicode-symbols containers-unicode-symbols"
476
474
477 if ghcVer >= GhcMajorVersion 7 8
475 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"
479 else do
477 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"
481 addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
479 addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
482
480
483 mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
481 mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
@@ -726,9 +724,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
726 -- https://github.com/fpco/stackage/issues/354
724 -- https://github.com/fpco/stackage/issues/354
727 addRange "Michael Snoyman" "JuicyPixels" "< 3.2"
725 addRange "Michael Snoyman" "JuicyPixels" "< 3.2"
728
726
729− -- https://github.com/fpco/stackage/issues/355
730− addRange "Michael Snoyman" "hashtables" "< 1.2"
731−
732 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
727 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
733 -- Yay workarounds for unnecessarily old versions
728 -- Yay workarounds for unnecessarily old versions
734 let peg x y = addRange "Haskell Platform" x y
729 let peg x y = addRange "Haskell Platform" x y
@@ -750,6 +745,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
750 peg "HandsomeSoup" "< 0.3.3"
745 peg "HandsomeSoup" "< 0.3.3"
751 peg "network-uri" "< 2.6"
746 peg "network-uri" "< 2.6"
752
747
748+ mapM_ (add "Tom Ellis <tom-stackage@jaguarpaw.co.uk>") $ words
749+ "opaleye product-profunctors"
750+
753add :: String -> String -> Writer PackageMap ()
751add :: String -> String -> Writer PackageMap ()
754add maintainer package = addRange maintainer package "-any"
752add maintainer package = addRange maintainer package "-any"
755
753
stackage.cabal+1−1
@@ -55,7 +55,7 @@ library
55 , transformers
55 , transformers
56 , process
56 , process
57 , old-locale
57 , old-locale
58− , time
58+ , time < 1.5
59 , utf8-string
59 , utf8-string
60
60
61 , conduit-extra
61 , conduit-extra