haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-02 09:30:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include alex/happy, workarounds for Mac/Windows #278

Browse Source
This commit is contained in:
Michael Snoyman 2014-08-17 10:37:44 +03:00
parent 0bb3e90361
commit e2d9fd1da2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Stackage/Config.hs
View File

@ -224,6 +224,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"
] ]
when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support
mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<< mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<

7
Stackage/ServerFiles.hs
View File

@ -10,6 +10,7 @@ import Control.Exception (throwIO)
import qualified Codec.Archive.Tar as Tar import qualified Codec.Archive.Tar as Tar
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import Control.Arrow (second) import Control.Arrow (second)
import Control.Monad (unless)
import Distribution.Text (display) import Distribution.Text (display)
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
import System.FilePath ((</>), (<.>)) import System.FilePath ((</>), (<.>))
@ -47,6 +48,12 @@ createHackageFile isInc ii ghcVer date hackageH tarballH = do
, filter (/= '.') ghcVer , filter (/= '.') ghcVer
, if isInc then "-inclusive" else "-exclusive" , if isInc then "-inclusive" else "-exclusive"
] ]
unless isInc $ do
-- Add in some OS-specific package/version combos to work with
-- non-Linux systems.
hPutStrLn hackageH "hfsevents-0.1.5"
hPutStrLn hackageH "Win32-notify-0.3"
where where
selected = Map.fromList . map toStrs . Map.toList $ selected = Map.fromList . map toStrs . Map.toList $
fmap spiVersion (iiPackages ii) fmap spiVersion (iiPackages ii)