on master help sign in
Include alex/happy, workarounds for Mac/Windows #278
e2d9fd1Michael Snoyman
Stackage/Config.hs+1
@@ -224,6 +224,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
224 , "compdata hybrid-vectors"
224 , "compdata hybrid-vectors"
225 , "executable-path formatting quandl-api"
225 , "executable-path formatting quandl-api"
226 , "fgl hmatrix hmatrix-gsl"
226 , "fgl hmatrix hmatrix-gsl"
227+ , "alex happy"
227 ]
228 ]
228 when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support
229 when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support
229 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
230 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
Stackage/ServerFiles.hs+7
@@ -10,6 +10,7 @@ import Control.Exception (throwIO)
10import qualified Codec.Archive.Tar as Tar
10import qualified Codec.Archive.Tar as Tar
11import qualified Data.ByteString.Lazy as L
11import qualified Data.ByteString.Lazy as L
12import Control.Arrow (second)
12import Control.Arrow (second)
13+import Control.Monad (unless)
13import Distribution.Text (display)
14import Distribution.Text (display)
14import System.Directory (doesFileExist)
15import System.Directory (doesFileExist)
15import System.FilePath ((</>), (<.>))
16import System.FilePath ((</>), (<.>))
@@ -47,6 +48,12 @@ createHackageFile isInc ii ghcVer date hackageH tarballH = do
47 , filter (/= '.') ghcVer
48 , filter (/= '.') ghcVer
48 , if isInc then "-inclusive" else "-exclusive"
49 , if isInc then "-inclusive" else "-exclusive"
49 ]
50 ]
51+
52+ unless isInc $ do
53+ -- Add in some OS-specific package/version combos to work with
54+ -- non-Linux systems.
55+ hPutStrLn hackageH "hfsevents-0.1.5"
56+ hPutStrLn hackageH "Win32-notify-0.3"
50 where
57 where
51 selected = Map.fromList . map toStrs . Map.toList $
58 selected = Map.fromList . map toStrs . Map.toList $
52 fmap spiVersion (iiPackages ii)
59 fmap spiVersion (iiPackages ii)