6ba5db2 · stackage · git.iko.soy

git.iko.soy/stackage

Stylish Haskell

commit6ba5db21b7938d6f62b2a7da77da78d2aa64a00f authorMichael Snoyman <michael@snoyman.com> dateMon 28 Jan 2013, 14:48 (14 years ago) parentb41130b

10 files changed+80−81

compare with master

unifiedsplit

Stackage/Build.hs+8−8 Stackage/BuildPlan.hs+5−5 Stackage/CheckPlan.hs+8−8 Stackage/InstallInfo.hs+1−1 Stackage/NarrowDatabase.hs+4−4 Stackage/Select.hs+1−1 Stackage/Test.hs+2−2 Stackage/Types.hs+19−19 Stackage/Util.hs+19−20 app/stackage.hs+13−13

Stackage/Build.hs+8−8

@@ -4,18 +4,18 @@ module Stackage.Build

44 , BuildSettings (..)

55 ) where

7−import Control.Monad (unless)

8−import Prelude hiding (pi)

7+import Control.Monad (unless)

8+import Prelude hiding (pi)

9+import Stackage.CheckCabalVersion (checkCabalVersion)

910import Stackage.Config

1011import Stackage.InstallInfo

1112import Stackage.Types

1213import Stackage.Util

13−import System.Exit (ExitCode (ExitSuccess), exitWith)

14−import System.IO (IOMode (WriteMode), hPutStrLn,

15− withBinaryFile)

16−import System.Process (rawSystem, runProcess,

17− waitForProcess)

18−import Stackage.CheckCabalVersion (checkCabalVersion)

14+import System.Exit (ExitCode (ExitSuccess), exitWith)

15+import System.IO (IOMode (WriteMode), hPutStrLn,

16+ withBinaryFile)

17+import System.Process (rawSystem, runProcess,

18+ waitForProcess)

1919

2020defaultBuildSettings :: BuildSettings

2121defaultBuildSettings = BuildSettings

Stackage/BuildPlan.hs+5−5

@@ -1,14 +1,14 @@

1−{-# LANGUAGE RecordWildCards #-}

21{-# LANGUAGE FlexibleInstances #-}

2+{-# LANGUAGE RecordWildCards #-}

33module Stackage.BuildPlan

44 ( readBuildPlan

55 , writeBuildPlan

66 ) where

8−import Stackage.Types

9−import qualified Data.Map as Map

10−import qualified Data.Set as Set

11−import Distribution.Text (simpleParse, display)

8+import qualified Data.Map as Map

9+import qualified Data.Set as Set

10+import Distribution.Text (display, simpleParse)

11+import Stackage.Types

1212

1313readBuildPlan :: FilePath -> IO BuildPlan

1414readBuildPlan fp = do

Stackage/CheckPlan.hs+8−8

@@ -2,17 +2,17 @@ module Stackage.CheckPlan

22 ( checkPlan

33 ) where

5−import Control.Monad (unless, when)

6−import Data.List (isPrefixOf, sort)

7−import qualified Data.Map as Map

8−import qualified Data.Set as Set

5+import Control.Monad (unless, when)

6+import Data.List (isPrefixOf, sort)

7+import qualified Data.Map as Map

8+import qualified Data.Set as Set

9+import Stackage.CheckCabalVersion (checkCabalVersion)

910import Stackage.InstallInfo

1011import Stackage.Types

1112import Stackage.Util

12−import System.Exit (ExitCode (ExitFailure, ExitSuccess),

13− exitWith)

14−import System.Process (readProcessWithExitCode)

15−import Stackage.CheckCabalVersion (checkCabalVersion)

13+import System.Exit (ExitCode (ExitFailure, ExitSuccess),

14+ exitWith)

15+import System.Process (readProcessWithExitCode)

1616

1717data Mismatch = OnlyDryRun String | OnlySimpleList String

1818 deriving Show

Stackage/InstallInfo.hs+1−1

@@ -9,7 +9,7 @@ import qualified Data.Map as Map

99import qualified Data.Set as Set

1010import Data.Version (showVersion)

1111import qualified Distribution.Text

12−import Distribution.Version (withinRange, simplifyVersionRange)

12+import Distribution.Version (simplifyVersionRange, withinRange)

1313import Stackage.HaskellPlatform

1414import Stackage.LoadDatabase

1515import Stackage.NarrowDatabase

Stackage/NarrowDatabase.hs+4−4

@@ -1,12 +1,12 @@

11module Stackage.NarrowDatabase where

33import Control.Monad.Trans.Writer

4−import qualified Data.Map as Map

5−import qualified Data.Set as Set

6−import Prelude hiding (pi)

4+import qualified Data.Map as Map

5+import qualified Data.Set as Set

6+import Prelude hiding (pi)

77import Stackage.Types

88import Stackage.Util

9−import System.Exit (exitFailure)

9+import System.Exit (exitFailure)

1010

1111-- | Narrow down the database to only the specified packages and all of

1212-- their dependencies.

Stackage/Select.hs+1−1

@@ -3,9 +3,9 @@ module Stackage.Select

33 , defaultSelectSettings

44 ) where

6+import Data.Either (partitionEithers)

67import qualified Data.Map as Map

78import Data.Maybe (mapMaybe)

8−import Data.Either (partitionEithers)

99import Data.Set (empty)

1010import qualified Data.Set as Set

1111import Prelude hiding (pi)

Stackage/Test.hs+2−2

@@ -5,8 +5,8 @@ module Stackage.Test

55 ) where

77import qualified Control.Concurrent as C

8−import Control.Exception (Exception, handle, throwIO, SomeException)

9−import Control.Monad (unless, when, replicateM)

8+import Control.Exception (Exception, SomeException, handle, throwIO)

9+import Control.Monad (replicateM, unless, when)

1010import qualified Data.Map as Map

1111import qualified Data.Set as Set

1212import Data.Typeable (Typeable)

Stackage/Types.hs+19−19

@@ -3,16 +3,16 @@ module Stackage.Types

33 , module Stackage.Types

44 ) where

6−import Data.Map as X (Map)

7−import Data.Map (unionWith)

8−import Data.Monoid (Monoid (..))

9−import Data.Set as X (Set)

10−import Data.Version as X (Version)

11−import Distribution.Package as X (PackageIdentifier (..),

12− PackageName (..))

13−import Distribution.Version as X (VersionRange (..))

14−import Distribution.Version (intersectVersionRanges)

15−import Distribution.PackageDescription (GenericPackageDescription)

6+import Data.Map as X (Map)

7+import Data.Map (unionWith)

8+import Data.Monoid (Monoid (..))

9+import Data.Set as X (Set)

10+import Data.Version as X (Version)

11+import Distribution.Package as X (PackageIdentifier (..),

12+ PackageName (..))

13+import Distribution.PackageDescription (GenericPackageDescription)

14+import Distribution.Version as X (VersionRange (..))

15+import Distribution.Version (intersectVersionRanges)

1616

1717newtype PackageDB = PackageDB (Map PackageName PackageInfo)

1818 deriving (Show, Eq)

@@ -70,17 +70,17 @@ data InstallInfo = InstallInfo

7070 }

7171

7272data SelectedPackageInfo = SelectedPackageInfo

73− { spiVersion :: Version

73+ { spiVersion :: Version

7474 , spiMaintainer :: Maintainer

7575 , spiGithubUser :: Maybe String

76− , spiHasTests :: Bool

76+ , spiHasTests :: Bool

7777 }

7878 deriving (Show, Read)

7979

8080data BuildPlan = BuildPlan

81− { bpTools :: [String]

82− , bpPackages :: Map PackageName SelectedPackageInfo

83− , bpCore :: Set PackageName

81+ { bpTools :: [String]

82+ , bpPackages :: Map PackageName SelectedPackageInfo

83+ , bpCore :: Set PackageName

8484 , bpOptionalCore :: Map PackageName Version

8585 -- ^ See 'iiOptionalCore'

8686 }

@@ -111,10 +111,10 @@ data SelectSettings = SelectSettings

111111 }

112112

113113data BuildSettings = BuildSettings

114− { sandboxRoot :: FilePath

115− , extraArgs :: [String]

116− , expectedFailuresBuild :: Set PackageName

117− , testWorkerThreads :: Int

114+ { sandboxRoot :: FilePath

115+ , extraArgs :: [String]

116+ , expectedFailuresBuild :: Set PackageName

117+ , testWorkerThreads :: Int

118118 -- ^ How many threads to spawn for running test suites.

119119 }

120120

Stackage/Util.hs+19−20

@@ -1,27 +1,26 @@

11{-# LANGUAGE CPP #-}

22module Stackage.Util where

4−import qualified Codec.Archive.Tar as Tar

5−import qualified Codec.Archive.Tar.Entry as TarEntry

6−import Control.Monad (guard, when)

7−import Data.List (stripPrefix)

8−import qualified Data.Map as Map

9−import qualified Data.Set as Set

10−import Data.Version (showVersion)

11−import Distribution.Text (simpleParse, display)

12−import Distribution.Version (thisVersion)

13−import Stackage.Types

14−import System.Directory (doesDirectoryExist,

15− removeDirectoryRecursive)

16−import System.Directory (getAppUserDataDirectory)

17−import System.Environment (getEnvironment)

18−import System.FilePath ((</>))

19−import qualified Distribution.Package as P

4+import qualified Codec.Archive.Tar as Tar

5+import qualified Codec.Archive.Tar.Entry as TarEntry

6+import Control.Monad (guard, when)

7+import Data.List (stripPrefix)

8+import qualified Data.Map as Map

9+import qualified Data.Set as Set

10+import Data.Version (showVersion)

11+import Distribution.License (License (..))

12+import qualified Distribution.Package as P

2013import qualified Distribution.PackageDescription as PD

21−import Distribution.License (License (..))

22−import System.Directory (canonicalizePath,

23− createDirectoryIfMissing

24− )

14+import Distribution.Text (display, simpleParse)

15+import Distribution.Version (thisVersion)

16+import Stackage.Types

17+import System.Directory (doesDirectoryExist,

18+ removeDirectoryRecursive)

19+import System.Directory (getAppUserDataDirectory)

20+import System.Directory (canonicalizePath,

21+ createDirectoryIfMissing)

22+import System.Environment (getEnvironment)

23+import System.FilePath ((</>))

2524

2625-- | Allow only packages with permissive licenses.

2726allowPermissive :: [String] -- ^ list of explicitly allowed packages

app/stackage.hs+13−13

@@ -1,23 +1,23 @@

11{-# LANGUAGE RecordWildCards #-}

2−import Stackage.Types

2+import Data.Set (fromList)

33import Stackage.Build (build, defaultBuildSettings)

4+import Stackage.BuildPlan (readBuildPlan, writeBuildPlan)

5+import Stackage.CheckPlan (checkPlan)

46import Stackage.Init (stackageInit)

5−import Stackage.Util (allowPermissive)

67import Stackage.Select (defaultSelectSettings, select)

7−import Stackage.CheckPlan (checkPlan)

8+import Stackage.Tarballs (makeTarballs)

9+import Stackage.Test (runTestSuites)

10+import Stackage.Types

11+import Stackage.Util (allowPermissive)

812import System.Environment (getArgs, getProgName)

9−import Data.Set (fromList)

1013import System.IO (hFlush, stdout)

11−import Stackage.BuildPlan (readBuildPlan, writeBuildPlan)

12−import Stackage.Test (runTestSuites)

13−import Stackage.Tarballs (makeTarballs)

1414

1515data SelectArgs = SelectArgs

16− { excluded :: [String]

17− , noPlatform :: Bool

16+ { excluded :: [String]

17+ , noPlatform :: Bool

1818 , onlyPermissive :: Bool

19− , allowed :: [String]

20− , buildPlanDest :: FilePath

19+ , allowed :: [String]

20+ , buildPlanDest :: FilePath

2121 }

2222

2323parseSelectArgs :: [String] -> IO SelectArgs

@@ -39,9 +39,9 @@ parseSelectArgs =

3939 loop _ (y:_) = error $ "Did not understand argument: " ++ y

4040

4141data BuildArgs = BuildArgs

42− { sandbox :: String

42+ { sandbox :: String

4343 , buildPlanSrc :: FilePath

44− , extraArgs' :: [String] -> [String]

44+ , extraArgs' :: [String] -> [String]

4545 }

4646

4747parseBuildArgs :: [String] -> IO BuildArgs