haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-11 23:08:30 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

stylish-haskell cleanup

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-16 09:28:28 +02:00
parent 944654b4f9
commit d6c659c7fb
9 changed files with 74 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Stackage/BuildPlan.hs
View File

@ -29,9 +29,9 @@ import Stackage.PackageIndex
import Stackage.Prelude
data BuildPlan = BuildPlan
{ bpSystemInfo :: SystemInfo
, bpTools :: Vector (PackageName, Version)
, bpPackages :: Map PackageName PackagePlan
{ bpSystemInfo :: SystemInfo
, bpTools :: Vector (PackageName, Version)
, bpPackages :: Map PackageName PackagePlan
, bpGithubUsers :: Map Text (Set Text)
}
deriving (Show, Eq)

12
Stackage/CheckBuildPlan.hs
View File

@ -9,12 +9,12 @@ module Stackage.CheckBuildPlan
( checkBuildPlan
) where
import Control.Monad.Writer.Strict (Writer, execWriter, tell)
import Stackage.BuildConstraints
import Stackage.BuildPlan
import Stackage.PackageDescription
import Stackage.Prelude
import qualified Data.Text as T
import Control.Monad.Writer.Strict (Writer, execWriter, tell)
import qualified Data.Text as T
import Stackage.BuildConstraints
import Stackage.BuildPlan
import Stackage.PackageDescription
import Stackage.Prelude
-- FIXME check cycles in dependencies, only looking at libraries and
-- executables

10
Stackage/CompleteBuild.hs
View File

@ -6,11 +6,11 @@ module Stackage.CompleteBuild
, BumpType (..)
, completeBuild
) where
import Data.Default.Class (def)
import Data.Semigroup (Max (..), Option (..))
import Data.Text.Read (decimal)
import Data.Default.Class (def)
import Data.Semigroup (Max (..), Option (..))
import Data.Text.Read (decimal)
import Data.Time
import Data.Yaml (decodeFileEither, encodeFile)
import Data.Yaml (decodeFileEither, encodeFile)
import Network.HTTP.Client
import Stackage.BuildConstraints
import Stackage.BuildPlan
@ -20,7 +20,7 @@ import Stackage.Prelude
import Stackage.ServerBundle
import Stackage.UpdateBuildPlan
import Stackage.Upload
import System.IO (BufferMode (LineBuffering), hSetBuffering)
import System.IO (BufferMode (LineBuffering), hSetBuffering)
data BuildType = Nightly | LTS BumpType
deriving (Show, Read, Eq, Ord)

6
Stackage/CorePackages.hs
View File

@ -6,10 +6,10 @@ module Stackage.CorePackages
, getGhcVersion
) where
import qualified Data.Text as T
import Filesystem (listDirectory)
import qualified Data.Text as T
import Filesystem (listDirectory)
import Stackage.Prelude
import System.Directory (findExecutable)
import System.Directory (findExecutable)
-- | Get a @Map@ of all of the core packages. Core packages are defined as
-- packages which ship with GHC itself.

2
Stackage/PackageDescription.hs
View File

@ -51,7 +51,7 @@ instance FromJSON Component where
data DepInfo = DepInfo
{ diComponents :: Set Component
, diRange :: VersionRange
, diRange :: VersionRange
}
deriving (Show, Eq)

73
Stackage/PerformBuild.hs
View File

@ -1,10 +1,10 @@
-- | Perform an actual build, generate a binary package database and a
-- documentation directory in the process.
{-# LANGUAGE CPP #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}
module Stackage.PerformBuild
( performBuild
, PerformBuild (..)
@ -12,22 +12,25 @@ module Stackage.PerformBuild
, pbDocDir
) where
import Stackage.BuildConstraints
import Stackage.PackageDescription
import Stackage.BuildPlan
import Stackage.Prelude hiding (pi)
import qualified Data.Map as Map
import Control.Concurrent.STM.TSem
import Control.Monad.Writer.Strict (execWriter, tell)
import Data.NonNull (fromNullable)
import Control.Concurrent.Async (async)
import System.IO.Temp (withSystemTempDirectory)
import Filesystem (createTree, removeTree, isDirectory, rename, canonicalizePath, getWorkingDirectory)
import System.IO (withBinaryFile, IOMode (WriteMode))
import Filesystem.Path (parent)
import qualified Filesystem.Path as F
import System.Environment (getEnvironment)
import System.Directory (findExecutable)
import Control.Concurrent.Async (async)
import Control.Concurrent.STM.TSem
import Control.Monad.Writer.Strict (execWriter, tell)
import qualified Data.Map as Map
import Data.NonNull (fromNullable)
import Filesystem (canonicalizePath, createTree,
getWorkingDirectory, isDirectory,
removeTree, rename)
import Filesystem.Path (parent)
import qualified Filesystem.Path as F
import Stackage.BuildConstraints
import Stackage.BuildPlan
import Stackage.PackageDescription
import Stackage.Prelude hiding (pi)
import System.Directory (findExecutable)
import System.Environment (getEnvironment)
import System.IO (IOMode (WriteMode),
withBinaryFile)
import System.IO.Temp (withSystemTempDirectory)
data BuildException = BuildException (Map PackageName BuildFailure) [Text]
deriving Typeable
@ -51,18 +54,18 @@ data BuildFailure = DependencyFailed PackageName
instance Exception BuildFailure
data PerformBuild = PerformBuild
{ pbPlan :: BuildPlan
, pbInstallDest :: FilePath
, pbLog :: ByteString -> IO ()
, pbLogDir :: FilePath
, pbJobs :: Int
{ pbPlan :: BuildPlan
, pbInstallDest :: FilePath
, pbLog :: ByteString -> IO ()
, pbLogDir :: FilePath
, pbJobs :: Int
, pbGlobalInstall :: Bool
-- ^ Register packages in the global database
}
data PackageInfo = PackageInfo
{ piPlan :: PackagePlan
, piName :: PackageName
{ piPlan :: PackagePlan
, piName :: PackageName
, piResult :: TMVar Bool
}
@ -200,17 +203,17 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
#endif
data SingleBuild = SingleBuild
{ sbSem :: TSem
, sbErrsVar :: TVar (Map PackageName BuildFailure)
, sbWarningsVar :: TVar ([Text] -> [Text])
, sbActive :: TVar Int
, sbToolMap :: Map ExeName (Set PackageName)
, sbPackageMap :: Map PackageName PackageInfo
, sbBuildDir :: FilePath
, sbPackageInfo :: PackageInfo
{ sbSem :: TSem
, sbErrsVar :: TVar (Map PackageName BuildFailure)
, sbWarningsVar :: TVar ([Text] -> [Text])
, sbActive :: TVar Int
, sbToolMap :: Map ExeName (Set PackageName)
, sbPackageMap :: Map PackageName PackageInfo
, sbBuildDir :: FilePath
, sbPackageInfo :: PackageInfo
, sbRegisterMutex :: MVar ()
, sbModifiedEnv :: [(String, String)]
, sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file
, sbModifiedEnv :: [(String, String)]
, sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file
}
singleBuild :: PerformBuild -> SingleBuild -> IO ()

18
Stackage/ServerBundle.hs
View File

@ -9,18 +9,18 @@ module Stackage.ServerBundle
, docsListing
) where
import qualified Codec.Archive.Tar as Tar
import qualified Codec.Archive.Tar.Entry as Tar
import qualified Codec.Compression.GZip as GZip
import qualified Data.Yaml as Y
import Foreign.C.Types (CTime (CTime))
import qualified Codec.Archive.Tar as Tar
import qualified Codec.Archive.Tar.Entry as Tar
import qualified Codec.Compression.GZip as GZip
import qualified Data.Yaml as Y
import Filesystem (isFile)
import Foreign.C.Types (CTime (CTime))
import Stackage.BuildConstraints
import Stackage.BuildPlan
import Stackage.Prelude
import qualified System.PosixCompat.Time as PC
import qualified Text.XML as X
import Text.XML.Cursor
import Filesystem (isFile)
import qualified System.PosixCompat.Time as PC
import qualified Text.XML as X
import Text.XML.Cursor
-- | Get current time
epochTime :: IO Tar.EpochTime

6
Stackage/UpdateBuildPlan.hs
View File

@ -8,9 +8,9 @@ module Stackage.UpdateBuildPlan
, updateBuildPlan
) where
import qualified Data.Map as Map
import Distribution.Version (anyVersion, earlierVersion,
orLaterVersion)
import qualified Data.Map as Map
import Distribution.Version (anyVersion, earlierVersion,
orLaterVersion)
import Stackage.BuildConstraints
import Stackage.BuildPlan
import Stackage.Prelude

12
Stackage/Upload.hs
View File

@ -20,9 +20,9 @@ import Data.Default.Class (Default (..))
import Filesystem (isDirectory, isFile)
import Network.HTTP.Client
import Network.HTTP.Client.MultipartFormData
import Stackage.BuildPlan (BuildPlan)
import Stackage.BuildPlan (BuildPlan)
import Stackage.Prelude
import Stackage.ServerBundle (bpAllPackages, docsListing)
import Stackage.ServerBundle (bpAllPackages, docsListing)
import System.IO.Temp (withSystemTempFile)
newtype StackageServer = StackageServer { unStackageServer :: Text }
@ -173,11 +173,11 @@ uploadHackageDistro bp username password =
}
data UploadDocMap = UploadDocMap
{ udmServer :: StackageServer
{ udmServer :: StackageServer
, udmAuthToken :: Text
, udmSnapshot :: SnapshotIdent
, udmDocDir :: FilePath
, udmPlan :: BuildPlan
, udmSnapshot :: SnapshotIdent
, udmDocDir :: FilePath
, udmPlan :: BuildPlan
}
uploadDocMap :: UploadDocMap -> Manager -> IO (Response LByteString)