" <>
"NOTE: This is merely a listing of the html files found in the coverage reports directory. Some of these reports may be old.
" <>
"| Package | TestSuite | Modification Time |
|---|
" <>
foldMap encodeUtf8Builder rows <>
@@ -434,7 +434,7 @@
extractField path = do
contents <- readFileUtf8 (toFilePath path)
case asum (map (T.stripPrefix (field <> ": ")) (T.lines contents)) of
- Just result -> return $ Right result
+ Just result -> return $ Right $ T.strip result
Nothing -> notFoundErr
cabalVer <- view cabalVersionL
if cabalVer < mkVersion [1, 24]
diff --git a/src/Stack/Docker.hs b/src/Stack/Docker.hs
--- a/src/Stack/Docker.hs
+++ b/src/Stack/Docker.hs
@@ -253,7 +253,6 @@
containerID <- withWorkingDir (toFilePath projectRoot) $ trim . decodeUtf8 <$> readDockerProcess
(concat
[["create"
- ,"--net=host"
,"-e",inContainerEnvVar ++ "=1"
,"-e",stackRootEnvVar ++ "=" ++ toFilePathNoTrailingSep stackRoot
,"-e",platformVariantEnvVar ++ "=dk" ++ platformVariant
@@ -265,6 +264,9 @@
,"-v",toFilePathNoTrailingSep projectRoot ++ ":" ++ toFilePathNoTrailingSep projectRoot ++ mountSuffix
,"-v",toFilePathNoTrailingSep sandboxHomeDir ++ ":" ++ toFilePathNoTrailingSep sandboxHomeDir ++ mountSuffix
,"-w",toFilePathNoTrailingSep pwd]
+ ,case dockerNetwork docker of
+ Nothing -> ["--net=host"]
+ Just name -> ["--net=" ++ name]
,case muserEnv of
Nothing -> []
Just userEnv -> ["-e","USER=" ++ userEnv]
diff --git a/src/Stack/Dot.hs b/src/Stack/Dot.hs
--- a/src/Stack/Dot.hs
+++ b/src/Stack/Dot.hs
@@ -188,7 +188,9 @@
ALUrl u -> u
ALFilePath (ResolvedPath _ path) -> Text.pack $ "file://" ++ Path.toFilePath path
in object [ "type" .= ("archive" :: Text)
- , "url" .= url ]
+ , "url" .= url
+ , "sha256" .= archiveHash archive
+ , "size" .= archiveSize archive ]
pkgLocToJSON (PLImmutable (PLIRepo repo _)) = object [ "type" .= case repoType repo of
RepoGit -> "git" :: Text
RepoHg -> "hg" :: Text
diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
--- a/src/Stack/Ghci.hs
+++ b/src/Stack/Ghci.hs
@@ -823,9 +823,11 @@
checkForDuplicateModules pkgs = do
unless (null duplicates) $ do
borderedWarning $ do
- prettyError $ "Multiple files use the same module name:" <>
+ prettyWarn $ "Multiple files use the same module name:" <>
line <> bulletedList (map prettyDuplicate duplicates)
- throwM LoadingDuplicateModules
+ -- MSS 2020-10-13 Disabling, may remove entirely in the future
+ -- See: https://github.com/commercialhaskell/stack/issues/5407#issuecomment-707339928
+ -- throwM LoadingDuplicateModules
where
duplicates :: [(ModuleName, Map (Path Abs File) (Set (PackageName, NamedComponent)))]
duplicates =
diff --git a/src/Stack/Ls.hs b/src/Stack/Ls.hs
--- a/src/Stack/Ls.hs
+++ b/src/Stack/Ls.hs
@@ -12,7 +12,7 @@
import Control.Exception (throw)
import Data.Aeson
import Data.Array.IArray ((//), elems)
-import Stack.Prelude hiding (Snapshot (..))
+import Stack.Prelude hiding (Snapshot (..), SnapName (..))
import qualified Data.Aeson.Types as A
import qualified Data.List as L
import Data.Text hiding (pack, intercalate)
diff --git a/src/Stack/New.hs b/src/Stack/New.hs
--- a/src/Stack/New.hs
+++ b/src/Stack/New.hs
@@ -199,7 +199,7 @@
let context = M.unions [nonceParams, nameParams, configParams, yearParam]
where
nameAsVarId = T.replace "-" "_" $ T.pack $ packageNameString project
- nameAsModule = T.filter (/= '-') $ T.toTitle $ T.pack $ packageNameString project
+ nameAsModule = T.filter (/= ' ') $ T.toTitle $ T.replace "-" " " $ T.pack $ packageNameString project
nameParams = M.fromList [ ("name", T.pack $ packageNameString project)
, ("name-as-varid", nameAsVarId)
, ("name-as-module", nameAsModule) ]
diff --git a/src/Stack/Options/BuildParser.hs b/src/Stack/Options/BuildParser.hs
--- a/src/Stack/Options/BuildParser.hs
+++ b/src/Stack/Options/BuildParser.hs
@@ -71,10 +71,13 @@
help
"Like --file-watch, but polling the filesystem instead of using events") <|>
pure NoFileWatch) <*>
+ switch
+ (long "watch-all" <>
+ help "Watch all local files not taking targets into account") <*>
many (cmdOption
(long "exec" <>
- metavar "CMD [ARGS]" <>
- help "Command and arguments to run after a successful build")) <*>
+ metavar "COMMAND [ARGUMENT(S)]" <>
+ help "Command and argument(s) to run after a successful build")) <*>
switch
(long "only-configure" <>
help
diff --git a/src/Stack/Options/ConfigParser.hs b/src/Stack/Options/ConfigParser.hs
--- a/src/Stack/Options/ConfigParser.hs
+++ b/src/Stack/Options/ConfigParser.hs
@@ -22,7 +22,7 @@
(\stackRoot workDir buildOpts dockerOpts nixOpts systemGHC installGHC arch
ghcVariant ghcBuild jobs includes libs overrideGccPath overrideHpack
skipGHCCheck skipMsys localBin setupInfoLocations modifyCodePage
- allowDifferentUser dumpLogs colorWhen -> mempty
+ allowDifferentUser dumpLogs colorWhen snapLoc -> mempty
{ configMonoidStackRoot = stackRoot
, configMonoidWorkDir = workDir
, configMonoidBuildOpts = buildOpts
@@ -46,6 +46,7 @@
, configMonoidAllowDifferentUser = allowDifferentUser
, configMonoidDumpLogs = dumpLogs
, configMonoidColorWhen = colorWhen
+ , configMonoidSnapshotLocation = snapLoc
})
<$> optionalFirst (absDirOption
( long stackRootOptionName
@@ -161,6 +162,11 @@
\support color codes"
<> hide
))
+ <*> optionalFirst (strOption
+ ( long "snapshot-location-base"
+ <> help "The base location of LTS/Nightly snapshots"
+ <> metavar "URL"
+ ))
where
hide = hideMods (hide0 /= OuterGlobalOpts)
toDumpLogs (First (Just True)) = First (Just DumpAllLogs)
diff --git a/src/Stack/Options/DockerParser.hs b/src/Stack/Options/DockerParser.hs
--- a/src/Stack/Options/DockerParser.hs
+++ b/src/Stack/Options/DockerParser.hs
@@ -59,6 +59,10 @@
hide <>
metavar "NAME" <>
help "Docker container name")
+ <*> firstStrOption (long (dockerOptName dockerNetworkArgName) <>
+ hide <>
+ metavar "NETWORK" <>
+ help "Docker network")
<*> argsOption (long (dockerOptName dockerRunArgsArgName) <>
hide <>
value [] <>
diff --git a/src/Stack/Options/ExecParser.hs b/src/Stack/Options/ExecParser.hs
--- a/src/Stack/Options/ExecParser.hs
+++ b/src/Stack/Options/ExecParser.hs
@@ -16,16 +16,16 @@
<*> eoArgsParser
<*> execOptsExtraParser
where
- eoCmdParser = ExecCmd <$> strArgument (metavar "CMD" <> completer projectExeCompleter)
+ eoCmdParser = ExecCmd <$> strArgument (metavar "COMMAND" <> completer projectExeCompleter)
eoArgsParser = many (strArgument (metavar txt))
where
txt = case mcmd of
Nothing -> normalTxt
Just ExecCmd{} -> normalTxt
- Just ExecRun -> "-- ARGS (e.g. stack run -- file.txt)"
- Just ExecGhc -> "-- ARGS (e.g. stack runghc -- X.hs -o x)"
- Just ExecRunGhc -> "-- ARGS (e.g. stack runghc -- X.hs)"
- normalTxt = "-- ARGS (e.g. stack exec -- ghc-pkg describe base)"
+ Just ExecRun -> "-- ARGUMENT(S) (e.g. stack run -- file.txt)"
+ Just ExecGhc -> "-- ARGUMENT(S) (e.g. stack runghc -- X.hs -o x)"
+ Just ExecRunGhc -> "-- ARGUMENT(S) (e.g. stack runghc -- X.hs)"
+ normalTxt = "-- ARGUMENT(S) (e.g. stack exec ghc-pkg -- describe base)"
evalOptsParser :: String -- ^ metavar
-> Parser EvalOpts
@@ -59,7 +59,10 @@
<*> pure True
eoPackagesParser :: Parser [String]
- eoPackagesParser = many (strOption (long "package" <> help "Additional packages that must be installed"))
+ eoPackagesParser = many
+ (strOption (long "package"
+ <> help "Additional package(s) that must be installed"
+ <> metavar "PACKAGE(S)"))
eoRtsOptionsParser :: Parser [String]
eoRtsOptionsParser = concat <$> many (argsOption
diff --git a/src/Stack/Options/ScriptParser.hs b/src/Stack/Options/ScriptParser.hs
--- a/src/Stack/Options/ScriptParser.hs
+++ b/src/Stack/Options/ScriptParser.hs
@@ -24,9 +24,12 @@
scriptOptsParser :: Parser ScriptOpts
scriptOptsParser = ScriptOpts
- <$> many (strOption (long "package" <> help "Additional packages that must be installed"))
+ <$> many (strOption
+ (long "package" <>
+ metavar "PACKAGE(S)" <>
+ help "Additional package(s) that must be installed"))
<*> strArgument (metavar "FILE" <> completer (fileExtCompleter [".hs", ".lhs"]))
- <*> many (strArgument (metavar "-- ARGS (e.g. stack script X.hs -- args to program)"))
+ <*> many (strArgument (metavar "-- ARGUMENT(S) (e.g. stack script X.hs -- argument(s) to program)"))
<*> (flag' SECompile
( long "compile"
<> help "Compile the script without optimization and run the executable"
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
--- a/src/Stack/Package.hs
+++ b/src/Stack/Package.hs
@@ -82,6 +82,7 @@
data Ctx = Ctx { ctxFile :: !(Path Abs File)
, ctxDistDir :: !(Path Abs Dir)
, ctxBuildConfig :: !BuildConfig
+ , ctxCabalVer :: !Version
}
instance HasPlatform Ctx
@@ -219,9 +220,10 @@
let pkgDir = parent cabalfp
distDir <- distDirFromDir pkgDir
bc <- view buildConfigL
+ cabalVer <- view cabalVersionL
(componentModules,componentFiles,dataFiles',warnings) <-
runRIO
- (Ctx cabalfp distDir bc)
+ (Ctx cabalfp distDir bc cabalVer)
(packageDescModulesAndFiles pkg)
setupFiles <-
if buildType pkg == Custom
@@ -795,13 +797,21 @@
resolveComponentFiles component build names = do
dirs <- mapMaybeM resolveDirOrWarn (hsSourceDirs build)
dir <- asks (parent . ctxFile)
+ agdirs <- autogenDirs
(modules,files,warnings) <-
resolveFilesAndDeps
component
- (if null dirs then [dir] else dirs)
+ ((if null dirs then [dir] else dirs) ++ agdirs)
names
cfiles <- buildOtherSources build
return (modules, files <> cfiles, warnings)
+ where
+ autogenDirs = do
+ cabalVer <- asks ctxCabalVer
+ distDir <- asks ctxDistDir
+ let compDir = componentAutogenDir cabalVer component distDir
+ pkgDir = maybeToList $ packageAutogenDir cabalVer distDir
+ filterM doesDirExist $ compDir : pkgDir
-- | Get all C sources and extra source files in a build.
buildOtherSources :: BuildInfo -> RIO Ctx [DotCabalPath]
diff --git a/src/Stack/Runners.hs b/src/Stack/Runners.hs
--- a/src/Stack/Runners.hs
+++ b/src/Stack/Runners.hs
@@ -148,15 +148,8 @@
<$> getTerminalWidth)
pure (globalTermWidth go)
menv <- mkDefaultProcessContext
- logOptions0 <- logOptionsHandle stderr False
- let logOptions
- = setLogUseColor useColor
- $ setLogUseTime (globalTimeInLog go)
- $ setLogMinLevel (globalLogLevel go)
- $ setLogVerboseFormat (globalLogLevel go <= LevelDebug)
- $ setLogTerminal (globalTerminal go)
- logOptions0
- withLogFunc logOptions $ \logFunc -> runRIO Runner
+ let update = globalStylesUpdate go
+ withNewLogFunc go useColor update $ \logFunc -> runRIO Runner
{ runnerGlobalOpts = go
, runnerUseColor = useColor
, runnerLogFunc = logFunc
diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs
--- a/src/Stack/Types/Build.hs
+++ b/src/Stack/Types/Build.hs
@@ -348,7 +348,7 @@
(True, Nothing) -> "simple Setup.hs"
(True, Just taskProvides') -> "custom Setup.hs for package " ++ dropQuotes (packageIdentifierString taskProvides')
) ++
- " using:\n " ++ fullCmd ++ "\n" ++
+ " (scroll up to its section to see the error) using:\n " ++ fullCmd ++ "\n" ++
" Process exited with code: " ++ show exitCode ++
(if exitCode == ExitFailure (-9)
then " (THIS MAY INDICATE OUT OF MEMORY)"
diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs
--- a/src/Stack/Types/Config.hs
+++ b/src/Stack/Types/Config.hs
@@ -863,6 +863,8 @@
, configMonoidRecommendUpgrade :: !FirstTrue
-- ^ See 'configRecommendUpgrade'
, configMonoidCasaRepoPrefix :: !(First CasaRepoPrefix)
+ , configMonoidSnapshotLocation :: !(First Text)
+ -- ^ Custom location of LTS/Nightly snapshots
, configMonoidStackDeveloperMode :: !(First Bool)
-- ^ See 'configStackDeveloperMode'
}
@@ -988,6 +990,7 @@
configMonoidRecommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName
configMonoidCasaRepoPrefix <- First <$> obj ..:? configMonoidCasaRepoPrefixName
+ configMonoidSnapshotLocation <- First <$> obj ..:? configMonoidSnapshotLocationName
configMonoidStackDeveloperMode <- First <$> obj ..:? configMonoidStackDeveloperModeName
@@ -1156,6 +1159,9 @@
configMonoidCasaRepoPrefixName :: Text
configMonoidCasaRepoPrefixName = "casa-repo-prefix"
+configMonoidSnapshotLocationName :: Text
+configMonoidSnapshotLocationName = "snapshot-location-base"
+
configMonoidStackDeveloperModeName :: Text
configMonoidStackDeveloperModeName = "stack-developer-mode"
@@ -1223,7 +1229,7 @@
show (NoMatchingSnapshot names) = concat
[ "None of the following snapshots provides a compiler matching "
, "your package(s):\n"
- , unlines $ map (\name -> " - " <> T.unpack (renderSnapName name))
+ , unlines $ map (\name -> " - " <> show name)
(NonEmpty.toList names)
, resolveOptions
]
diff --git a/src/Stack/Types/Config/Build.hs b/src/Stack/Types/Config/Build.hs
--- a/src/Stack/Types/Config/Build.hs
+++ b/src/Stack/Types/Config/Build.hs
@@ -133,6 +133,7 @@
, boptsCLIGhcOptions = []
, boptsCLIBuildSubset = BSAll
, boptsCLIFileWatch = NoFileWatch
+ , boptsCLIWatchAll = False
, boptsCLIExec = []
, boptsCLIOnlyConfigure = False
, boptsCLICommand = Build
@@ -166,6 +167,7 @@
, boptsCLIFlags :: !(Map ApplyCLIFlag (Map FlagName Bool))
, boptsCLIBuildSubset :: !BuildSubset
, boptsCLIFileWatch :: !FileWatchOpts
+ , boptsCLIWatchAll :: !Bool
, boptsCLIExec :: ![(String, [String])]
, boptsCLIOnlyConfigure :: !Bool
, boptsCLICommand :: !BuildCommand
diff --git a/src/Stack/Types/Docker.hs b/src/Stack/Types/Docker.hs
--- a/src/Stack/Types/Docker.hs
+++ b/src/Stack/Types/Docker.hs
@@ -43,6 +43,8 @@
,dockerContainerName :: !(Maybe String)
-- ^ Container name to use, only makes sense from command-line with `dockerPersist`
-- or `dockerDetach`.
+ ,dockerNetwork :: !(Maybe String)
+ -- ^ The network docker uses.
,dockerRunArgs :: ![String]
-- ^ Arguments to pass directly to @docker run@.
,dockerMount :: ![Mount]
@@ -85,6 +87,8 @@
,dockerMonoidContainerName :: !(First String)
-- ^ Container name to use, only makes sense from command-line with `dockerPersist`
-- or `dockerDetach`.
+ ,dockerMonoidNetwork :: !(First String)
+ -- ^ See: 'dockerNetwork'
,dockerMonoidRunArgs :: ![String]
-- ^ Arguments to pass directly to @docker run@
,dockerMonoidMount :: ![Mount]
@@ -118,6 +122,7 @@
dockerMonoidDetach <- FirstFalse <$> o ..:? dockerDetachArgName
dockerMonoidPersist <- FirstFalse <$> o ..:? dockerPersistArgName
dockerMonoidContainerName <- First <$> o ..:? dockerContainerNameArgName
+ dockerMonoidNetwork <- First <$> o ..:? dockerNetworkArgName
dockerMonoidRunArgs <- o ..:? dockerRunArgsArgName ..!= []
dockerMonoidMount <- o ..:? dockerMountArgName ..!= []
dockerMonoidMountMode <- First <$> o ..:? dockerMountModeArgName
@@ -391,6 +396,10 @@
-- | Docker container name argument name.
dockerContainerNameArgName :: Text
dockerContainerNameArgName = "container-name"
+--
+-- | Docker container name argument name.
+dockerNetworkArgName :: Text
+dockerNetworkArgName = "network"
-- | Docker persist argument name.
dockerPersistArgName :: Text
diff --git a/src/Stack/Types/Package.hs b/src/Stack/Types/Package.hs
--- a/src/Stack/Types/Package.hs
+++ b/src/Stack/Types/Package.hs
@@ -11,7 +11,6 @@
module Stack.Types.Package where
import Stack.Prelude
-import Foreign.C.Types (CTime)
import qualified RIO.Text as T
import Data.Aeson (ToJSON (..), FromJSON (..), (.=), (.:), object, withObject)
import qualified Data.Map as M
@@ -320,6 +319,14 @@
lpFiles :: HasEnvConfig env => LocalPackage -> RIO env (Set.Set (Path Abs File))
lpFiles = runMemoizedWith . fmap (Set.unions . M.elems) . lpComponentFiles
+lpFilesForComponents :: HasEnvConfig env
+ => Set NamedComponent
+ -> LocalPackage
+ -> RIO env (Set.Set (Path Abs File))
+lpFilesForComponents components lp = runMemoizedWith $ do
+ componentFiles <- lpComponentFiles lp
+ pure $ mconcat (M.elems (M.restrictKeys componentFiles components))
+
-- | A location to install a package into, either snapshot or local
data InstallLocation = Snap | Local
deriving (Show, Eq)
@@ -334,10 +341,8 @@
data InstalledPackageLocation = InstalledTo InstallLocation | ExtraGlobal
deriving (Show, Eq)
-data FileCacheInfo = FileCacheInfo
- { fciModTime :: !CTime
- , fciSize :: !FileSize
- , fciHash :: !SHA256
+newtype FileCacheInfo = FileCacheInfo
+ { fciHash :: SHA256
}
deriving (Generic, Show, Eq, Typeable)
instance NFData FileCacheInfo
@@ -345,16 +350,12 @@
-- Provided for storing the BuildCache values in a file. But maybe
-- JSON/YAML isn't the right choice here, worth considering.
instance ToJSON FileCacheInfo where
- toJSON (FileCacheInfo time size hash') = object
- [ "modtime" .= time
- , "size" .= size
- , "hash" .= hash'
+ toJSON (FileCacheInfo hash') = object
+ [ "hash" .= hash'
]
instance FromJSON FileCacheInfo where
parseJSON = withObject "FileCacheInfo" $ \o -> FileCacheInfo
- <$> o .: "modtime"
- <*> o .: "size"
- <*> o .: "hash"
+ <$> o .: "hash"
-- | A descriptor from a .cabal file indicating one of the following:
--
diff --git a/src/Stack/Types/Resolver.hs b/src/Stack/Types/Resolver.hs
--- a/src/Stack/Types/Resolver.hs
+++ b/src/Stack/Types/Resolver.hs
@@ -1,7 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
@@ -14,10 +13,7 @@
module Stack.Types.Resolver
(AbstractResolver(..)
,readAbstractResolver
- ,SnapName(..)
,Snapshots (..)
- ,renderSnapName
- ,parseSnapName
) where
import Pantry.Internal.AesonExtended
@@ -62,23 +58,12 @@
pure $ pure $ ARLatestLTSMajor x'
_ -> pure $ ARResolver <$> parseRawSnapshotLocation (T.pack s)
--- | The name of an LTS Haskell or Stackage Nightly snapshot.
-data SnapName
- = LTS !Int !Int
- | Nightly !Day
- deriving (Generic, Typeable, Show, Data, Eq)
-instance NFData SnapName
-instance Display SnapName where
- display = display . renderSnapName
-
data BuildPlanTypesException
- = ParseSnapNameException !Text
- | ParseResolverException !Text
+ = ParseResolverException !Text
| FilepathInDownloadedSnapshot !Text
deriving Typeable
instance Exception BuildPlanTypesException
instance Show BuildPlanTypesException where
- show (ParseSnapNameException t) = "Invalid snapshot name: " ++ T.unpack t
show (ParseResolverException t) = concat
[ "Invalid resolver value: "
, T.unpack t
@@ -90,29 +75,6 @@
, "field, but filepaths are not allowed in downloaded snapshots.\n"
, "Filepath specified: " ++ T.unpack url
]
-
--- | Convert a 'SnapName' into its short representation, e.g. @lts-2.8@,
--- @nightly-2015-03-05@.
-renderSnapName :: SnapName -> Text
-renderSnapName (LTS x y) = T.pack $ concat ["lts-", show x, ".", show y]
-renderSnapName (Nightly d) = T.pack $ "nightly-" ++ show d
-
--- | Parse the short representation of a 'SnapName'.
-parseSnapName :: MonadThrow m => Text -> m SnapName
-parseSnapName t0 =
- case lts <|> nightly of
- Nothing -> throwM $ ParseSnapNameException t0
- Just sn -> return sn
- where
- lts = do
- t1 <- T.stripPrefix "lts-" t0
- Right (x, t2) <- Just $ decimal t1
- t3 <- T.stripPrefix "." t2
- Right (y, "") <- Just $ decimal t3
- return $ LTS x y
- nightly = do
- t1 <- T.stripPrefix "nightly-" t0
- Nightly <$> readMaybe (T.unpack t1)
-- | Most recent Nightly and newest LTS version per major release.
data Snapshots = Snapshots
diff --git a/src/main/Main.hs b/src/main/Main.hs
--- a/src/main/Main.hs
+++ b/src/main/Main.hs
@@ -277,11 +277,12 @@
execCmd
(execOptsParser $ Just ExecGhc)
addCommand' "hoogle"
- ("Run hoogle, the Haskell API search engine. Use 'stack exec' syntax " ++
- "to pass Hoogle arguments, e.g. stack hoogle -- --count=20 or " ++
- "stack hoogle -- server --local")
+ ("Run hoogle, the Haskell API search engine. Use the '-- ARGUMENT(S)' syntax " ++
+ "to pass Hoogle arguments, e.g. stack hoogle -- --count=20, or " ++
+ "stack hoogle -- server --local.")
hoogleCmd
- ((,,,) <$> many (strArgument (metavar "ARG"))
+ ((,,,) <$> many (strArgument
+ (metavar "-- ARGUMENT(S) (e.g. stack hoogle -- server --local)"))
<*> boolFlags
True
"setup"
@@ -297,7 +298,7 @@
-- These are the only commands allowed in interpreter mode as well
addCommand' "exec"
- "Execute a command"
+ "Execute a command. If the command is absent, the first of any arguments is taken as the command."
execCmd
(execOptsParser Nothing)
addCommand' "run"
diff --git a/src/test/Stack/Config/DockerSpec.hs b/src/test/Stack/Config/DockerSpec.hs
--- a/src/test/Stack/Config/DockerSpec.hs
+++ b/src/test/Stack/Config/DockerSpec.hs
@@ -1,37 +1,26 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ViewPatterns #-}
module Stack.Config.DockerSpec (spec) where
import Test.Hspec
-import Test.Hspec.QuickCheck
import Stack.Prelude
import Stack.Types.Resolver
import RIO.Time (fromGregorian)
-import Stack.Config.Docker (parseLtsName, addDefaultTag)
+import Stack.Config.Docker (addDefaultTag)
spec :: Spec
spec = do
- prop "parseLtsName" $ \(abs -> x) (abs -> y) -> do
- case ltsSnapshotLocation x y of
- RSLUrl url _ ->
- case parseLtsName url of
- Just (x', y') -> do
- x `shouldBe` x'
- y `shouldBe` y'
- Nothing -> error "parseLtsName failed"
- loc -> error $ show loc
describe "addDefaultTag" $ do
it "succeeds fails no resolver" $ addDefaultTag "foo/bar" Nothing Nothing `shouldBe` Nothing
it "succeeds on LTS" $
addDefaultTag
"foo/bar"
Nothing
- (Just $ ARResolver $ ltsSnapshotLocation 1 2)
+ (Just $ ARResolver $ RSLSynonym $ LTS 1 2)
`shouldBe` Just "foo/bar:lts-1.2"
it "fails on nightly" $
addDefaultTag
"foo/bar"
Nothing
- (Just $ ARResolver $ nightlySnapshotLocation $ fromGregorian 2018 1 1)
+ (Just $ ARResolver $ RSLSynonym $ Nightly $ fromGregorian 2018 1 1)
`shouldBe` Nothing
diff --git a/src/test/Stack/ConfigSpec.hs b/src/test/Stack/ConfigSpec.hs
--- a/src/test/Stack/ConfigSpec.hs
+++ b/src/test/Stack/ConfigSpec.hs
@@ -121,11 +121,11 @@
it "parses snapshot using 'resolver'" $ inTempDir $ do
loadProject resolverConfig $ \Project{..} ->
- projectResolver `shouldBe` ltsSnapshotLocation 2 10
+ projectResolver `shouldBe` RSLSynonym (LTS 2 10)
it "parses snapshot using 'snapshot'" $ inTempDir $ do
loadProject snapshotConfig $ \Project{..} ->
- projectResolver `shouldBe` ltsSnapshotLocation 2 10
+ projectResolver `shouldBe` RSLSynonym (LTS 2 10)
it "throws if both 'resolver' and 'snapshot' are present" $ inTempDir $ do
loadProject resolverSnapshotConfig (const (return ()))
diff --git a/stack.cabal b/stack.cabal
--- a/stack.cabal
+++ b/stack.cabal
@@ -1,6 +1,6 @@
cabal-version: 2.0
name: stack
-version: 2.3.3
+version: 2.5.1
license: BSD3
license-file: LICENSE
maintainer: manny@fpcomplete.com
@@ -276,7 +276,7 @@
network-uri >=2.6.2.0,
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
- pantry ==0.4.*,
+ pantry >=0.5.1.3,
path >=0.6.1,
path-io >=1.4.2,
persistent >=2.9.2,
@@ -288,8 +288,8 @@
project-template >=0.2.0.1,
regex-applicative-text >=0.1.0.1,
retry >=0.8.1.0,
- rio >=0.1.14.0,
- rio-prettyprint >=0.1.0.0,
+ rio >=0.1.18.0,
+ rio-prettyprint >=0.1.1.0,
semigroups >=0.18.5,
split >=0.2.3.3,
stm >=2.5.0.0,
@@ -403,7 +403,7 @@
network-uri >=2.6.2.0,
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
- pantry ==0.4.*,
+ pantry >=0.5.1.3,
path >=0.6.1,
path-io >=1.4.2,
persistent >=2.9.2,
@@ -415,8 +415,8 @@
project-template >=0.2.0.1,
regex-applicative-text >=0.1.0.1,
retry >=0.8.1.0,
- rio >=0.1.14.0,
- rio-prettyprint >=0.1.0.0,
+ rio >=0.1.18.0,
+ rio-prettyprint >=0.1.1.0,
semigroups >=0.18.5,
split >=0.2.3.3,
stack -any,
@@ -534,7 +534,7 @@
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
optparse-generic >=1.3.1,
- pantry ==0.4.*,
+ pantry >=0.5.1.3,
path >=0.6.1,
path-io >=1.4.2,
persistent >=2.9.2,
@@ -546,8 +546,8 @@
project-template >=0.2.0.1,
regex-applicative-text >=0.1.0.1,
retry >=0.8.1.0,
- rio >=0.1.14.0,
- rio-prettyprint >=0.1.0.0,
+ rio >=0.1.18.0,
+ rio-prettyprint >=0.1.1.0,
semigroups >=0.18.5,
split >=0.2.3.3,
stm >=2.5.0.0,
@@ -669,7 +669,7 @@
network-uri >=2.6.2.0,
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
- pantry ==0.4.*,
+ pantry >=0.5.1.3,
path >=0.6.1,
path-io >=1.4.2,
persistent >=2.9.2,
@@ -682,8 +682,8 @@
raw-strings-qq >=1.1,
regex-applicative-text >=0.1.0.1,
retry >=0.8.1.0,
- rio >=0.1.14.0,
- rio-prettyprint >=0.1.0.0,
+ rio >=0.1.18.0,
+ rio-prettyprint >=0.1.1.0,
semigroups >=0.18.5,
smallcheck >=1.1.5,
split >=0.2.3.3,
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -28,9 +28,11 @@
- hpack-0.33.0@rev:0
- http-download-0.2.0.0@rev:0
- filelock-0.1.1.5@rev:0
-- pantry-0.4.0.1@rev:0
+- rio-0.1.19.0@rev:0
+- rio-prettyprint-0.1.1.0@rev:0
- casa-client-0.0.1@rev:0
- casa-types-0.0.1@rev:0
+- pantry-0.5.1.3@rev:0
drop-packages:
# See https://github.com/commercialhaskell/stack/pull/4712