haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-31 16:40:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Various fixes around pandoc

Browse Source
This commit is contained in:
Michael Snoyman 2014-09-12 10:07:41 +03:00
parent f717c007b6
commit 75528f730e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stackage/Build.hs
View File

@ -27,7 +27,7 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j
defaultBuildSettings cores version = BuildSettings defaultBuildSettings cores version = BuildSettings
{ sandboxRoot = "sandbox" { sandboxRoot = "sandbox"
, expectedFailuresBuild = defaultExpectedFailures version , expectedFailuresBuild = defaultExpectedFailures version
, extraArgs = \bs -> "-fnetwork23" : , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :
case bs of case bs of
BSTest -> [] BSTest -> []
_ -> _ ->

5
Stackage/Config.hs
View File

@ -240,7 +240,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
, "compdata hybrid-vectors" , "compdata hybrid-vectors"
, "executable-path formatting quandl-api" , "executable-path formatting quandl-api"
, "fgl hmatrix hmatrix-gsl" , "fgl hmatrix hmatrix-gsl"
, "alex happy" , "alex happy c2hs"
, "fpco-api" , "fpco-api"
] ]
-- aws persistent-mongoDB -- aws persistent-mongoDB
@ -500,6 +500,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
-- https://github.com/fpco/stackage/issues/288 -- https://github.com/fpco/stackage/issues/288
addRange "Michael Snoyman" "text" "< 1.2" addRange "Michael Snoyman" "text" "< 1.2"
-- Pandoc upper bound
addRange "Michael Snoyman" "http-client" "< 0.4"
when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
-- Yay workarounds for unnecessarily old versions -- Yay workarounds for unnecessarily old versions
let peg x y = addRange "Haskell Platform" x y let peg x y = addRange "Haskell Platform" x y