diff --git a/Stackage/Build.hs b/Stackage/Build.hs index 16778e37..ff3a48e7 100644 --- a/Stackage/Build.hs +++ b/Stackage/Build.hs @@ -27,7 +27,7 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j defaultBuildSettings cores version = BuildSettings { sandboxRoot = "sandbox" , expectedFailuresBuild = defaultExpectedFailures version - , extraArgs = \bs -> "-fnetwork23" : + , extraArgs = \bs -> "-fnetwork23" : "-fhttps" : case bs of BSTest -> [] _ -> diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 002a08ca..4d49dc27 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -240,7 +240,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do , "compdata hybrid-vectors" , "executable-path formatting quandl-api" , "fgl hmatrix hmatrix-gsl" - , "alex happy" + , "alex happy c2hs" , "fpco-api" ] -- aws persistent-mongoDB @@ -500,6 +500,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do -- https://github.com/fpco/stackage/issues/288 addRange "Michael Snoyman" "text" "< 1.2" + -- Pandoc upper bound + addRange "Michael Snoyman" "http-client" "< 0.4" + when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do -- Yay workarounds for unnecessarily old versions let peg x y = addRange "Haskell Platform" x y