on master help sign in
stylish-haskell cleanup
commitd6c659c7fbb489682714445de23d28d45c1a8812 authorMichael Snoyman <michael@snoyman.com> dateTue 16 Dec 2014, 09:28 (12 years ago) parent944654b
9 files changed+74−71
Stackage/BuildPlan.hs+3−3 Stackage/CheckBuildPlan.hs+6−6 Stackage/CompleteBuild.hs+5−5 Stackage/CorePackages.hs+3−3 Stackage/PackageDescription.hs+1−1 Stackage/PerformBuild.hs+38−35 Stackage/ServerBundle.hs+9−9 Stackage/UpdateBuildPlan.hs+3−3 Stackage/Upload.hs+6−6
Stackage/BuildPlan.hs+3−3
@@ -29,9 +29,9 @@ import Stackage.PackageIndex
2929import Stackage.Prelude
3030
3131data BuildPlan = BuildPlan
32− { bpSystemInfo :: SystemInfo
33− , bpTools :: Vector (PackageName, Version)
34− , bpPackages :: Map PackageName PackagePlan
32+ { bpSystemInfo :: SystemInfo
33+ , bpTools :: Vector (PackageName, Version)
34+ , bpPackages :: Map PackageName PackagePlan
3535 , bpGithubUsers :: Map Text (Set Text)
3636 }
3737 deriving (Show, Eq)
Stackage/CheckBuildPlan.hs+6−6
@@ -9,12 +9,12 @@ module Stackage.CheckBuildPlan
99 ( checkBuildPlan
1010 ) where
1111
12−import Control.Monad.Writer.Strict (Writer, execWriter, tell)
13−import Stackage.BuildConstraints
14−import Stackage.BuildPlan
15−import Stackage.PackageDescription
16−import Stackage.Prelude
17−import qualified Data.Text as T
12+import Control.Monad.Writer.Strict (Writer, execWriter, tell)
13+import qualified Data.Text as T
14+import Stackage.BuildConstraints
15+import Stackage.BuildPlan
16+import Stackage.PackageDescription
17+import Stackage.Prelude
1818
1919-- FIXME check cycles in dependencies, only looking at libraries and
2020-- executables
Stackage/CompleteBuild.hs+5−5
@@ -6,11 +6,11 @@ module Stackage.CompleteBuild
66 , BumpType (..)
77 , completeBuild
88 ) where
9−import Data.Default.Class (def)
10−import Data.Semigroup (Max (..), Option (..))
11−import Data.Text.Read (decimal)
9+import Data.Default.Class (def)
10+import Data.Semigroup (Max (..), Option (..))
11+import Data.Text.Read (decimal)
1212import Data.Time
13−import Data.Yaml (decodeFileEither, encodeFile)
13+import Data.Yaml (decodeFileEither, encodeFile)
1414import Network.HTTP.Client
1515import Stackage.BuildConstraints
1616import Stackage.BuildPlan
@@ -20,7 +20,7 @@ import Stackage.Prelude
2020import Stackage.ServerBundle
2121import Stackage.UpdateBuildPlan
2222import Stackage.Upload
23−import System.IO (BufferMode (LineBuffering), hSetBuffering)
23+import System.IO (BufferMode (LineBuffering), hSetBuffering)
2424
2525data BuildType = Nightly | LTS BumpType
2626 deriving (Show, Read, Eq, Ord)
Stackage/CorePackages.hs+3−3
@@ -6,10 +6,10 @@ module Stackage.CorePackages
66 , getGhcVersion
77 ) where
88
9−import qualified Data.Text as T
10−import Filesystem (listDirectory)
9+import qualified Data.Text as T
10+import Filesystem (listDirectory)
1111import Stackage.Prelude
12−import System.Directory (findExecutable)
12+import System.Directory (findExecutable)
1313
1414-- | Get a @Map@ of all of the core packages. Core packages are defined as
1515-- packages which ship with GHC itself.
Stackage/PackageDescription.hs+1−1
@@ -51,7 +51,7 @@ instance FromJSON Component where
5151
5252data DepInfo = DepInfo
5353 { diComponents :: Set Component
54− , diRange :: VersionRange
54+ , diRange :: VersionRange
5555 }
5656 deriving (Show, Eq)
5757
Stackage/PerformBuild.hs+38−35
@@ -1,10 +1,10 @@
11-- | Perform an actual build, generate a binary package database and a
22-- documentation directory in the process.
3−{-# LANGUAGE CPP #-}
3+{-# LANGUAGE CPP #-}
44{-# LANGUAGE DeriveDataTypeable #-}
5−{-# LANGUAGE RecordWildCards #-}
65{-# LANGUAGE NoImplicitPrelude #-}
76{-# LANGUAGE OverloadedStrings #-}
7+{-# LANGUAGE RecordWildCards #-}
88module Stackage.PerformBuild
99 ( performBuild
1010 , PerformBuild (..)
@@ -12,22 +12,25 @@ module Stackage.PerformBuild
1212 , pbDocDir
1313 ) where
1414
15−import Stackage.BuildConstraints
16−import Stackage.PackageDescription
17−import Stackage.BuildPlan
18−import Stackage.Prelude hiding (pi)
19−import qualified Data.Map as Map
20−import Control.Concurrent.STM.TSem
21−import Control.Monad.Writer.Strict (execWriter, tell)
22−import Data.NonNull (fromNullable)
23−import Control.Concurrent.Async (async)
24−import System.IO.Temp (withSystemTempDirectory)
25−import Filesystem (createTree, removeTree, isDirectory, rename, canonicalizePath, getWorkingDirectory)
26−import System.IO (withBinaryFile, IOMode (WriteMode))
27−import Filesystem.Path (parent)
28−import qualified Filesystem.Path as F
29−import System.Environment (getEnvironment)
30−import System.Directory (findExecutable)
15+import Control.Concurrent.Async (async)
16+import Control.Concurrent.STM.TSem
17+import Control.Monad.Writer.Strict (execWriter, tell)
18+import qualified Data.Map as Map
19+import Data.NonNull (fromNullable)
20+import Filesystem (canonicalizePath, createTree,
21+ getWorkingDirectory, isDirectory,
22+ removeTree, rename)
23+import Filesystem.Path (parent)
24+import qualified Filesystem.Path as F
25+import Stackage.BuildConstraints
26+import Stackage.BuildPlan
27+import Stackage.PackageDescription
28+import Stackage.Prelude hiding (pi)
29+import System.Directory (findExecutable)
30+import System.Environment (getEnvironment)
31+import System.IO (IOMode (WriteMode),
32+ withBinaryFile)
33+import System.IO.Temp (withSystemTempDirectory)
3134
3235data BuildException = BuildException (Map PackageName BuildFailure) [Text]
3336 deriving Typeable
@@ -51,18 +54,18 @@ data BuildFailure = DependencyFailed PackageName
5154instance Exception BuildFailure
5255
5356data PerformBuild = PerformBuild
54− { pbPlan :: BuildPlan
55− , pbInstallDest :: FilePath
56− , pbLog :: ByteString -> IO ()
57− , pbLogDir :: FilePath
58− , pbJobs :: Int
57+ { pbPlan :: BuildPlan
58+ , pbInstallDest :: FilePath
59+ , pbLog :: ByteString -> IO ()
60+ , pbLogDir :: FilePath
61+ , pbJobs :: Int
5962 , pbGlobalInstall :: Bool
6063 -- ^ Register packages in the global database
6164 }
6265
6366data PackageInfo = PackageInfo
64− { piPlan :: PackagePlan
65− , piName :: PackageName
67+ { piPlan :: PackagePlan
68+ , piName :: PackageName
6669 , piResult :: TMVar Bool
6770 }
6871
@@ -200,17 +203,17 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
200203#endif
201204
202205data SingleBuild = SingleBuild
203− { sbSem :: TSem
204− , sbErrsVar :: TVar (Map PackageName BuildFailure)
205− , sbWarningsVar :: TVar ([Text] -> [Text])
206− , sbActive :: TVar Int
207− , sbToolMap :: Map ExeName (Set PackageName)
208− , sbPackageMap :: Map PackageName PackageInfo
209− , sbBuildDir :: FilePath
210− , sbPackageInfo :: PackageInfo
206+ { sbSem :: TSem
207+ , sbErrsVar :: TVar (Map PackageName BuildFailure)
208+ , sbWarningsVar :: TVar ([Text] -> [Text])
209+ , sbActive :: TVar Int
210+ , sbToolMap :: Map ExeName (Set PackageName)
211+ , sbPackageMap :: Map PackageName PackageInfo
212+ , sbBuildDir :: FilePath
213+ , sbPackageInfo :: PackageInfo
211214 , sbRegisterMutex :: MVar ()
212− , sbModifiedEnv :: [(String, String)]
213− , sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file
215+ , sbModifiedEnv :: [(String, String)]
216+ , sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file
214217 }
215218
216219singleBuild :: PerformBuild -> SingleBuild -> IO ()
Stackage/ServerBundle.hs+9−9
@@ -9,18 +9,18 @@ module Stackage.ServerBundle
99 , docsListing
1010 ) where
1111
12−import qualified Codec.Archive.Tar as Tar
13−import qualified Codec.Archive.Tar.Entry as Tar
14−import qualified Codec.Compression.GZip as GZip
15−import qualified Data.Yaml as Y
16−import Foreign.C.Types (CTime (CTime))
12+import qualified Codec.Archive.Tar as Tar
13+import qualified Codec.Archive.Tar.Entry as Tar
14+import qualified Codec.Compression.GZip as GZip
15+import qualified Data.Yaml as Y
16+import Filesystem (isFile)
17+import Foreign.C.Types (CTime (CTime))
1718import Stackage.BuildConstraints
1819import Stackage.BuildPlan
1920import Stackage.Prelude
20−import qualified System.PosixCompat.Time as PC
21−import qualified Text.XML as X
22−import Text.XML.Cursor
23−import Filesystem (isFile)
21+import qualified System.PosixCompat.Time as PC
22+import qualified Text.XML as X
23+import Text.XML.Cursor
2424
2525-- | Get current time
2626epochTime :: IO Tar.EpochTime
Stackage/UpdateBuildPlan.hs+3−3
@@ -8,9 +8,9 @@ module Stackage.UpdateBuildPlan
88 , updateBuildPlan
99 ) where
1010
11−import qualified Data.Map as Map
12−import Distribution.Version (anyVersion, earlierVersion,
13− orLaterVersion)
11+import qualified Data.Map as Map
12+import Distribution.Version (anyVersion, earlierVersion,
13+ orLaterVersion)
1414import Stackage.BuildConstraints
1515import Stackage.BuildPlan
1616import Stackage.Prelude
Stackage/Upload.hs+6−6
@@ -20,9 +20,9 @@ import Data.Default.Class (Default (..))
2020import Filesystem (isDirectory, isFile)
2121import Network.HTTP.Client
2222import Network.HTTP.Client.MultipartFormData
23−import Stackage.BuildPlan (BuildPlan)
23+import Stackage.BuildPlan (BuildPlan)
2424import Stackage.Prelude
25−import Stackage.ServerBundle (bpAllPackages, docsListing)
25+import Stackage.ServerBundle (bpAllPackages, docsListing)
2626import System.IO.Temp (withSystemTempFile)
2727
2828newtype StackageServer = StackageServer { unStackageServer :: Text }
@@ -173,11 +173,11 @@ uploadHackageDistro bp username password =
173173 }
174174
175175data UploadDocMap = UploadDocMap
176− { udmServer :: StackageServer
176+ { udmServer :: StackageServer
177177 , udmAuthToken :: Text
178− , udmSnapshot :: SnapshotIdent
179− , udmDocDir :: FilePath
180− , udmPlan :: BuildPlan
178+ , udmSnapshot :: SnapshotIdent
179+ , udmDocDir :: FilePath
180+ , udmPlan :: BuildPlan
181181 }
182182
183183uploadDocMap :: UploadDocMap -> Manager -> IO (Response LByteString)