git.iko.soy/stackage
on master help sign in
Stylish
4e6e979Michael Snoyman
Stackage/Build.hs+5−5
compare with master
unifiedsplit
@@ -2,14 +2,14 @@ module Stackage.Build
2 ( build
2 ( build
3 ) where
3 ) where
4
4
5−import Control.Monad (unless)
5+import Control.Monad (unless)
6import Stackage.CheckPlan
6import Stackage.CheckPlan
7+import Stackage.InstallInfo
7import Stackage.Test
8import Stackage.Test
8import Stackage.Util
9import Stackage.Util
9−import Stackage.InstallInfo
10−import System.Process (waitForProcess, runProcess)
11−import System.Exit (ExitCode (ExitSuccess), exitWith)
10+import System.Exit (ExitCode (ExitSuccess), exitWith)
12−import System.IO (IOMode (WriteMode), withBinaryFile)
11+import System.IO (IOMode (WriteMode), withBinaryFile)
12+import System.Process (runProcess, waitForProcess)
13
13
14build :: IO ()
14build :: IO ()
15build = do
15build = do
Stackage/CheckPlan.hs+5−5
@@ -2,12 +2,12 @@ module Stackage.CheckPlan
2 ( checkPlan
2 ( checkPlan
3 ) where
3 ) where
4
4
5−import Control.Monad (unless)
5+import Control.Monad (unless)
6−import Data.List (sort)
6+import Data.List (sort)
7−import Stackage.Types
8import Stackage.InstallInfo
7import Stackage.InstallInfo
9−import System.Process (readProcess)
8+import Stackage.Types
10−import System.Exit (ExitCode (ExitFailure), exitWith)
9+import System.Exit (ExitCode (ExitFailure), exitWith)
10+import System.Process (readProcess)
11
11
12data Mismatch = OnlyDryRun String | OnlySimpleList String
12data Mismatch = OnlyDryRun String | OnlySimpleList String
13 deriving Show
13 deriving Show
Stackage/Config.hs+7−7
@@ -1,12 +1,12 @@
1module Stackage.Config where
1module Stackage.Config where
2
2
3−import qualified Data.Map as Map
3+import Control.Monad (unless, when)
4−import Stackage.Types
5−import Control.Monad.Trans.Writer (execWriter, tell)
4+import Control.Monad.Trans.Writer (execWriter, tell)
5+import qualified Data.Map as Map
6−import Data.Set (singleton, fromList)
6+import Data.Set (fromList, singleton)
7−import Control.Monad (when, unless)
8−import Distribution.System (OS (..), buildOS)
7+import Distribution.System (OS (..), buildOS)
9−import Distribution.Text (simpleParse)
8+import Distribution.Text (simpleParse)
9+import Stackage.Types
10
10
11-- | Packages which are shipped with GHC but are not included in the
11-- | Packages which are shipped with GHC but are not included in the
12-- Haskell Platform list of core packages.
12-- Haskell Platform list of core packages.
Stackage/InstallInfo.hs+5−5
@@ -3,14 +3,14 @@ module Stackage.InstallInfo
3 , iiPackageList
3 , iiPackageList
4 ) where
4 ) where
5
5
6−import Stackage.Types
6+import qualified Data.Map as Map
7−import Stackage.Util
7+import qualified Data.Set as Set
8import Stackage.Config
8import Stackage.Config
9+import Stackage.HaskellPlatform
9import Stackage.LoadDatabase
10import Stackage.LoadDatabase
10import Stackage.NarrowDatabase
11import Stackage.NarrowDatabase
11−import Stackage.HaskellPlatform
12+import Stackage.Types
12−import qualified Data.Map as Map
13+import Stackage.Util
13−import qualified Data.Set as Set
14
14
15getInstallInfo :: IO InstallInfo
15getInstallInfo :: IO InstallInfo
16getInstallInfo = do
16getInstallInfo = do
Stackage/Test.hs+10−9
@@ -2,17 +2,18 @@ module Stackage.Test
2 ( runTestSuites
2 ( runTestSuites
3 ) where
3 ) where
4
4
5−import Control.Monad (when, foldM)
5+import Control.Monad (foldM, when)
6−import qualified Data.Map as Map
6+import qualified Data.Map as Map
7−import qualified Data.Set as Set
7+import qualified Data.Set as Set
8+import Stackage.Config
8import Stackage.Types
9import Stackage.Types
9import Stackage.Util
10import Stackage.Util
10−import Stackage.Config
11−import System.Directory (removeFile, createDirectory)
11+import System.Directory (createDirectory, removeFile)
12−import System.Process (waitForProcess, runProcess)
13−import System.Exit (ExitCode (ExitSuccess))
12+import System.Exit (ExitCode (ExitSuccess))
14−import System.FilePath ((</>), (<.>))
13+import System.FilePath ((<.>), (</>))
15−import System.IO (IOMode (WriteMode, AppendMode), withBinaryFile)
14+import System.IO (IOMode (WriteMode, AppendMode),
15+ withBinaryFile)
16+import System.Process (runProcess, waitForProcess)
16
17
17runTestSuites :: InstallInfo -> IO ()
18runTestSuites :: InstallInfo -> IO ()
18runTestSuites ii = do
19runTestSuites ii = do
Stackage/Types.hs+1−1
@@ -40,6 +40,6 @@ instance Monoid HaskellPlatform where
40 HaskellPlatform a x `mappend` HaskellPlatform b y = HaskellPlatform (mappend a b) (mappend x y)
40 HaskellPlatform a x `mappend` HaskellPlatform b y = HaskellPlatform (mappend a b) (mappend x y)
41
41
42data InstallInfo = InstallInfo
42data InstallInfo = InstallInfo
43− { iiCore :: Set PackageName
43+ { iiCore :: Set PackageName
44 , iiPackages :: Map PackageName Version
44 , iiPackages :: Map PackageName Version
45 }
45 }
Stackage/Util.hs+4−3
@@ -1,12 +1,13 @@
1module Stackage.Util where
1module Stackage.Util where
2
2
3+import Control.Monad (when)
3import qualified Data.Map as Map
4import qualified Data.Map as Map
4import qualified Data.Set as Set
5import qualified Data.Set as Set
6+import Data.Version (showVersion)
5import Distribution.Version (thisVersion)
7import Distribution.Version (thisVersion)
6−import Data.Version (showVersion)
7import Stackage.Types
8import Stackage.Types
8−import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
9+import System.Directory (doesDirectoryExist,
9−import Control.Monad (when)
10+ removeDirectoryRecursive)
10
11
11identsToRanges :: Set PackageIdentifier -> Map PackageName VersionRange
12identsToRanges :: Set PackageIdentifier -> Map PackageName VersionRange
12identsToRanges =
13identsToRanges =