Skip to content

Commit c4f6a1a

Browse files
committed
Merge branch 'master' into rc/v2.9
2 parents fe4cf73 + def6ad2 commit c4f6a1a

File tree

159 files changed

+8384
-6198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+8384
-6198
lines changed

Setup.hs

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
11
{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
22

3-
module Main (main) where
3+
module Main
4+
( main
5+
) where
46

5-
import Data.List ( nub, sortBy )
6-
import Data.Ord ( comparing )
7-
import Distribution.Package ( PackageId, UnitId, packageVersion, packageName )
8-
import Distribution.PackageDescription ( PackageDescription(), Executable(..) )
9-
import Distribution.InstalledPackageInfo (sourcePackageId, installedUnitId)
10-
import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
11-
import Distribution.Simple.Utils ( rewriteFileEx, createDirectoryIfMissingVerbose )
12-
import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
13-
import Distribution.Simple.PackageIndex (allPackages, dependencyClosure)
14-
import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag )
15-
import Distribution.Simple.LocalBuildInfo ( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) )
16-
import Distribution.Types.PackageName (PackageName, unPackageName)
17-
import Distribution.Types.UnqualComponentName (unUnqualComponentName)
18-
import Distribution.Verbosity ( Verbosity, normal )
19-
import Distribution.Pretty ( prettyShow )
20-
import System.FilePath ( (</>) )
7+
import Data.List ( nub, sortBy )
8+
import Data.Ord ( comparing )
9+
import Distribution.InstalledPackageInfo
10+
( sourcePackageId, installedUnitId )
11+
import Distribution.Package
12+
( PackageId, UnitId, packageVersion, packageName )
13+
import Distribution.PackageDescription
14+
( PackageDescription (), Executable (..) )
15+
import Distribution.Pretty ( prettyShow )
16+
import Distribution.Simple
17+
( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
18+
import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
19+
import Distribution.Simple.LocalBuildInfo
20+
( installedPkgs, withLibLBI, withExeLBI, LocalBuildInfo ()
21+
, ComponentLocalBuildInfo (componentPackageDeps)
22+
)
23+
import Distribution.Simple.PackageIndex
24+
( allPackages, dependencyClosure )
25+
import Distribution.Simple.Setup
26+
( BuildFlags (buildVerbosity), fromFlag )
27+
import Distribution.Simple.Utils
28+
( rewriteFileEx, createDirectoryIfMissingVerbose )
29+
import Distribution.Types.PackageName ( PackageName, unPackageName )
30+
import Distribution.Types.UnqualComponentName
31+
( unUnqualComponentName )
32+
import Distribution.Verbosity ( Verbosity, normal )
33+
import System.FilePath ( (</>) )
2134

2235
main :: IO ()
2336
main = defaultMainWithHooks simpleUserHooks

doc/CI.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
2+
3+
# Continuous integration (CI)
4+
5+
## GitHub Actions
6+
7+
The Stack repository uses GitHub Actions for its own CI. For further
8+
information, see the guide to
9+
[contributing](CONTRIBUTING.md#continuous-integration-ci).
10+
11+
## Azure
12+
13+
For further information, see the [Azure CI](azure_ci.md) documentation.
14+
15+
## Travis
16+
17+
For further information, see the [Travis CI](travis_ci.md) documentation.

0 commit comments

Comments
 (0)