From 4e8f2c11d31800c88740e208d7d17348e2b04b42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2018 12:31:08 +0200 Subject: [PATCH] Allow building with base-4.12. The build succeeds just fine and all test suites pass, too. --- hledger-api/hledger-api.cabal | 4 ++-- hledger-api/package.yaml | 2 +- hledger-lib/hledger-lib.cabal | 8 ++++---- hledger-lib/package.yaml | 2 +- hledger-ui/hledger-ui.cabal | 4 ++-- hledger-ui/package.yaml | 2 +- hledger-web/hledger-web.cabal | 4 ++-- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 10 +++++----- hledger/package.yaml | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index a40f6e516..ec5b14425 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: a7796b2c57190b1a9a60ea235d0249aeff513bd31e171803183335d0065c6bdf +-- hash: 9a4689262776b01e2b52c1aea3e473b3b94b18a79a4e5f5722bdaf48e14df1e5 name: hledger-api version: 1.11.99 @@ -50,7 +50,7 @@ executable hledger-api build-depends: Decimal , aeson - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , bytestring , containers , data-default >=0.5 diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index 3fa57319a..eada0cc48 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -34,7 +34,7 @@ extra-source-files: dependencies: - hledger-lib >=1.11.99 && <1.12 - hledger >=1.11.99 && <1.12 -- base >=4.8 && <4.12 +- base >=4.8 && <4.13 - aeson - bytestring - containers diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index bbd5543d8..2dca824e3 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 90a6e00affee2de34a1d34c52c01445d207316b5114a60e0f890697053dacc00 +-- hash: ae5e73c091e30c202086784f5bc6fc55cd31198c284be23ec13750ad4f2de6ef name: hledger-lib version: 1.11.99 @@ -107,7 +107,7 @@ library , Glob >=0.9 , ansi-terminal >=0.6.2.3 , array - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , blaze-markup >=0.5.1 , bytestring @@ -206,7 +206,7 @@ test-suite doctests , Glob >=0.7 , ansi-terminal >=0.6.2.3 , array - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , blaze-markup >=0.5.1 , bytestring @@ -306,7 +306,7 @@ test-suite easytests , Glob >=0.9 , ansi-terminal >=0.6.2.3 , array - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , blaze-markup >=0.5.1 , bytestring diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 65f61bf90..ea27d4329 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -39,7 +39,7 @@ extra-source-files: #data-files: dependencies: -- base >=4.8 && <4.12 +- base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 - ansi-terminal >=0.6.2.3 - array diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index e488d1c1a..1a51a400c 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 0732dd6182685765b68edb5dd5009c0f24bc3367b4c51720b0aa2a07ecfca483 +-- hash: 5e4bfca54b6db22da98dd0182785240d2f89ae97b32433027b1ed144d8398c4f name: hledger-ui version: 1.11.99 @@ -68,7 +68,7 @@ executable hledger-ui build-depends: ansi-terminal >=0.6.2.3 , async - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , cmdargs >=0.8 , containers diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index f0c6f2438..73a0642d6 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -44,7 +44,7 @@ dependencies: - hledger-lib >=1.11.99 && <1.12 - ansi-terminal >=0.6.2.3 - async -- base >=4.8 && <4.12 +- base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 - cmdargs >=0.8 - containers diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 7b3fbdbf6..b67dd42ee 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 7ec1692d7c6c7546bdd9fd2109f7ef00f02082133a0d732ff552d8099d3cbd7c +-- hash: e4136e80ffc0f91a70be9ba2c2051cd80b2580f67c01bdb4d311a07d202c0a47 name: hledger-web version: 1.11.99 @@ -152,7 +152,7 @@ library ghc-options: -Wall -fwarn-tabs cpp-options: -DVERSION="1.11.99" build-depends: - base >=4.8 && <4.12 + base >=4.8 && <4.13 , blaze-html , blaze-markup , bytestring diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 6ea36a252..6ebfe65a5 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -97,7 +97,7 @@ library: dependencies: - hledger-lib >=1.11.99 && <1.12 - hledger >=1.11.99 && <1.12 - - base >=4.8 && <4.12 + - base >=4.8 && <4.13 - blaze-html - blaze-markup - bytestring diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 863b3e26d..17fff545a 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 995aea33041ad8471478cf73afdbecaf642ee8f7fe6027600d9aa49f97508138 +-- hash: 0c493cc89b0b040504bc5dfad3504ba6f45d6a93042361aa52838e7ee0563be4 name: hledger version: 1.11.99 @@ -117,7 +117,7 @@ library Decimal , Diff , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , bytestring , cmdargs >=0.10 @@ -169,7 +169,7 @@ executable hledger build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , bytestring , cmdargs >=0.10 @@ -223,7 +223,7 @@ test-suite test build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , bytestring , cmdargs >=0.10 @@ -276,7 +276,7 @@ benchmark bench build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.12 + , base >=4.8 && <4.13 , base-compat-batteries >=0.10.1 && <0.11 , bytestring , cmdargs >=0.10 diff --git a/hledger/package.yaml b/hledger/package.yaml index 4264bcfb5..a9d3563c8 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -80,7 +80,7 @@ ghc-options: dependencies: - hledger-lib >=1.11.99 && <1.12 - ansi-terminal >=0.6.2.3 -- base >=4.8 && <4.12 +- base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 - bytestring - cmdargs >=0.10