on master help sign in
Various fixes around pandoc
commit75528f730e16d07437f160ccc4f2356050edbbbc authorMichael Snoyman <michael@snoyman.com> dateFri 12 Sep 2014, 10:07 (12 years ago) parentf717c00
2 files changed+5−2
Stackage/Build.hs+1−1 Stackage/Config.hs+4−1
Stackage/Build.hs+1−1
@@ -27,7 +27,7 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j
2727defaultBuildSettings cores version = BuildSettings
2828 { sandboxRoot = "sandbox"
2929 , expectedFailuresBuild = defaultExpectedFailures version
30− , extraArgs = \bs -> "-fnetwork23" :
30+ , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :
3131 case bs of
3232 BSTest -> []
3333 _ ->
Stackage/Config.hs+4−1
@@ -240,7 +240,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
240240 , "compdata hybrid-vectors"
241241 , "executable-path formatting quandl-api"
242242 , "fgl hmatrix hmatrix-gsl"
243− , "alex happy"
243+ , "alex happy c2hs"
244244 , "fpco-api"
245245 ]
246246 -- aws persistent-mongoDB
@@ -500,6 +500,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
500500 -- https://github.com/fpco/stackage/issues/288
501501 addRange "Michael Snoyman" "text" "< 1.2"
502502
503+ -- Pandoc upper bound
504+ addRange "Michael Snoyman" "http-client" "< 0.4"
505+
503506 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
504507 -- Yay workarounds for unnecessarily old versions
505508 let peg x y = addRange "Haskell Platform" x y