From 015bdf6b37c9ba245303abfd247b6164410b8fc5 Mon Sep 17 00:00:00 2001 From: Mark Karpov Date: Mon, 23 Oct 2023 21:50:17 +0200 Subject: [PATCH] Correct dependency bounds Inspired by https://github.com/mrkkrp/megaparsec/pull/548, which see. --- .../extract-hackage-info.cabal | 8 +++--- ormolu.cabal | 26 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extract-hackage-info/extract-hackage-info.cabal b/extract-hackage-info/extract-hackage-info.cabal index f9201b88..ba3c42e4 100644 --- a/extract-hackage-info/extract-hackage-info.cabal +++ b/extract-hackage-info/extract-hackage-info.cabal @@ -12,14 +12,14 @@ executable extract-hackage-info ghc-options: -O2 -Wall -rtsopts -Wunused-packages build-depends: Cabal-syntax >=3.10 && <3.11, - base >=4.12 && <5.0, + base >=4.12 && <5, binary >=0.8 && <0.9, bytestring >=0.10 && <0.13, containers >=0.6 && <0.8, - directory >=1.0 && <2.0, + directory >=1 && <2, filepath >=1.2 && <1.5, optparse-applicative >=0.14 && <0.19, ormolu, - text >=2.0 && <3.0, + text >=2 && <3, formatting >=7.1 && <7.3, - megaparsec >=9.0 + megaparsec >=9 diff --git a/ormolu.cabal b/ormolu.cabal index 98360a06..ff5aafd5 100644 --- a/ormolu.cabal +++ b/ormolu.cabal @@ -98,11 +98,11 @@ library default-language: GHC2021 build-depends: Cabal-syntax >=3.10 && <3.11, - Diff >=0.4 && <1.0, + Diff >=0.4 && <1, MemoTrie >=0.6 && <0.7, ansi-terminal >=0.10 && <1.1, array >=0.5 && <0.6, - base >=4.14 && <5.0, + base >=4.14 && <5, binary >=0.8 && <0.9, bytestring >=0.2 && <0.13, containers >=0.5 && <0.8, @@ -111,10 +111,10 @@ library file-embed >=0.0.15 && <0.1, filepath >=1.2 && <1.5, ghc-lib-parser >=9.8 && <9.9, - megaparsec >=9.0, - mtl >=2.0 && <3.0, + megaparsec >=9, + mtl >=2 && <3, syb >=0.7 && <0.8, - text >=2.0 && <3.0 + text >=2 && <3 if flag(dev) ghc-options: @@ -135,14 +135,14 @@ executable ormolu default-language: GHC2021 build-depends: Cabal-syntax >=3.10 && <3.11, - base >=4.12 && <5.0, + base >=4.12 && <5, containers >=0.5 && <0.7, directory ^>=1.3, filepath >=1.2 && <1.5, ghc-lib-parser >=9.8 && <9.9, optparse-applicative >=0.14 && <0.19, ormolu, - text >=2.0 && <3.0, + text >=2 && <3, th-env >=0.1.1 && <0.2 if flag(dev) @@ -156,7 +156,7 @@ executable ormolu test-suite tests type: exitcode-stdio-1.0 main-is: Spec.hs - build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0 + build-tool-depends: hspec-discover:hspec-discover >=2 && <3 hs-source-dirs: tests other-modules: Ormolu.CabalInfoSpec @@ -174,19 +174,19 @@ test-suite tests build-depends: Cabal-syntax >=3.10 && <3.11, QuickCheck >=2.14, - base >=4.14 && <5.0, + base >=4.14 && <5, containers >=0.5 && <0.7, directory ^>=1.3, filepath >=1.2 && <1.5, ghc-lib-parser >=9.8 && <9.9, - hspec >=2.0 && <3.0, + hspec >=2 && <3, hspec-megaparsec >=2.2, - megaparsec >=9.0, + megaparsec >=9, ormolu, path >=0.6 && <0.10, - path-io >=1.4.2 && <2.0, + path-io >=1.4.2 && <2, temporary ^>=1.3, - text >=2.0 && <3.0 + text >=2 && <3 if flag(dev) ghc-options: