Skip to content

Commit 925eb17

Browse files
snoybergsnoyberg
committed
Rename to Stack.*
1 parent 9c075fb commit 925eb17

26 files changed

Lines changed: 137 additions & 137 deletions

src/Stackage/Build.hs renamed to src/Stack/Build.hs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
-- | Build project(s).
1212

13-
module Stackage.Build
13+
module Stack.Build
1414
(build
1515
,test
1616
,haddock
@@ -60,22 +60,22 @@ import Network.HTTP.Client.TLS (tlsManagerSettings)
6060
import Path as FL
6161
import Path.Find
6262
import Prelude hiding (FilePath,writeFile)
63-
import Stackage.Constants
64-
import Stackage.Build.Doc
65-
import Stackage.Build.Types
66-
import Stackage.BuildPlan
67-
import Stackage.BuildPlan.Types
68-
import Stackage.Config
69-
import Stackage.Fetch as Fetch
70-
import Stackage.FlagName
71-
import Stackage.GhcPkg
72-
import Stackage.GhcPkgId
73-
import Stackage.Package
74-
import Stackage.PackageIdentifier
75-
import Stackage.PackageIndex.Read
76-
import Stackage.PackageIndex.Update
77-
import Stackage.PackageName
78-
import Stackage.Version
63+
import Stack.Constants
64+
import Stack.Build.Doc
65+
import Stack.Build.Types
66+
import Stack.BuildPlan
67+
import Stack.BuildPlan.Types
68+
import Stack.Config
69+
import Stack.Fetch as Fetch
70+
import Stack.FlagName
71+
import Stack.GhcPkg
72+
import Stack.GhcPkgId
73+
import Stack.Package
74+
import Stack.PackageIdentifier
75+
import Stack.PackageIndex.Read
76+
import Stack.PackageIndex.Update
77+
import Stack.PackageName
78+
import Stack.Version
7979
import System.Directory hiding (findFiles)
8080
import System.Environment
8181
import qualified System.FilePath as FilePath
@@ -87,7 +87,7 @@ import System.Posix.Files (createSymbolicLink,removeLink)
8787
-- Top-level commands
8888

8989
-- | Build and test using Shake.
90-
test :: Stackage.Config.Config -> TestConfig -> IO ()
90+
test :: Stack.Config.Config -> TestConfig -> IO ()
9191
test config conf =
9292
build config
9393
(BuildConfig (tconfigTargets conf)
@@ -102,7 +102,7 @@ test config conf =
102102
(LTS 2 8)) -- FIXME figure out where to get the SnapName from
103103

104104
-- | Build and haddock using Shake.
105-
haddock :: Stackage.Config.Config -> HaddockConfig -> IO ()
105+
haddock :: Stack.Config.Config -> HaddockConfig -> IO ()
106106
haddock config conf =
107107
build config
108108
(BuildConfig (hconfigTargets conf)
@@ -117,7 +117,7 @@ haddock config conf =
117117
(LTS 2 8)) -- FIXME figure out where to get the SnapName from
118118

119119
-- | Build and benchmark using Shake.
120-
benchmark :: Stackage.Config.Config -> BenchmarkConfig -> IO ()
120+
benchmark :: Stack.Config.Config -> BenchmarkConfig -> IO ()
121121
benchmark config conf =
122122
build config
123123
(BuildConfig (benchTargets conf)
@@ -132,7 +132,7 @@ benchmark config conf =
132132
(LTS 2 8)) -- FIXME figure out where to get the SnapName from
133133

134134
-- | Build using Shake.
135-
build :: Stackage.Config.Config -> BuildConfig -> IO ()
135+
build :: Stack.Config.Config -> BuildConfig -> IO ()
136136
build config bconfig =
137137
do pinfos <-
138138
runNoLoggingT (runResourceT (getPackageInfos (bconfigFinalAction bconfig)
@@ -198,7 +198,7 @@ dryRunPrint pinfos =
198198
forM_ (S.toList pinfos) (\pinfo -> putStrLn (packageNameString (packageName pinfo)))
199199

200200
-- | Reset the build (remove Shake database and .gen files).
201-
clean :: Stackage.Config.Config -> IO ()
201+
clean :: Stack.Config.Config -> IO ()
202202
clean config =
203203
do pinfos <-
204204
runNoLoggingT (runResourceT (getPackageInfos DoNothing Nothing config))
@@ -973,7 +973,7 @@ composeFlags pname pflags gflags = collapse pflags <> gflags
973973

974974
-- | Fetch and unpack the package.
975975
fetchAndUnpackPackages :: (MonadIO m,MonadThrow m,MonadLogger m,MonadMask m)
976-
=> Stackage.Config.Config
976+
=> Stack.Config.Config
977977
-> [PackageIdentifier]
978978
-> m [Path Abs Dir]
979979
fetchAndUnpackPackages config pkgs =
@@ -996,7 +996,7 @@ fetchAndUnpackPackages config pkgs =
996996

997997
-- | Read package descriptions.
998998
readPackageDescs :: MonadIO m
999-
=> Stackage.Config.Config -> [PackageIdentifier] -> m (Map PackageName L.ByteString)
999+
=> Stack.Config.Config -> [PackageIdentifier] -> m (Map PackageName L.ByteString)
10001000
readPackageDescs config pkgs =
10011001
liftM M.fromList
10021002
(liftIO (runResourceT
@@ -1012,7 +1012,7 @@ readPackageDescs config pkgs =
10121012

10131013
-- | Unpack and update the package tarball.
10141014
unpackAndUpdateTarball :: (MonadIO m,MonadLogger m,MonadMask m)
1015-
=> Stackage.Config.Config
1015+
=> Stack.Config.Config
10161016
-> PackageIdentifier
10171017
-> Path Abs File
10181018
-> L.ByteString

src/Stackage/Build/Config.hs renamed to src/Stack/Build/Config.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
-- | Configuration parsing the stackage-build.yaml.
66

7-
module Stackage.Build.Config where
7+
module Stack.Build.Config where
88

99
-- import Stackage.Build.Defaults
1010
-- import Stackage.Build.Types

src/Stackage/Build/Doc.hs renamed to src/Stack/Build/Doc.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{-# LANGUAGE TemplateHaskell #-}
55

66
-- | Utilities for built documentation, shared between @stackage-build@ and @fpdoc@.
7-
module Stackage.Build.Doc where
7+
module Stack.Build.Doc where
88

99
import Control.Monad
1010
import Data.List
@@ -13,9 +13,9 @@ import qualified Data.Map.Strict as M
1313
import Data.Maybe
1414
import qualified Data.Text as T
1515
import Path as FL
16-
import Stackage.Constants
17-
import Stackage.PackageName
18-
import Stackage.Version
16+
import Stack.Constants
17+
import Stack.PackageName
18+
import Stack.Version
1919
import System.Directory
2020
import System.FilePath (takeFileName)
2121

src/Stackage/Build/Types.hs renamed to src/Stack/Build/Types.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
-- | All data types.
1010

11-
module Stackage.Build.Types where
11+
module Stack.Build.Types where
1212

1313
import Control.Exception
1414
import Data.Aeson
@@ -23,12 +23,12 @@ import Development.Shake (Verbosity)
2323
import Distribution.Package hiding (Package,PackageName)
2424
import GHC.Generics
2525
import Prelude hiding (FilePath)
26-
import Stackage.BuildPlan.Types
27-
import Stackage.FlagName
28-
import Stackage.GhcPkgId
29-
import Stackage.Package
30-
import Stackage.PackageName
31-
import Stackage.Version
26+
import Stack.BuildPlan.Types
27+
import Stack.FlagName
28+
import Stack.GhcPkgId
29+
import Stack.Package
30+
import Stack.PackageName
31+
import Stack.Version
3232

3333
data StackageBuildException
3434
= FPNoConfigFile

src/Stackage/BuildPlan.hs renamed to src/Stack/BuildPlan.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-- | Resolving a build plan for a set of packages in a given Stackage
88
-- snapshot.
99

10-
module Stackage.BuildPlan
10+
module Stack.BuildPlan
1111
( BuildPlanException (..)
1212
, Snapshots (..)
1313
, getSnapshots
@@ -56,12 +56,12 @@ import Network.HTTP.Client (Manager, parseUrl,
5656
responseBody, withResponse)
5757
import Network.HTTP.Client.Conduit (bodyReaderSource)
5858
import Path
59-
import Stackage.BuildPlan.Types
60-
import Stackage.Constants
61-
import Stackage.FlagName
62-
import Stackage.Package
63-
import Stackage.PackageName
64-
import Stackage.Version
59+
import Stack.BuildPlan.Types
60+
import Stack.Constants
61+
import Stack.FlagName
62+
import Stack.Package
63+
import Stack.PackageName
64+
import Stack.Version
6565
import System.Directory (createDirectoryIfMissing,
6666
getAppUserDataDirectory)
6767
import System.FilePath (takeDirectory)

src/Stackage/BuildPlan/Types.hs renamed to src/Stack/BuildPlan/Types.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{-# LANGUAGE RecordWildCards #-}
55
{-# LANGUAGE FlexibleInstances #-}
66
-- | Shared types for various stackage packages.
7-
module Stackage.BuildPlan.Types
7+
module Stack.BuildPlan.Types
88
( -- * Types
99
BuildPlan (..)
1010
, PackagePlan (..)
@@ -44,11 +44,11 @@ import Data.Time (Day)
4444
import qualified Data.Traversable as T
4545
import Data.Typeable (TypeRep, Typeable, typeOf)
4646
import Data.Vector (Vector)
47-
import Stackage.PackageName
48-
import Stackage.FlagName
47+
import Stack.PackageName
48+
import Stack.FlagName
4949
import Distribution.System (Arch, OS)
5050
import qualified Distribution.Text as DT
51-
import Stackage.Version (Version, VersionRange)
51+
import Stack.Version (Version, VersionRange)
5252
import qualified Distribution.Version as C
5353
import Safe (readMay)
5454

src/Stackage/Config.hs renamed to src/Stack/Config.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-- database from there, etc. And if there's nothing, we should
2020
-- probably default to behaving like cabal, possibly with spitting out
2121
-- a warning that "you should run `stk init` to make things better".
22-
module Stackage.Config
22+
module Stack.Config
2323
( Config(..)
2424
, ConfigException(..)
2525
, configInDocker
@@ -71,8 +71,8 @@ import Data.Typeable
7171
import qualified Data.Yaml as Yaml
7272
import Path
7373
import Path.Find
74-
import Stackage.FlagName
75-
import Stackage.PackageName
74+
import Stack.FlagName
75+
import Stack.PackageName
7676
import System.Directory
7777
import System.Environment
7878
import System.Process

src/Stackage/Constants.hs renamed to src/Stack/Constants.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
-- | Constants used throughout the project.
55

6-
module Stackage.Constants where
6+
module Stack.Constants where
77

88
import Data.Text (Text)
99
import qualified Data.Text as T
1010
import Filesystem.Path.CurrentOS ()
1111
import Path as FL
1212
import Prelude
13-
import Stackage.Config
13+
import Stack.Config
1414
import System.Directory
1515

1616
-- | Extensions used for Haskell files.
@@ -74,17 +74,17 @@ getIndexDir =
7474
return (homeDir </>
7575
$(mkRelDir ".stackage/pkg-index"))
7676

77-
pkgUnpackDir :: Stackage.Config.Config -> Path Abs Dir
77+
pkgUnpackDir :: Stack.Config.Config -> Path Abs Dir
7878
pkgUnpackDir config =
7979
configStackageRoot config </>
8080
$(mkRelDir "unpacked")
8181

82-
pkgIndexDir :: Stackage.Config.Config -> Path Abs Dir
82+
pkgIndexDir :: Stack.Config.Config -> Path Abs Dir
8383
pkgIndexDir config =
8484
configStackageRoot config </>
8585
$(mkRelDir "package-index")
8686

87-
pkgIndexFile :: Stackage.Config.Config -> Path Abs File
87+
pkgIndexFile :: Stack.Config.Config -> Path Abs File
8888
pkgIndexFile config =
8989
pkgIndexDir config </>
9090
$(mkRelFile "00-index.tar")

src/Stackage/Docker.hs renamed to src/Stack/Docker.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{-# LANGUAGE NamedFieldPuns, TupleSections, RankNTypes #-}
22

33
-- | Run commands in Docker containers
4-
module Stackage.Docker
4+
module Stack.Docker
55
(resetOnHost
66
,resetInContainer
77
,getInContainer
@@ -40,10 +40,10 @@ import qualified Filesystem.Path.CurrentOS as FP
4040
import qualified Path as FL
4141
import Path.Find (findFileUp)
4242
import Paths_stackage_common (version)
43-
import Stackage.Build (shakeFilesPath)
44-
import Stackage.Constants (configFileName)
45-
import Stackage.Config
46-
import Stackage.Docker.GlobalDB (updateDockerImageLastUsed,getDockerImagesLastUsed,pruneDockerImagesLastUsed)
43+
import Stack.Build (shakeFilesPath)
44+
import Stack.Constants (configFileName)
45+
import Stack.Config
46+
import Stack.Docker.GlobalDB (updateDockerImageLastUsed,getDockerImagesLastUsed,pruneDockerImagesLastUsed)
4747
import System.Directory
4848
import System.Environment (lookupEnv,unsetEnv)
4949
import System.Exit (ExitCode(ExitSuccess,ExitFailure),exitWith)

src/Stackage/Docker/GlobalDB.hs renamed to src/Stack/Docker/GlobalDB.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
-- | Global sqlite database shared by all projects.
66
-- Warning: this is currently only accessible from __outside__ a Docker container.
7-
module Stackage.Docker.GlobalDB
7+
module Stack.Docker.GlobalDB
88
(updateDockerImageLastUsed
99
,getDockerImagesLastUsed
1010
,pruneDockerImagesLastUsed

0 commit comments

Comments
 (0)