git.iko.soy/stackage
on master help sign in
Stylish
commit4e6e979e90d5d7027f8904eb1e686d4454321fc6 authorMichael Snoyman <michael@snoyman.com> dateThu 22 Nov 2012, 09:27 (14 years ago) parent4be1358
7 files changed+37−35
compare with master
unifiedsplit
Stackage/Build.hs+5−5 Stackage/CheckPlan.hs+5−5 Stackage/Config.hs+7−7 Stackage/InstallInfo.hs+5−5 Stackage/Test.hs+10−9 Stackage/Types.hs+1−1 Stackage/Util.hs+4−3
Stackage/Build.hs+5−5
@@ -2,14 +2,14 @@ module Stackage.Build
22 ( build
33 ) where
44
5−import Control.Monad (unless)
5+import Control.Monad (unless)
66import Stackage.CheckPlan
7+import Stackage.InstallInfo
78import Stackage.Test
89import Stackage.Util
9−import Stackage.InstallInfo
10−import System.Process (waitForProcess, runProcess)
11−import System.Exit (ExitCode (ExitSuccess), exitWith)
12−import System.IO (IOMode (WriteMode), withBinaryFile)
10+import System.Exit (ExitCode (ExitSuccess), exitWith)
11+import System.IO (IOMode (WriteMode), withBinaryFile)
12+import System.Process (runProcess, waitForProcess)
1313
1414build :: IO ()
1515build = do
Stackage/CheckPlan.hs+5−5
@@ -2,12 +2,12 @@ module Stackage.CheckPlan
22 ( checkPlan
33 ) where
44
5−import Control.Monad (unless)
6−import Data.List (sort)
7−import Stackage.Types
5+import Control.Monad (unless)
6+import Data.List (sort)
87import Stackage.InstallInfo
9−import System.Process (readProcess)
10−import System.Exit (ExitCode (ExitFailure), exitWith)
8+import Stackage.Types
9+import System.Exit (ExitCode (ExitFailure), exitWith)
10+import System.Process (readProcess)
1111
1212data Mismatch = OnlyDryRun String | OnlySimpleList String
1313 deriving Show
Stackage/Config.hs+7−7
@@ -1,12 +1,12 @@
11module Stackage.Config where
22
3−import qualified Data.Map as Map
4−import Stackage.Types
5−import Control.Monad.Trans.Writer (execWriter, tell)
6−import Data.Set (singleton, fromList)
7−import Control.Monad (when, unless)
8−import Distribution.System (OS (..), buildOS)
9−import Distribution.Text (simpleParse)
3+import Control.Monad (unless, when)
4+import Control.Monad.Trans.Writer (execWriter, tell)
5+import qualified Data.Map as Map
6+import Data.Set (fromList, singleton)
7+import Distribution.System (OS (..), buildOS)
8+import Distribution.Text (simpleParse)
9+import Stackage.Types
1010
1111-- | Packages which are shipped with GHC but are not included in the
1212-- Haskell Platform list of core packages.
Stackage/InstallInfo.hs+5−5
@@ -3,14 +3,14 @@ module Stackage.InstallInfo
33 , iiPackageList
44 ) where
55
6−import Stackage.Types
7−import Stackage.Util
6+import qualified Data.Map as Map
7+import qualified Data.Set as Set
88import Stackage.Config
9+import Stackage.HaskellPlatform
910import Stackage.LoadDatabase
1011import Stackage.NarrowDatabase
11−import Stackage.HaskellPlatform
12−import qualified Data.Map as Map
13−import qualified Data.Set as Set
12+import Stackage.Types
13+import Stackage.Util
1414
1515getInstallInfo :: IO InstallInfo
1616getInstallInfo = do
Stackage/Test.hs+10−9
@@ -2,17 +2,18 @@ module Stackage.Test
22 ( runTestSuites
33 ) where
44
5−import Control.Monad (when, foldM)
6−import qualified Data.Map as Map
7−import qualified Data.Set as Set
5+import Control.Monad (foldM, when)
6+import qualified Data.Map as Map
7+import qualified Data.Set as Set
8+import Stackage.Config
89import Stackage.Types
910import Stackage.Util
10−import Stackage.Config
11−import System.Directory (removeFile, createDirectory)
12−import System.Process (waitForProcess, runProcess)
13−import System.Exit (ExitCode (ExitSuccess))
14−import System.FilePath ((</>), (<.>))
15−import System.IO (IOMode (WriteMode, AppendMode), withBinaryFile)
11+import System.Directory (createDirectory, removeFile)
12+import System.Exit (ExitCode (ExitSuccess))
13+import System.FilePath ((<.>), (</>))
14+import System.IO (IOMode (WriteMode, AppendMode),
15+ withBinaryFile)
16+import System.Process (runProcess, waitForProcess)
1617
1718runTestSuites :: InstallInfo -> IO ()
1819runTestSuites ii = do
Stackage/Types.hs+1−1
@@ -40,6 +40,6 @@ instance Monoid HaskellPlatform where
4040 HaskellPlatform a x `mappend` HaskellPlatform b y = HaskellPlatform (mappend a b) (mappend x y)
4141
4242data InstallInfo = InstallInfo
43− { iiCore :: Set PackageName
43+ { iiCore :: Set PackageName
4444 , iiPackages :: Map PackageName Version
4545 }
Stackage/Util.hs+4−3
@@ -1,12 +1,13 @@
11module Stackage.Util where
22
3+import Control.Monad (when)
34import qualified Data.Map as Map
45import qualified Data.Set as Set
6+import Data.Version (showVersion)
57import Distribution.Version (thisVersion)
6−import Data.Version (showVersion)
78import Stackage.Types
8−import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
9−import Control.Monad (when)
9+import System.Directory (doesDirectoryExist,
10+ removeDirectoryRecursive)
1011
1112identsToRanges :: Set PackageIdentifier -> Map PackageName VersionRange
1213identsToRanges =