Ignore stack patchlevel for doc links and docker exe dl

Author: borsboom

src/Stack/Options/BuildParser.hs

@@ -4,17 +4,16 @@
 module Stack.Options.BuildParser where
 
 import qualified Data.Map as Map
-import           Data.Version (showVersion)
 import           Options.Applicative
 import           Options.Applicative.Args
 import           Options.Applicative.Builder.Extra
-import           Paths_stack as Meta
 import           Stack.Options.Completion
 import           Stack.Options.PackageParser (readFlag)
 import           Stack.Prelude
 import           Stack.Types.Config
 import           Stack.Types.FlagName
 import           Stack.Types.PackageName
+import           Stack.Types.Version
 
 -- | Parser for CLI-only build arguments
 buildOptsParser :: BuildCommand
@@ -92,7 +91,7 @@ targetsParser =
               completer targetCompleter <>
               help ("If none specified, use all local packages. " <>
                     "See https://docs.haskellstack.org/en/v" <>
-                    showVersion Meta.version <>
+                    versionString stackMinorVersion <>
                     "/build_command/#target-syntax for details.")))
 
 flagsParser :: Parser (Map.Map (Maybe PackageName) (Map.Map FlagName Bool))

src/Stack/Options/GhciParser.hs

@@ -1,16 +1,15 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 module Stack.Options.GhciParser where
 
-import           Data.Version                      (showVersion)
 import           Options.Applicative
 import           Options.Applicative.Args
 import           Options.Applicative.Builder.Extra
-import           Paths_stack                       as Meta
 import           Stack.Config                      (packagesParser)
 import           Stack.Ghci                        (GhciOpts (..))
 import           Stack.Options.BuildParser         (flagsParser)
 import           Stack.Options.Completion
 import           Stack.Prelude
+import           Stack.Types.Version
 
 -- | Parser for GHCI options
 ghciOptsParser :: Parser GhciOpts
@@ -21,7 +20,7 @@ ghciOptsParser = GhciOpts
                          completer (targetCompleter <> fileExtCompleter [".hs", ".lhs"]) <>
                          help ("If none specified, use all local packages. " <>
                                "See https://docs.haskellstack.org/en/v" <>
-                               showVersion Meta.version <>
+                               versionString stackMinorVersion <>
                                "/build_command/#target-syntax for details. " <>
                                "If a path to a .hs or .lhs file is specified, it will be loaded.")))
              <*> fmap concat (many (argsOption (long "ghci-options" <>

src/Stack/Setup.hs

@@ -61,15 +61,13 @@ import qualified    Data.Yaml as Yaml
 import              Distribution.System (OS, Arch (..), Platform (..))
 import qualified    Distribution.System as Cabal
 import              Distribution.Text (simpleParse)
-import              Distribution.Version (mkVersion')
 import              Lens.Micro (set)
 import              Network.HTTP.Simple (getResponseBody, httpLBS, withResponse, getResponseStatusCode)
 import              Network.HTTP.Download
 import              Path
 import              Path.CheckInstall (warnInstallSearchPathIssues)
 import              Path.Extra (toFilePathNoTrailingSep)
 import              Path.IO hiding (findExecutable, withSystemTempDir)
-import qualified    Paths_stack as Meta
 import              Prelude (getLine, putStr, putStrLn, until)
 import              Stack.Build (build)
 import              Stack.Config (loadConfig)
@@ -661,7 +659,7 @@ ensureDockerStackExe containerPlatform = do
     stackExeExists <- doesFileExist stackExePath
     unless stackExeExists $ do
         logInfo $ mconcat ["Downloading Docker-compatible ", T.pack stackProgName, " executable"]
-        sri <- downloadStackReleaseInfo Nothing Nothing (Just (versionString stackVersion))
+        sri <- downloadStackReleaseInfo Nothing Nothing (Just (versionString stackMinorVersion))
         platforms <- runReaderT preferredPlatforms (containerPlatform, PlatformVariantNone)
         downloadStackExe platforms sri stackExeDir False (const $ return ())
     return stackExePath
@@ -1983,6 +1981,3 @@ getDownloadVersion (StackReleaseInfo val) = do
     String rawName <- HashMap.lookup "name" o
     -- drop the "v" at the beginning of the name
     parseVersion $ T.drop 1 rawName
-
-stackVersion :: Version
-stackVersion = fromCabalVersion (mkVersion' Meta.version)

src/Stack/Types/Build.hs

@@ -62,13 +62,11 @@ import           Data.Text.Encoding              (decodeUtf8With)
 import           Data.Text.Encoding.Error        (lenientDecode)
 import           Data.Time.Calendar
 import           Data.Time.Clock
-import           Data.Version                    (showVersion)
 import           Distribution.PackageDescription (TestSuiteInterface)
 import           Distribution.System             (Arch)
 import qualified Distribution.Text               as C
 import           Path                            (mkRelDir, parseRelDir, (</>))
 import           Path.Extra                      (toFilePathNoTrailingSep)
-import           Paths_stack                     as Meta
 import           Stack.Constants
 import           Stack.Types.BuildPlan
 import           Stack.Types.Compiler
@@ -187,7 +185,7 @@ instance Show StackBuildException where
                 "The following target packages were not found: " ++
                 intercalate ", " (map packageNameString $ Set.toList noKnown) ++
                 "\nSee https://docs.haskellstack.org/en/v"
-                <> showVersion Meta.version <>
+                <> versionString stackMinorVersion <>
                 "/build_command/#target-syntax for details."
         notInSnapshot'
             | Map.null notInSnapshot = []

src/Stack/Types/Version.hs

@@ -29,7 +29,10 @@ module Stack.Types.Version
   ,latestApplicableVersion
   ,checkVersion
   ,nextMajorVersion
-  ,UpgradeTo(..))
+  ,UpgradeTo(..)
+  ,minorVersion
+  ,stackVersion
+  ,stackMinorVersion)
   where
 
 import           Stack.Prelude hiding (Vector)
@@ -45,6 +48,7 @@ import           Distribution.Text (disp)
 import qualified Distribution.Version as Cabal
 import           Language.Haskell.TH
 import           Language.Haskell.TH.Syntax
+import qualified Paths_stack as Meta
 import           Text.PrettyPrint (render)
 
 -- | A parse fail.
@@ -219,3 +223,15 @@ checkVersion check (Version wanted) (Version actual) =
             (Nothing, _) -> True
             (Just _, Nothing) -> False
             (Just w, Just a) -> a >= w
+
+-- | Get minor version (excludes any patchlevel)
+minorVersion :: Version -> Version
+minorVersion (Version v) = Version (V.take 3 v)
+
+-- | Current Stack version
+stackVersion :: Version
+stackVersion = fromCabalVersion (Cabal.mkVersion' Meta.version)
+
+-- | Current Stack minor version (excludes patchlevel)
+stackMinorVersion :: Version
+stackMinorVersion = minorVersion stackVersion