From eae197ccb376f611248aa643498f9acff9bb3918 Mon Sep 17 00:00:00 2001 From: Colin Woodbury Date: Fri, 13 Oct 2023 17:31:17 +0900 Subject: [PATCH] chore: bump `versions` upper bound and squash warnings --- app/ghcup/BrickMain.hs | 2 +- ghcup.cabal | 6 +++--- lib-opt/GHCup/OptParse/Common.hs | 2 +- lib-opt/GHCup/OptParse/List.hs | 2 +- lib-opt/GHCup/OptParse/Rm.hs | 2 +- lib-opt/GHCup/OptParse/Set.hs | 2 +- lib-opt/GHCup/OptParse/Upgrade.hs | 2 +- lib/GHCup/Prelude/Version/QQ.hs | 4 +--- stack.yaml | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/ghcup/BrickMain.hs b/app/ghcup/BrickMain.hs index 49baa81..969b8bf 100644 --- a/app/ghcup/BrickMain.hs +++ b/app/ghcup/BrickMain.hs @@ -45,7 +45,7 @@ import Data.IORef import Data.Vector ( Vector , (!?) ) -import Data.Versions hiding ( str ) +import Data.Versions import Haskus.Utils.Variant.Excepts import Prelude hiding ( appendFile ) import System.FilePath diff --git a/ghcup.cabal b/ghcup.cabal index 01ea923..81aebcf 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -87,7 +87,7 @@ common app-common-depends , uri-bytestring ^>=0.3.2.2 , utf8-string ^>=1.0 , vector ^>=0.12 - , versions >=4.0.1 && <6.1 + , versions >=6.0.3 && <6.1 , yaml-streamly ^>=0.12.0 library @@ -189,7 +189,7 @@ library , unordered-containers ^>=0.2.10.0 , uri-bytestring ^>=0.3.2.2 , vector ^>=0.12 - , versions >=4.0.1 && <6.1 + , versions >=6.0.3 && <6.1 , word8 ^>=0.1.3 , yaml-streamly ^>=0.12.0 , zlib ^>=0.6.2.2 @@ -377,7 +377,7 @@ test-suite ghcup-test , text ^>=2.0 , time >=1.9.3 && <1.12 , uri-bytestring ^>=0.3.2.2 - , versions >=4.0.1 && <6.1 + , versions >=6.0.3 && <6.1 if os(windows) cpp-options: -DIS_WINDOWS diff --git a/lib-opt/GHCup/OptParse/Common.hs b/lib-opt/GHCup/OptParse/Common.hs index ebda723..b85e347 100644 --- a/lib-opt/GHCup/OptParse/Common.hs +++ b/lib-opt/GHCup/OptParse/Common.hs @@ -48,7 +48,7 @@ import Data.Maybe import Data.Text ( Text ) import Data.Time.Calendar ( Day ) import Data.Time.Format ( parseTimeM, defaultTimeLocale ) -import Data.Versions hiding ( str ) +import Data.Versions import Data.Void import qualified Data.Vector as V import GHC.IO.Exception diff --git a/lib-opt/GHCup/OptParse/List.hs b/lib-opt/GHCup/OptParse/List.hs index 4de0f9d..fe56c88 100644 --- a/lib-opt/GHCup/OptParse/List.hs +++ b/lib-opt/GHCup/OptParse/List.hs @@ -27,7 +27,7 @@ import Data.List ( intercalate, sort ) import Data.Functor import Data.Maybe import Data.Time.Calendar ( Day ) -import Data.Versions hiding ( str ) +import Data.Versions import Data.Void import Options.Applicative hiding ( style ) import Prelude hiding ( appendFile ) diff --git a/lib-opt/GHCup/OptParse/Rm.hs b/lib-opt/GHCup/OptParse/Rm.hs index 39344ba..565183d 100644 --- a/lib-opt/GHCup/OptParse/Rm.hs +++ b/lib-opt/GHCup/OptParse/Rm.hs @@ -29,7 +29,7 @@ import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Functor import Data.Maybe -import Data.Versions hiding ( str ) +import Data.Versions import Haskus.Utils.Variant.Excepts import Options.Applicative hiding ( style ) import Prelude hiding ( appendFile ) diff --git a/lib-opt/GHCup/OptParse/Set.hs b/lib-opt/GHCup/OptParse/Set.hs index 3ba28d2..c4941b9 100644 --- a/lib-opt/GHCup/OptParse/Set.hs +++ b/lib-opt/GHCup/OptParse/Set.hs @@ -28,7 +28,7 @@ import Control.Monad.Trans.Resource import Data.Either import Data.Functor import Data.Maybe -import Data.Versions hiding ( str ) +import Data.Versions import GHC.Unicode import Haskus.Utils.Variant.Excepts import Options.Applicative hiding ( style ) diff --git a/lib-opt/GHCup/OptParse/Upgrade.hs b/lib-opt/GHCup/OptParse/Upgrade.hs index 1b71c78..db09426 100644 --- a/lib-opt/GHCup/OptParse/Upgrade.hs +++ b/lib-opt/GHCup/OptParse/Upgrade.hs @@ -35,7 +35,7 @@ import System.Environment import GHCup.Utils import System.FilePath import GHCup.Types.Optics -import Data.Versions hiding (str) +import Data.Versions diff --git a/lib/GHCup/Prelude/Version/QQ.hs b/lib/GHCup/Prelude/Version/QQ.hs index 04290ea..030025d 100644 --- a/lib/GHCup/Prelude/Version/QQ.hs +++ b/lib/GHCup/Prelude/Version/QQ.hs @@ -26,9 +26,7 @@ import GHC.Base #endif import Language.Haskell.TH import Language.Haskell.TH.Quote ( QuasiQuoter(..) ) -import Language.Haskell.TH.Syntax ( Lift - , dataToExpQ - ) +import Language.Haskell.TH.Syntax ( dataToExpQ ) import qualified Data.Text as T import qualified Language.Haskell.TH.Syntax as TH diff --git a/stack.yaml b/stack.yaml index 57a2c11..0f7a7d6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -25,7 +25,7 @@ extra-deps: - text-2.0.2 - yaml-streamly-0.12.2 - github: fosskers/versions - commit: e08a188150f120c9b1c5bee8237beed6b1c568bc + commit: 7bc3355348aac3510771d4622aff09ac38c9924d flags: http-io-streams: