diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2017-06-12 03:08:56 +0200 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2017-06-12 03:08:56 +0200 |
| commit | c8f7ac80ee152d737220c75a4d9b10211a37ace8 (patch) | |
| tree | 0098798db293d9f52960d9f6ed35a998caa415f9 /cabal-helper.cabal | |
| parent | eddd7e4dcbd014030b6c28bc97adf47f7cfad2fb (diff) | |
Update and fix support for Cabal HEAD
Diffstat (limited to 'cabal-helper.cabal')
| -rw-r--r-- | cabal-helper.cabal | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cabal-helper.cabal b/cabal-helper.cabal index c0acce7..826cd56 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -43,9 +43,9 @@ source-repository head type: git location: https://github.com/DanielG/cabal-helper.git -Custom-Setup - Setup-Depends: base - , Cabal >= 1.14 && < 1.25 +custom-setup + setup-depends: base + , Cabal (>= 1.14 && < 1.25) || (>= 2.1 && < 2.2) , containers , filepath , directory @@ -61,7 +61,7 @@ library default-language: Haskell2010 ghc-options: -Wall build-depends: base < 5 && >= 4.5 - , Cabal < 1.26 && >= 1.14 + , Cabal < 2.2 && >= 2.1 || < 1.26 && >= 1.14 , directory < 1.4 && >= 1.1.0.2 , filepath < 1.5 && >= 1.3.0.0 , transformers < 0.6 && >= 0.3.0.0 @@ -82,9 +82,10 @@ executable cabal-helper-wrapper CabalHelper.Log CabalHelper.Sandbox ghc-options: -Wall - x-internal: True + scope: private + x-scope: private build-depends: base < 5 && >= 4.5 - , Cabal < 1.26 && >= 1.14 + , Cabal < 2.2 && >= 2.1 || < 1.26 && >= 1.14 , bytestring < 0.11 && >= 0.9.2.1 , directory < 1.4 && >= 1.1.0.2 , filepath < 1.5 && >= 1.3.0.0 @@ -113,7 +114,7 @@ test-suite spec ghc-options: -Wall build-tools: cabal build-depends: base < 5 && >= 4.5 - , Cabal < 1.26 && >= 1.14 + , Cabal < 2.2 && >= 2.1 || < 1.26 && >= 1.14 , bytestring < 0.11 && >= 0.9.2.1 , directory < 1.4 && >= 1.1.0.2 , filepath < 1.5 && >= 1.3.0.0 |