67d531b · stackage · git.iko.soy

git.iko.soy/stackage

GHC 7.0 support

commit67d531bc52ee65f983b82bfb457aaafebe8059b3 authorMichael Snoyman <michael@snoyman.com> dateSat 19 Oct 2013, 21:03 (13 years ago) parentc6623d6

4 files changed+6−3

compare with master

unifiedsplit

Stackage/BuildPlan.hs+1 Stackage/InstallInfo.hs+2−1 Stackage/NarrowDatabase.hs+2−1 stackage.cabal+1−1

Stackage/BuildPlan.hs+1

@@ -1,5 +1,6 @@

11{-# LANGUAGE FlexibleInstances #-}

22{-# LANGUAGE RecordWildCards #-}

3+{-# LANGUAGE TypeSynonymInstances #-}

34module Stackage.BuildPlan

45 ( readBuildPlan

56 , writeBuildPlan

Stackage/InstallInfo.hs+2−1

@@ -5,6 +5,7 @@ module Stackage.InstallInfo

55 ) where

77import Control.Monad (forM_, unless)

8+import Data.List (foldl')

89import qualified Data.Map as Map

910import qualified Data.Set as Set

1011import Data.Version (showVersion)

@@ -23,7 +24,7 @@ dropExcluded :: SelectSettings

2324 -> Map PackageName (VersionRange, Maintainer)

2425 -> Map PackageName (VersionRange, Maintainer)

2526dropExcluded bs m0 =

26− Set.foldl' (flip Map.delete) m0 (excludedPackages bs)

27+ foldl' (flip Map.delete) m0 (Set.toList $ excludedPackages bs)

2728

2829getInstallInfo :: SelectSettings -> IO InstallInfo

2930getInstallInfo settings = do

Stackage/NarrowDatabase.hs+2−1

@@ -1,6 +1,7 @@

11module Stackage.NarrowDatabase where

33import Control.Monad.Trans.Writer

4+import Data.List (foldl')

45import qualified Data.Map as Map

56import qualified Data.Set as Set

67import Prelude hiding (pi)

@@ -46,7 +47,7 @@ narrowPackageDB settings core (PackageDB pdb) packageSet =

4647 , msg

4748 ]

4849 Right () -> return ()

49− loop result' $ Set.foldl' (addDep users' result' maintainer) toProcess' $ Map.keysSet $ piDeps pi

50+ loop result' $ foldl' (addDep users' result' maintainer) toProcess' $ Map.keys $ piDeps pi

5051 addDep users result maintainer toProcess p =

5152 case Map.lookup p result of

5253 Nothing -> Set.insert (users, p, maintainer) toProcess

stackage.cabal+1−1

@@ -30,7 +30,7 @@ library

3030 Stackage.GhcPkg

3131 build-depends: base >= 4 && < 5

3232 , containers

33− , Cabal

33+ , Cabal >= 1.14

3434 , tar >= 0.3

3535 , zlib

3636 , bytestring