git.iko.soy/stackage
on master help sign in
Various fixes around pandoc
75528f7Michael Snoyman
Stackage/Build.hs+1−1
compare with master
unifiedsplit
@@ -27,7 +27,7 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j
27defaultBuildSettings cores version = BuildSettings
27defaultBuildSettings cores version = BuildSettings
28 { sandboxRoot = "sandbox"
28 { sandboxRoot = "sandbox"
29 , expectedFailuresBuild = defaultExpectedFailures version
29 , expectedFailuresBuild = defaultExpectedFailures version
30− , extraArgs = \bs -> "-fnetwork23" :
30+ , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :
31 case bs of
31 case bs of
32 BSTest -> []
32 BSTest -> []
33 _ ->
33 _ ->
Stackage/Config.hs+4−1
@@ -240,7 +240,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
240 , "compdata hybrid-vectors"
240 , "compdata hybrid-vectors"
241 , "executable-path formatting quandl-api"
241 , "executable-path formatting quandl-api"
242 , "fgl hmatrix hmatrix-gsl"
242 , "fgl hmatrix hmatrix-gsl"
243− , "alex happy"
243+ , "alex happy c2hs"
244 , "fpco-api"
244 , "fpco-api"
245 ]
245 ]
246 -- aws persistent-mongoDB
246 -- aws persistent-mongoDB
@@ -500,6 +500,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
500 -- https://github.com/fpco/stackage/issues/288
500 -- https://github.com/fpco/stackage/issues/288
501 addRange "Michael Snoyman" "text" "< 1.2"
501 addRange "Michael Snoyman" "text" "< 1.2"
502
502
503+ -- Pandoc upper bound
504+ addRange "Michael Snoyman" "http-client" "< 0.4"
505+
503 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
506 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
504 -- Yay workarounds for unnecessarily old versions
507 -- Yay workarounds for unnecessarily old versions
505 let peg x y = addRange "Haskell Platform" x y
508 let peg x y = addRange "Haskell Platform" x y