From 99ddcc938f85757161ec487ae500ec2ca276ac38 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 2 Sep 2023 16:20:54 +0800 Subject: [PATCH] cabal-fmt --- ghcup.cabal | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ghcup.cabal b/ghcup.cabal index 66ec634..2565d7a 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -82,7 +82,7 @@ common app-common-depends , template-haskell >=2.7 && <2.20 , temporary ^>=1.3 , text ^>=2.0 - , time ^>=1.9.3 || ^>=1.10 || ^>=1.11 + , time >=1.9.3 && <1.12 , unordered-containers ^>=0.2 , uri-bytestring ^>=0.3.2.2 , utf8-string ^>=1.0 @@ -174,7 +174,7 @@ library , pretty-terminal ^>=0.1.0.0 , regex-posix ^>=0.96 , resourcet ^>=1.2.2 - , retry ^>=0.8.1.2 || ^>=0.9 + , retry >=0.8.1.2 && <0.10 , safe ^>=0.3.18 , safe-exceptions ^>=0.1 , split ^>=0.2.3.4 @@ -183,7 +183,7 @@ library , template-haskell >=2.7 && <2.20 , temporary ^>=1.3 , text ^>=2.0 - , time ^>=1.9.3 || ^>=1.10 || ^>=1.11 + , time >=1.9.3 && <1.12 , transformers ^>=0.5 , unliftio-core ^>=0.2.0.1 , unordered-containers ^>=0.2.10.0 @@ -239,7 +239,7 @@ library build-depends: vty ^>=5.37 library ghcup-optparse - import: app-common-depends + import: app-common-depends exposed-modules: GHCup.OptParse GHCup.OptParse.ChangeLog @@ -261,8 +261,8 @@ library ghcup-optparse GHCup.OptParse.Upgrade GHCup.OptParse.Whereis - hs-source-dirs: app/ghcup - default-language: Haskell2010 + hs-source-dirs: app/ghcup + default-language: Haskell2010 default-extensions: LambdaCase MultiWayIf @@ -277,7 +277,7 @@ library ghcup-optparse -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates - build-depends: ghcup + build-depends: ghcup if flag(internal-downloader) cpp-options: -DINTERNAL_DOWNLOADER @@ -297,9 +297,8 @@ library ghcup-optparse else build-depends: unix ^>=2.7 - executable ghcup - import: app-common-depends + import: app-common-depends main-is: Main.hs other-modules: GHCup.OptParse @@ -321,6 +320,7 @@ executable ghcup GHCup.OptParse.UnSet GHCup.OptParse.Upgrade GHCup.OptParse.Whereis + hs-source-dirs: app/ghcup default-language: Haskell2010 default-extensions: @@ -338,8 +338,8 @@ executable ghcup -fwarn-incomplete-record-updates -threaded build-depends: - , ghcup-optparse , ghcup + , ghcup-optparse if flag(internal-downloader) cpp-options: -DINTERNAL_DOWNLOADER @@ -400,8 +400,8 @@ test-suite ghcup-test , QuickCheck ^>=2.14.1 , quickcheck-arbitrary-adt ^>=0.3.1.0 , streamly ^>=0.8.2 - , time ^>=1.9.3 || ^>=1.10 || ^>=1.11 , text ^>=2.0 + , time >=1.9.3 && <1.12 , uri-bytestring ^>=0.3.2.2 , versions >=4.0.1 && <5.1 @@ -412,9 +412,9 @@ test-suite ghcup-test build-depends: unix ^>=2.7 test-suite ghcup-optparse-test - type: exitcode-stdio-1.0 - hs-source-dirs: test/optparse-test - main-is: Main.hs + type: exitcode-stdio-1.0 + hs-source-dirs: test/optparse-test + main-is: Main.hs other-modules: ChangeLogTest CompileTest @@ -430,8 +430,9 @@ test-suite ghcup-optparse-test UpgradeTest Utils WhereisTest + default-language: Haskell2010 - ghc-options: -Wall + ghc-options: -Wall build-depends: , base , ghcup