diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2017-08-19 20:03:53 +0200 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2017-08-19 20:05:25 +0200 |
| commit | 765984189a0e4bd8981512b5fbf3b715ab006b09 (patch) | |
| tree | 727188f7a0e097c6d17093821689fb6249c46b2c | |
| parent | d7939494f720a9fadd857c99310437d583da40ae (diff) | |
Fix Cabal dependency bounds
The cabal guys released what was originally called 2.1 as 2.0 -.-
| -rw-r--r-- | cabal-helper.cabal | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/cabal-helper.cabal b/cabal-helper.cabal index bc83462..7ec68c0 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -45,7 +45,7 @@ source-repository head custom-setup setup-depends: base - , Cabal (>= 1.14 && < 1.25) || (>= 2.1 && < 2.2) + , Cabal (>= 1.14 && < 1.25) || (>= 2.0 && < 2.1) , containers , filepath , directory @@ -61,7 +61,7 @@ library default-language: Haskell2010 ghc-options: -Wall build-depends: base < 5 && >= 4.5 - , Cabal < 2.2 && >= 2.1 || < 1.26 && >= 1.14 + , Cabal < 2.1 && >= 2.0 || < 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 @@ -86,7 +86,7 @@ executable cabal-helper-wrapper scope: private x-scope: private build-depends: base < 5 && >= 4.5 - , Cabal < 2.2 && >= 2.1 || < 1.26 && >= 1.14 + , Cabal < 2.1 && >= 2.0 || < 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 @@ -136,24 +136,24 @@ test-suite spec -- TODO: Use cabal_macros.h to replace -D flags by including it in -- CabalHelper.Data -- --- executable cabal-helper-main --- if flag(dev) --- buildable: True --- else --- buildable: False --- default-language: Haskell2010 --- default-extensions: NondecreasingIndentation --- main-is: CabalHelper/Main.hs --- other-modules: --- ghc-options: -Wall -fno-warn-unused-imports -optP-DCABAL_MAJOR=1 -optP-DCABAL_MINOR=25 -optP-DCABAL_HELPER=1 -optP-DCABAL_HELPER_DEV=1 --- build-depends: base --- , Cabal --- , containers --- , bytestring --- , filepath --- , directory --- --- flag dev --- description: Build development components --- default: False --- manual: True +executable cabal-helper-main + if flag(dev) + buildable: True + else + buildable: False + default-language: Haskell2010 + default-extensions: NondecreasingIndentation + main-is: CabalHelper/Main.hs + other-modules: + ghc-options: -Wall -fno-warn-unused-imports -optP-DCABAL_MAJOR=1 -optP-DCABAL_MINOR=25 -optP-DCABAL_HELPER=1 -optP-DCABAL_HELPER_DEV=1 + build-depends: base + , Cabal + , containers + , bytestring + , filepath + , directory + +flag dev + description: Build development components + default: False + manual: True |