diff --git a/extract-hackage-info/extract-hackage-info.cabal b/extract-hackage-info/extract-hackage-info.cabal index 9c2cfec55..4eddacf84 100644 --- a/extract-hackage-info/extract-hackage-info.cabal +++ b/extract-hackage-info/extract-hackage-info.cabal @@ -1,27 +1,28 @@ cabal-version: 2.4 -name: extract-hackage-info -version: 0.0.0.0 -author: Thomas Bagrel -maintainer: Thomas Bagrel +name: extract-hackage-info +version: 0.0.0.0 +maintainer: Thomas Bagrel +author: Thomas Bagrel executable extract-hackage-info main-is: Main.hs hs-source-dirs: src default-language: Haskell2010 + ghc-options: -O2 -Wall -rtsopts build-depends: + aeson >=1.0 && <3.0, base >=4.12 && <5.0, + bytestring >=0.10 && <0.11, + containers >=0.6 && <0.7, + directory >=1.0 && <2.0, filepath >=1.2 && <1.5, + ghc-lib-parser >=9.2 && <9.3, optparse-applicative >=0.14 && <0.17, ormolu, + pcre2 >=2.0 && <3.0, + tagsoup >=0.14 && <0.15, text >=0.2 && <1.3, - containers >=0.6 && <0.7, - aeson >= 1.0 && <3.0, - pcre2 >= 2.0 && < 3.0, - directory >= 1.0 && < 2.0, - tagsoup >= 0.14 && < 0.15, - text-format >= 0.3 && < 0.4, - ghc-lib-parser >=9.2 && <9.3, - bytestring >= 0.10 && < 0.11 - ghc-options: -O2 -Wall -rtsopts - if !impl(ghc == 8.10.*) + text-format >=0.3 && <0.4 + + if !impl(ghc >=8.10 && <8.11) buildable: False diff --git a/format.sh b/format.sh index bfbb9a238..b7b8c7521 100755 --- a/format.sh +++ b/format.sh @@ -8,6 +8,8 @@ set -e export LANG="C.UTF-8" cabal format +pushd extract-hackage-info && cabal format && popd +pushd ormolu-live && cabal format && popd ormolu -m inplace $(find app -type f -name "*.hs") ormolu -m inplace $(find src -type f -name "*.hs-boot" -o -name "*.hs") diff --git a/ormolu-live/ormolu-live.cabal b/ormolu-live/ormolu-live.cabal index 998e85cf1..1f6ffb24a 100644 --- a/ormolu-live/ormolu-live.cabal +++ b/ormolu-live/ormolu-live.cabal @@ -1,38 +1,48 @@ cabal-version: 2.4 -name: ormolu-live -version: 0.0.0.0 -author: Alexander Esgen -maintainer: Alexander Esgen +name: ormolu-live +version: 0.0.0.0 +maintainer: Alexander Esgen +author: Alexander Esgen executable ormolu-live - ghc-options: -Wall -Wincomplete-record-updates -Wincomplete-uni-patterns -fno-warn-name-shadowing -Wmissing-deriving-strategies -Wunused-packages - ghcjs-options: -dedupe - default-extensions: BlockArguments CPP DeriveGeneric DerivingStrategies FlexibleContexts LambdaCase NamedFieldPuns OverloadedLabels OverloadedStrings RecordWildCards TemplateHaskell TypeApplications ViewPatterns - main-is: Main.hs - build-depends: - base - , text ^>= 1.2 - , unliftio ^>= 0.2 - , ormolu - , ghc-lib-parser - , ghc-syntax-highlighter - , miso ^>= 1.8 - , lens ^>= 5.0 - , generic-lens ^>= 2.2 - , gitrev >=1.3 && <1.4 - if !impl(ghcjs) + main-is: Main.hs + hs-source-dirs: src + other-modules: Language.Javascript.JSaddle.Warp.Extra + default-language: Haskell2010 + default-extensions: + BlockArguments CPP DeriveGeneric DerivingStrategies + FlexibleContexts LambdaCase NamedFieldPuns OverloadedLabels + OverloadedStrings RecordWildCards TemplateHaskell TypeApplications + ViewPatterns + + ghc-options: + -Wall -Wincomplete-record-updates -Wincomplete-uni-patterns + -fno-warn-name-shadowing -Wmissing-deriving-strategies + -Wunused-packages + + ghcjs-options: -dedupe build-depends: - jsaddle ^>= 0.9 - , jsaddle-warp ^>= 0.9 - , websockets ^>= 0.12 - , warp ^>= 3.3 - , wai-app-static ^>= 3.1 - hs-source-dirs: src - other-modules: - Language.Javascript.JSaddle.Warp.Extra - default-language: Haskell2010 - if !impl(ghc == 8.10.*) - buildable: False - if impl(ghcjs) - -- remove stack size limit (necessary for the linking step) - ghc-options: +RTS -K0 -RTS + base, + generic-lens ^>=2.2, + ghc-lib-parser, + ghc-syntax-highlighter, + gitrev >=1.3 && <1.4, + lens ^>=5.0, + miso ^>=1.8, + ormolu, + text ^>=1.2, + unliftio ^>=0.2 + + if !impl(ghcjs >=0) + build-depends: + jsaddle ^>=0.9, + jsaddle-warp ^>=0.9, + wai-app-static ^>=3.1, + warp ^>=3.3, + websockets ^>=0.12 + + if !impl(ghc >=8.10 && <8.11) + buildable: False + + if impl(ghcjs >=0) + ghc-options: +RTS -K0 -RTS diff --git a/ormolu.cabal b/ormolu.cabal index 20bb13eb2..b3dd59986 100644 --- a/ormolu.cabal +++ b/ormolu.cabal @@ -88,25 +88,25 @@ library other-modules: GHC.DynFlags default-language: Haskell2010 build-depends: + Cabal >=3.6 && <3.7, Diff >=0.4 && <1.0, + MemoTrie >=0.6 && <0.7, + aeson >=1.0 && <3.0, ansi-terminal >=0.10 && <1.0, + array >=0.5 && <0.6, base >=4.14 && <5.0, bytestring >=0.2 && <0.12, containers >=0.5 && <0.7, + directory ^>=1.3, dlist >=0.8 && <2.0, - array >=0.5 && <0.6, exceptions >=0.6 && <0.11, + filepath >=1.2 && <1.5, ghc-lib-parser >=9.2 && <9.3, mtl >=2.0 && <3.0, syb >=0.7 && <0.8, - text >=0.2 && <1.3, - filepath >=1.2 && <1.5, - directory ^>=1.3, - Cabal >=3.6 && <3.7, - aeson >=1.0 && <3.0, template-haskell, - th-lift-instances >=0.1 && <0.2, - MemoTrie >=0.6 && <0.7 + text >=0.2 && <1.3, + th-lift-instances >=0.1 && <0.2 mixins: ghc-lib-parser hiding (Language.Haskell.TH.Syntax)