Reorganize build-depends in cabal file

- Sort adjacent lines
- Align version bounds by column globally
- Remove bounds from GHC boot libraries where redundant to make
  maintanance easier
This commit is contained in:
Daniel Gröber 2017-05-18 02:46:12 +02:00
parent 90e7e079bf
commit 26730126ca
1 changed files with 94 additions and 100 deletions

View File

@ -171,42 +171,48 @@ Library
Utils Utils
Data.Binary.Generic Data.Binary.Generic
System.Directory.ModTime System.Directory.ModTime
Build-Depends: base < 5 && >= 4.0 Build-Depends:
, bytestring < 0.11 -- See Note [GHC Boot libraries]
, binary < 0.9 && >= 0.5.1.0 base
, containers < 0.6 , binary
, cabal-helper < 0.8 && >= 0.7.1.0 , bytestring
, deepseq < 1.5 , containers
, directory < 1.4 , deepseq
, filepath < 1.5 , directory
, ghc < 8.2 && >= 7.6 , filepath
, ghc-paths < 0.2 && >= 0.1.0.9 , mtl
, ghc-syb-utils < 0.3 && >= 0.2.3 , old-time
, hlint < 1.10 && >= 1.9.27 , process
, monad-journal < 0.8 && >= 0.4
, old-time < 1.2
, process < 1.5
, syb < 0.7 && >= 0.5.1
, temporary < 1.3 && >= 1.2.0.3
, transformers < 0.6
, time < 1.7
, transformers-base < 0.5 && >= 0.4.4
, mtl < 2.3 && >= 2.0
, monad-control < 1.1 && >= 1
, split < 0.3 && >= 0.2.2
, haskell-src-exts < 1.20 && >= 1.18
, text < 1.3 && >= 1.2.1.3
, djinn-ghc < 0.1 && >= 0.0.2.2
, fclabels < 2.1 && >= 2.0
, extra < 1.6 && >= 1.4
, pipes < 4.4 && >= 4.1
, safe < 0.4 && >= 0.3.9
, optparse-applicative <0.14.0 && >=0.13.0
, template-haskell , template-haskell
if impl(ghc < 7.8) , time
Build-Depends: convertible < 1.2 && >= 1.1.0.0 , transformers
, djinn-ghc < 0.1 && >= 0.0.2.2
, extra < 1.6 && >= 1.4
, fclabels < 2.1 && >= 2.0
, ghc-paths < 0.2 && >= 0.1.0.9
, ghc-syb-utils < 0.3 && >= 0.2.3
, haskell-src-exts < 1.20 && >= 1.18
, hlint < 1.10 && >= 1.9.27
, monad-control < 1.1 && >= 1
, monad-journal < 0.8 && >= 0.4
, optparse-applicative == 0.13.0.*
, pipes < 4.4 && >= 4.1
, safe < 0.4 && >= 0.3.9
, semigroups < 0.19 && >= 0.10.0
, split < 0.3 && >= 0.2.2
, syb < 0.7 && >= 0.5.1
, temporary < 1.3 && >= 1.2.0.3
, text < 1.3 && >= 1.2.1.3
, transformers-base < 0.5 && >= 0.4.4
, cabal-helper < 0.8 && >= 0.7.1.0
, ghc < 8.2 && >= 7.6
if impl(ghc >= 8.0) if impl(ghc >= 8.0)
Build-Depends: ghc-boot Build-Depends: ghc-boot
if impl(ghc < 7.8)
Build-Depends: convertible < 1.2 && >= 1.1.0.0
Executable ghc-mod Executable ghc-mod
Default-Language: Haskell2010 Default-Language: Haskell2010
@ -219,17 +225,22 @@ Executable ghc-mod
GHC-Options: -Wall -fno-warn-deprecations -threaded GHC-Options: -Wall -fno-warn-deprecations -threaded
Default-Extensions: ConstraintKinds, FlexibleContexts Default-Extensions: ConstraintKinds, FlexibleContexts
HS-Source-Dirs: src HS-Source-Dirs: src
Build-Depends: base < 5 && >= 4.0 X-Internal: True
, directory < 1.4 Build-Depends:
, filepath < 1.5 -- See Note [GHC Boot libraries]
, process < 1.5 base
, split < 0.3 && >= 0.2.2 , directory
, mtl < 2.3 && >= 2.0 , filepath
, ghc < 8.2 && >= 7.6 , mtl
, monad-control < 1.1 && >= 1 , process
, fclabels == 2.0.*
, optparse-applicative >=0.13.0 && <0.14.0 , fclabels < 2.1 && >= 2.0
, semigroups < 0.19 && >= 0.10.0 , monad-control < 1.1 && >= 1
, optparse-applicative == 0.13.0.*
, semigroups < 0.19 && >= 0.10.0
, split < 0.3 && >= 0.2.2
, ghc < 8.2 && >= 7.6
, ghc-mod , ghc-mod
@ -244,14 +255,17 @@ Executable ghc-modi
Cpp-Options: -DWINDOWS Cpp-Options: -DWINDOWS
Default-Extensions: ConstraintKinds, FlexibleContexts Default-Extensions: ConstraintKinds, FlexibleContexts
HS-Source-Dirs: src, . HS-Source-Dirs: src, .
Build-Depends: base < 5 && >= 4.0 Build-Depends:
, binary < 0.9 && >= 0.5.1.0 -- See Note [GHC Boot libraries]
, deepseq < 1.5 base
, directory < 1.4 , binary
, filepath < 1.5 , deepseq
, process < 1.5 , directory
, old-time < 1.2 , filepath
, time < 1.7 , old-time
, process
, time
, ghc-mod , ghc-mod
@ -263,7 +277,7 @@ Test-Suite doctest
Default-Extensions: ConstraintKinds, FlexibleContexts Default-Extensions: ConstraintKinds, FlexibleContexts
Main-Is: doctests.hs Main-Is: doctests.hs
Build-Depends: base Build-Depends: base
, doctest < 0.12 && >= 0.9.3 , doctest < 0.12 && >= 0.9.3
Test-Suite spec Test-Suite spec
@ -300,40 +314,22 @@ Test-Suite spec
ShellParseSpec ShellParseSpec
TargetSpec TargetSpec
Build-Depends: hspec < 2.4 && >= 2.0.0
Build-Depends: Build-Depends:
base < 5 && >= 4.0 -- See Note [GHC Boot libraries]
, bytestring < 0.11 base
, binary < 0.9 && >= 0.5.1.0 , containers
, containers < 0.6 , directory
, cabal-helper < 0.8 && >= 0.7.1.0 , filepath
, deepseq < 1.5 , mtl
, directory < 1.4 , process
, filepath < 1.5 , transformers
, ghc < 8.2 && >= 7.6
, ghc-paths < 0.2 && >= 0.1.0.9 , fclabels < 2.1 && >= 2.0
, ghc-syb-utils < 0.3 && >= 0.2.3 , hspec < 2.4 && >= 2.0.0
, hlint < 1.10 && >= 1.9.27 , monad-journal < 0.8 && >= 0.4
, monad-journal < 0.8 && >= 0.4 , split < 0.3 && >= 0.2.2
, old-time < 1.2 , temporary < 1.3 && >= 1.2.0.3
, process < 1.5
, syb < 0.7 && >= 0.5.1
, temporary < 1.3 && >= 1.2.0.3
, transformers < 0.6
, time < 1.7
, transformers-base < 0.5 && >= 0.4.4
, mtl < 2.3 && >= 2.0
, monad-control < 1.1 && >= 1
, split < 0.3 && >= 0.2.2
, haskell-src-exts < 1.20 && >= 1.18
, text < 1.3 && >= 1.2.1.3
, djinn-ghc < 0.1 && >= 0.0.2.2
, fclabels < 2.1 && >= 2.0
, extra < 1.6 && >= 1.4
, pipes < 4.4 && >= 4.1
, safe < 0.4 && >= 0.3.9
, optparse-applicative <0.14.0 && >=0.13.0
, template-haskell
if impl(ghc < 7.8) if impl(ghc < 7.8)
Build-Depends: convertible < 1.2 && >= 1.1.0.0 Build-Depends: convertible < 1.2 && >= 1.1.0.0
@ -367,21 +363,14 @@ Benchmark criterion
DataKinds, KindSignatures, TypeOperators, ViewPatterns DataKinds, KindSignatures, TypeOperators, ViewPatterns
HS-Source-Dirs: bench, test HS-Source-Dirs: bench, test
Main-Is: Bench.hs Main-Is: Bench.hs
Build-Depends: base Build-Depends:
, directory < 1.4 -- See Note [GHC Boot libraries]
, filepath < 1.5 base
, process < 1.5 , directory
, split < 0.3 , filepath
, mtl < 2.3 && >= 2.0
, ghc < 8.1
, monad-journal < 0.8 && >= 0.4 , criterion < 1.2 && >= 1.1.1.0
, fclabels == 2.0.* , temporary < 1.3 && >= 1.2.0.3
, temporary < 1.3
, hspec >= 2.0.0
, criterion
, ghc-mod , ghc-mod
@ -395,3 +384,8 @@ Flag shelltest
Source-Repository head Source-Repository head
Type: git Type: git
Location: https://github.com/DanielG/ghc-mod.git Location: https://github.com/DanielG/ghc-mod.git
-- Note [GHC Boot libraries]
--
-- We don't give bounds to GHC boot libraries as our dependency on 'ghc' already
-- constrains these packages to the version that shipped with GHC.