Bump ansi-terminal dependency to ansi-terminal-1.0

Author: mpilgrem

package.yaml

@@ -58,7 +58,7 @@ dependencies:
 - Cabal >= 3.8.1.0
 - aeson >= 2.0.3.0
 - annotated-wl-pprint
-- ansi-terminal
+- ansi-terminal >= 1.0
 - array
 - async
 - attoparsec

src/Stack/Config.hs

@@ -138,8 +138,7 @@ import           Stack.Types.Version
                    ( IntersectingVersionRange (..), VersionCheck (..)
                    , stackVersion, withinRange
                    )
-import           System.Console.ANSI
-                   ( hSupportsANSIWithoutEmulation, setSGRCode )
+import           System.Console.ANSI ( hSupportsANSI, setSGRCode )
 import           System.Environment ( getEnvironment, lookupEnv )
 import           System.Info.ShortPathName ( getShortPathName )
 import           System.PosixCompat.Files ( fileOwner, getFileStatus )
@@ -428,8 +427,7 @@ configFromConfigMonoid
         Just True -> pure True
         _ -> getInContainer
     configRunner' <- view runnerL
-    useAnsi <- liftIO $ fromMaybe True <$>
-                        hSupportsANSIWithoutEmulation stderr
+    useAnsi <- liftIO $ hSupportsANSI stderr
     let stylesUpdate' = (configRunner' ^. stylesUpdateL) <>
           configMonoidStyles
         useColor' = runnerUseColor configRunner'

src/Stack/DefaultColorWhen.hs

@@ -1,26 +1,20 @@
+{-# LANGUAGE LambdaCase #-}
+
 module Stack.DefaultColorWhen
   ( defaultColorWhen
   ) where
 
 import           Stack.Prelude ( stdout )
 import           Stack.Types.ColorWhen ( ColorWhen (..) )
-import           System.Console.ANSI ( hSupportsANSIWithoutEmulation )
+import           System.Console.ANSI ( hSupportsANSI )
 import           System.Environment ( lookupEnv )
 
 -- | The default adopts the standard proposed at http://no-color.org/, that
 -- color should not be added by default if the @NO_COLOR@ environment variable
 -- is present.
 defaultColorWhen :: IO ColorWhen
-defaultColorWhen = do
-  -- On Windows, 'hSupportsANSIWithoutEmulation' has the side effect of enabling
-  -- ANSI for ANSI-capable native (ConHost) terminals, if not already
-  -- ANSI-enabled. Consequently, it is actioned even if @NO_COLOR@ might exist,
-  -- as @NO_COLOR@ might be overridden in a yaml configuration file or at the
-  -- command line.
-  supportsANSI <- hSupportsANSIWithoutEmulation stdout
-  mIsNoColor <- lookupEnv "NO_COLOR"
-  pure $ case mIsNoColor of
-    Just _ -> ColorNever
-    _      -> case supportsANSI of
-      Just False -> ColorNever
-      _          -> ColorAuto
+defaultColorWhen = lookupEnv "NO_COLOR" >>= \case
+  Just _ -> pure ColorNever
+  _ -> hSupportsANSI stdout >>= \case
+    False -> pure ColorNever
+    _ -> pure ColorAuto

src/Stack/Runners.hs

@@ -47,7 +47,7 @@ import           Stack.Types.Runner
 import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
 import           Stack.Types.Version
                    ( minorVersion, stackMinorVersion, stackVersion )
-import           System.Console.ANSI ( hSupportsANSIWithoutEmulation )
+import           System.Console.ANSI ( hSupportsANSI )
 import           System.Terminal ( getTerminalWidth )
 
 -- | Type representing exceptions thrown by functions exported by the
@@ -175,8 +175,7 @@ withRunnerGlobal go inner = do
   useColor <- case colorWhen of
     ColorNever -> pure False
     ColorAlways -> pure True
-    ColorAuto -> fromMaybe True <$>
-                          hSupportsANSIWithoutEmulation stderr
+    ColorAuto -> hSupportsANSI stderr
   termWidth <- clipWidth <$> maybe (fromMaybe defaultTerminalWidth
                                     <$> getTerminalWidth)
                                    pure (globalTermWidth go)

src/Stack/Upgrade.hs

@@ -15,8 +15,7 @@ import           Path ( (</>), parseRelDir )
 import           RIO.Process ( proc, runProcess_, withWorkingDir )
 import           Stack.Build ( build )
 import           Stack.Build.Target ( NeedTargets (..) )
-import           Stack.Constants
-                   ( osIsWindows, relDirStackProgName, stackDotYaml )
+import           Stack.Constants ( relDirStackProgName, stackDotYaml )
 import           Stack.Internal.BuildInfo ( maybeGitHash )
 import           Stack.Prelude hiding ( force, Display (..) )
 import           Stack.Runners
@@ -34,7 +33,6 @@ import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
 import           Stack.Types.Runner ( Runner, globalOptsL )
 import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
-import           System.Console.ANSI ( hSupportsANSIWithoutEmulation )
 import           System.Process ( rawSystem, readProcess )
 
 -- | Type representing \'pretty\' exceptions thrown by functions in the
@@ -246,12 +244,6 @@ sourceUpgrade builtHash (SourceOpts gitRepo) =
                     , branch
                     ]
               withWorkingDir (toFilePath tmp) $ proc "git" args runProcess_
-              -- On Windows 10, an upstream issue with the `git clone` command
-              -- means that command clears, but does not then restore, the
-              -- ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for native terminals.
-              -- The following hack re-enables the lost ANSI-capability.
-              when osIsWindows $
-                void $ liftIO $ hSupportsANSIWithoutEmulation stdout
               pure $ Just $ tmp </> relDirStackProgName
       -- We need to access the Pantry database to find out about the latest
       -- Stack available on Hackage. We first use a standard Config to do this,

stack-ghc-9.4.5.yaml

@@ -2,14 +2,20 @@
 # built with GHC 9.4.5.
 
 # GHC 9.4.5
-resolver: nightly-2023-05-03
+resolver: nightly-2023-05-13
 
 packages:
 - .
 
 extra-deps:
-- hi-file-parser-0.1.4.0@sha256:4c3e1f4e2575809c7fe47229f8547c64e22760d77c73456bf017d27e0e736dd8,2660
-- pantry-0.8.2.2@sha256:579aa8538c0fde65f9c08fb97d1d5aee8f59e5cc44e5f8feb350ec54bd2b14a6,6026
+- ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706
+
+allow-newer: true
+
+allow-newer-deps:
+# Required because ansi-wl-pprint-0.6.9 specifies ansi-terminal < 0.12. See:
+# https://github.com/ekmett/ansi-wl-pprint/issues/29
+- ansi-wl-pprint
 
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712
@@ -26,8 +32,6 @@ nix:
   - unzip
 
 flags:
-  ansi-terminal:
-    win32-2-13-1: false
   hackage-security:
     cabal-syntax: true
   mintty:

stack-ghc-9.4.5.yaml.lock

@@ -5,22 +5,15 @@
 
 packages:
 - completed:
-    hackage: hi-file-parser-0.1.4.0@sha256:4c3e1f4e2575809c7fe47229f8547c64e22760d77c73456bf017d27e0e736dd8,2660
+    hackage: ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706
     pantry-tree:
-      sha256: 39ac287c76db4428ba1f78de6d93441d5900609755049557f46c0508a65dcbe3
-      size: 2242
+      sha256: d2028688664a01877fcbf4a7dc820574bec07f17393e570a98c00c49cd28d5cf
+      size: 1061
   original:
-    hackage: hi-file-parser-0.1.4.0@sha256:4c3e1f4e2575809c7fe47229f8547c64e22760d77c73456bf017d27e0e736dd8,2660
-- completed:
-    hackage: pantry-0.8.2.2@sha256:579aa8538c0fde65f9c08fb97d1d5aee8f59e5cc44e5f8feb350ec54bd2b14a6,6026
-    pantry-tree:
-      sha256: f979dadd233a05272bfee435de5d66532692532453d199adb902079a75cb878d
-      size: 2970
-  original:
-    hackage: pantry-0.8.2.2@sha256:579aa8538c0fde65f9c08fb97d1d5aee8f59e5cc44e5f8feb350ec54bd2b14a6,6026
+    hackage: ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706
 snapshots:
 - completed:
-    sha256: 5eb95e9f352b5cc0f192b5039ee2f19c88bddf53928b29a2efc54bc1697ab1ea
-    size: 625217
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/5/3.yaml
-  original: nightly-2023-05-03
+    sha256: a638975b3da9a4182e4b4f0866c5fb01825dc04d74b503cb8e402f38c861368d
+    size: 629111
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/5/13.yaml
+  original: nightly-2023-05-13

stack.cabal

@@ -324,7 +324,7 @@ library
       Cabal >=3.8.1.0
     , aeson >=2.0.3.0
     , annotated-wl-pprint
-    , ansi-terminal
+    , ansi-terminal >=1.0
     , array
     , async
     , attoparsec
@@ -456,7 +456,7 @@ executable stack
       Cabal >=3.8.1.0
     , aeson >=2.0.3.0
     , annotated-wl-pprint
-    , ansi-terminal
+    , ansi-terminal >=1.0
     , array
     , async
     , attoparsec
@@ -581,7 +581,7 @@ executable stack-integration-test
       Cabal >=3.8.1.0
     , aeson >=2.0.3.0
     , annotated-wl-pprint
-    , ansi-terminal
+    , ansi-terminal >=1.0
     , array
     , async
     , attoparsec
@@ -713,7 +713,7 @@ test-suite stack-test
     , QuickCheck
     , aeson >=2.0.3.0
     , annotated-wl-pprint
-    , ansi-terminal
+    , ansi-terminal >=1.0
     , array
     , async
     , attoparsec

stack.yaml

@@ -1,12 +1,13 @@
 # GHC 9.2.7
-resolver: lts-20.19
+resolver: lts-20.20
 
 packages:
 - .
 
 extra-deps:
+- ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706
+- ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482
 - fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
-- hi-file-parser-0.1.4.0@sha256:4c3e1f4e2575809c7fe47229f8547c64e22760d77c73456bf017d27e0e736dd8,2660
 - pantry-0.8.2.2@sha256:579aa8538c0fde65f9c08fb97d1d5aee8f59e5cc44e5f8feb350ec54bd2b14a6,6026
 - persistent-2.14.5.0@sha256:c3c7a6a200930f956b2a6bb15b9d2cd512980692f6a2d95368a6db335c34c916,7199
 - rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301
@@ -15,6 +16,13 @@ extra-deps:
 # lts-20.19 specifies Cabal-syntax-3.6.0.0
 - Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619
 
+allow-newer: true
+
+allow-newer-deps:
+# Required because ansi-wl-pprint-0.6.9 specifies ansi-terminal < 0.12. See:
+# https://github.com/ekmett/ansi-wl-pprint/issues/29
+- ansi-wl-pprint
+
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712
 - cabal-install
@@ -30,8 +38,6 @@ nix:
   - unzip
 
 flags:
-  ansi-terminal:
-    win32-2-13-1: false
   hackage-security:
     Cabal-syntax: true
   mintty:

stack.yaml.lock

@@ -4,20 +4,27 @@
 #   https://docs.haskellstack.org/en/stable/lock_files
 
 packages:
+- completed:
+    hackage: ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706
+    pantry-tree:
+      sha256: d2028688664a01877fcbf4a7dc820574bec07f17393e570a98c00c49cd28d5cf
+      size: 1061
+  original:
+    hackage: ansi-terminal-1.0@sha256:640ffecfd95471388d939fcacb57bdc0cef15f0457746c234a12cdd5a6c6d1e8,2706
+- completed:
+    hackage: ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482
+    pantry-tree:
+      sha256: 0a03e697837c4fae43543f3be0fcf9d88157ba637fbd1b656fc8bf79b1656a14
+      size: 291
+  original:
+    hackage: ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482
 - completed:
     hackage: fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
     pantry-tree:
       sha256: f8e89e81fe0ca6e285036e04b165119ccfc59e7e668c1bfc28927f39062c5949
       size: 1280
   original:
     hackage: fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
-- completed:
-    hackage: hi-file-parser-0.1.4.0@sha256:4c3e1f4e2575809c7fe47229f8547c64e22760d77c73456bf017d27e0e736dd8,2660
-    pantry-tree:
-      sha256: 39ac287c76db4428ba1f78de6d93441d5900609755049557f46c0508a65dcbe3
-      size: 2242
-  original:
-    hackage: hi-file-parser-0.1.4.0@sha256:4c3e1f4e2575809c7fe47229f8547c64e22760d77c73456bf017d27e0e736dd8,2660
 - completed:
     hackage: pantry-0.8.2.2@sha256:579aa8538c0fde65f9c08fb97d1d5aee8f59e5cc44e5f8feb350ec54bd2b14a6,6026
     pantry-tree:
@@ -55,7 +62,7 @@ packages:
     hackage: Cabal-syntax-3.8.1.0@sha256:4936765e9a7a8ecbf8fdbe9067f6d972bc0299220063abb2632a9950af64b966,7619
 snapshots:
 - completed:
-    sha256: 42f77c84b34f68c30c2cd0bf8c349f617a0f428264362426290847a6a2019b64
-    size: 649618
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/19.yaml
-  original: lts-20.19
+    sha256: 126fa33ceb11f5e85ceb4e86d434756bd9a8439e2e5776d306a15fbc63b01e89
+    size: 650041
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/20.yaml
+  original: lts-20.20