GHC 7.0 support

This commit is contained in:
Michael Snoyman 2013-10-19 21:03:50 +03:00
parent c6623d61f1
commit 67d531bc52
4 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,6 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TypeSynonymInstances #-}
module Stackage.BuildPlan module Stackage.BuildPlan
( readBuildPlan ( readBuildPlan
, writeBuildPlan , writeBuildPlan

View File

@ -5,6 +5,7 @@ module Stackage.InstallInfo
) where ) where
import Control.Monad (forM_, unless) import Control.Monad (forM_, unless)
import Data.List (foldl')
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Version (showVersion) import Data.Version (showVersion)
@ -23,7 +24,7 @@ dropExcluded :: SelectSettings
-> Map PackageName (VersionRange, Maintainer) -> Map PackageName (VersionRange, Maintainer)
-> Map PackageName (VersionRange, Maintainer) -> Map PackageName (VersionRange, Maintainer)
dropExcluded bs m0 = dropExcluded bs m0 =
Set.foldl' (flip Map.delete) m0 (excludedPackages bs) foldl' (flip Map.delete) m0 (Set.toList $ excludedPackages bs)
getInstallInfo :: SelectSettings -> IO InstallInfo getInstallInfo :: SelectSettings -> IO InstallInfo
getInstallInfo settings = do getInstallInfo settings = do

View File

@ -1,6 +1,7 @@
module Stackage.NarrowDatabase where module Stackage.NarrowDatabase where
import Control.Monad.Trans.Writer import Control.Monad.Trans.Writer
import Data.List (foldl')
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
import Prelude hiding (pi) import Prelude hiding (pi)
@ -46,7 +47,7 @@ narrowPackageDB settings core (PackageDB pdb) packageSet =
, msg , msg
] ]
Right () -> return () Right () -> return ()
loop result' $ Set.foldl' (addDep users' result' maintainer) toProcess' $ Map.keysSet $ piDeps pi loop result' $ foldl' (addDep users' result' maintainer) toProcess' $ Map.keys $ piDeps pi
addDep users result maintainer toProcess p = addDep users result maintainer toProcess p =
case Map.lookup p result of case Map.lookup p result of
Nothing -> Set.insert (users, p, maintainer) toProcess Nothing -> Set.insert (users, p, maintainer) toProcess

View File

@ -30,7 +30,7 @@ library
Stackage.GhcPkg Stackage.GhcPkg
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, containers , containers
, Cabal , Cabal >= 1.14
, tar >= 0.3 , tar >= 0.3
, zlib , zlib
, bytestring , bytestring