From 7f05edba322b643dab4ca0926fd307dd979a0455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Sat, 27 May 2017 01:57:57 +0200 Subject: [PATCH] Re-introduce bounds on 'base' for `cabal check` --- ghc-mod.cabal | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/ghc-mod.cabal b/ghc-mod.cabal index 61d473b..86c4ee5 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -170,8 +170,7 @@ Library System.Directory.ModTime Build-Depends: -- See Note [GHC Boot libraries] - base - , binary + binary , bytestring , containers , deepseq @@ -184,6 +183,7 @@ Library , time , transformers + , base < 4.10 && >= 4.6.0.1 , djinn-ghc < 0.1 && >= 0.0.2.2 , extra < 1.6 && >= 1.4 , fclabels < 2.1 && >= 2.0 @@ -225,12 +225,12 @@ Executable ghc-mod X-Internal: True Build-Depends: -- See Note [GHC Boot libraries] - base - , directory + directory , filepath , mtl , process + , base < 4.10 && >= 4.6.0.1 , fclabels < 2.1 && >= 2.0 , monad-control < 1.1 && >= 1 , optparse-applicative == 0.13.0.* @@ -254,8 +254,7 @@ Executable ghc-modi HS-Source-Dirs: ., src, shared Build-Depends: -- See Note [GHC Boot libraries] - base - , binary + binary , deepseq , directory , filepath @@ -263,6 +262,8 @@ Executable ghc-modi , process , time + , base < 4.10 && >= 4.6.0.1 + , ghc-mod @@ -273,7 +274,7 @@ Test-Suite doctest Ghc-Options: -Wall Default-Extensions: ConstraintKinds, FlexibleContexts Main-Is: doctests.hs - Build-Depends: base + Build-Depends: base < 4.10 && >= 4.6.0.1 , doctest < 0.12 && >= 0.9.3 @@ -313,14 +314,14 @@ Test-Suite spec Build-Depends: -- See Note [GHC Boot libraries] - base - , containers + containers , directory , filepath , mtl , process , transformers + , base < 4.10 && >= 4.6.0.1 , fclabels < 2.1 && >= 2.0 , hspec < 2.4 && >= 2.0.0 , monad-journal < 0.8 && >= 0.4 @@ -329,7 +330,7 @@ Test-Suite spec if impl(ghc < 7.8) - Build-Depends: convertible < 1.2 && >= 1.1.0.0 + Build-Depends: convertible < 1.2 && >= 1.1.0.0 if impl(ghc >= 8.0) Build-Depends: ghc-boot @@ -345,8 +346,8 @@ Test-Suite shelltest Hs-Source-Dirs: shelltest Type: exitcode-stdio-1.0 Build-Tools: shelltest - Build-Depends: base - , process < 1.5 + Build-Depends: base < 4.10 && >= 4.6.0.1 + , process < 1.5 -- , shelltestrunner >= 1.3.5 if !flag(shelltest) Buildable: False @@ -362,10 +363,10 @@ Benchmark criterion Main-Is: Bench.hs Build-Depends: -- See Note [GHC Boot libraries] - base - , directory + directory , filepath + , base < 4.10 && >= 4.6.0.1 , criterion < 1.2 && >= 1.1.1.0 , temporary < 1.3 && >= 1.2.0.3