From 6a36efb7cad36e27f2b36172afce10b66795859d Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 16 Nov 2016 13:14:02 -0800 Subject: [PATCH] set base lower bound to 4.8 to enforce GHC 7.10+ hledger-lib had a valid install plan with GHC 7.8, but requires GHC 7.10 to compile (currently). Require base 4.8+ everywhere so that stack/cabal will enforce a supported GHC version early. Also, bump hledger-ui's "stability" to "stable". --- hledger-api/hledger-api.cabal | 2 +- hledger-api/package.yaml | 2 +- hledger-lib/hledger-lib.cabal | 6 +++--- hledger-lib/package.yaml | 2 +- hledger-ui/hledger-ui.cabal | 4 ++-- hledger-ui/package.yaml | 4 ++-- hledger-web/hledger-web.cabal | 6 +++--- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 8 ++++---- hledger/package.yaml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 355cbc53f..d7f412062 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -48,7 +48,7 @@ executable hledger-api build-depends: hledger-lib >= 1.0 && < 1.1 , hledger >= 1.0 && < 1.1 - , base >=4 && <5 + , base >=4.8 && <5 , aeson , bytestring , containers diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index f6947c758..db158e119 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -29,7 +29,7 @@ data-files: dependencies: - hledger-lib >= 1.0 && < 1.1 - hledger >= 1.0 && < 1.1 -- base >=4 && <5 +- base >=4.8 && <5 - aeson - bytestring - containers diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index f04e2cb94..ea130ebbc 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -58,7 +58,7 @@ library , . ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , array , blaze-markup >=0.5.1 @@ -155,7 +155,7 @@ test-suite doctests ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans main-is: doctests.hs build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , array , blaze-markup >=0.5.1 @@ -243,7 +243,7 @@ test-suite hunittests , tests ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , array , blaze-markup >=0.5.1 diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 345781764..0a4d9d353 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -39,7 +39,7 @@ flags: manual: false default: false dependencies: -- base >=4.3 && <5 +- base >=4.8 && <5 - base-compat >=0.8.1 - array - blaze-markup >=0.5.1 diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 3250b949c..9a6839638 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -4,7 +4,7 @@ name: hledger-ui version: 1.0.4 -stability: beta +stability: stable category: Finance, Console synopsis: Curses-style user interface for the hledger accounting tool description: This is hledger's curses-style interface. @@ -60,7 +60,7 @@ executable hledger-ui hledger >= 1.0.1 && < 1.1 , hledger-lib >= 1.0.1 && < 1.1 , ansi-terminal >= 0.6.2.3 && < 0.7 - , base >= 3 && < 5 + , base >= 4.8 && < 5 , base-compat >= 0.8.1 , cmdargs >= 0.8 , containers diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index eec3f5125..504d3733e 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -51,7 +51,7 @@ executables: - hledger >= 1.0.1 && < 1.1 - hledger-lib >= 1.0.1 && < 1.1 - ansi-terminal >= 0.6.2.3 && < 0.7 - - base >= 3 && < 5 + - base >= 4.8 && < 5 - base-compat >= 0.8.1 - cmdargs >= 0.8 - containers @@ -97,5 +97,5 @@ executables: else: dependencies: - time >= 1.5 -stability : beta +stability : stable tested-with : GHC==7.10.3, GHC==8.0 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index a1e4b255e..43e2f156d 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -129,7 +129,7 @@ library build-depends: hledger-lib >= 1.0.1 && < 1.1 , hledger >= 1.0.1 && < 1.1 - , base >=4 && <5 + , base >=4.8 && <5 , base-compat >=0.8.1 , blaze-html , blaze-markup @@ -203,7 +203,7 @@ executable hledger-web build-depends: hledger-lib >= 1.0.1 && < 1.1 , hledger >= 1.0.1 && < 1.1 - , base >=4 && <5 + , base >=4.8 && <5 , base-compat >=0.8.1 , blaze-html , blaze-markup @@ -268,7 +268,7 @@ test-suite test build-depends: hledger-lib >= 1.0.1 && < 1.1 , hledger >= 1.0.1 && < 1.1 - , base >=4 && <5 + , base >=4.8 && <5 , base-compat >=0.8.1 , blaze-html , blaze-markup diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 4c9918bdb..ce721d166 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -62,7 +62,7 @@ flags: dependencies: - hledger-lib >= 1.0.1 && < 1.1 - hledger >= 1.0.1 && < 1.1 -- base >=4 && <5 +- base >=4.8 && <5 - base-compat >=0.8.1 - blaze-html - blaze-markup diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 8ba4dd8a6..7c3d4ed8c 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -82,7 +82,7 @@ library ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans cpp-options: -DVERSION="1.0.1" build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 @@ -165,7 +165,7 @@ executable hledger ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans cpp-options: -DVERSION="1.0.1" build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 @@ -226,7 +226,7 @@ test-suite test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans cpp-options: -DVERSION="1.0.1" build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 @@ -287,7 +287,7 @@ benchmark bench ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans default-language: Haskell2010 build-depends: - base >=4.3 && <5 + base >=4.8 && <5 , base-compat >=0.8.1 , directory , file-embed >=0.0.10 && <0.1 diff --git a/hledger/package.yaml b/hledger/package.yaml index e7565f2a8..eef080e35 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -63,7 +63,7 @@ flags: manual: false default: false dependencies: -- base >=4.3 && <5 +- base >=4.8 && <5 - base-compat >=0.8.1 - directory - file-embed >=0.0.10 && <0.1