From 7011160bfd54179d65164c1a44fdf3ebef74ddd8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 26 Jan 2020 08:12:25 -0800 Subject: [PATCH] ;allow base 4.14/GHC 8.10 --- 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 | 6 +++--- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 10 +++++----- hledger/package.yaml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index a1b509c66..c6c584024 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: 440daf47cc4866a3723004ada26f77ffdb86d985e23844649c9a5977232a3edd +-- hash: b2d61a17ecf73fc45a71e15b9cfcc938446838dd30dc450b298e013aef0bc49d name: hledger-lib version: 1.16.99 @@ -111,7 +111,7 @@ library , aeson , ansi-terminal >=0.6.2.3 , array - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , blaze-markup >=0.5.1 , bytestring @@ -162,7 +162,7 @@ test-suite doctest , aeson , ansi-terminal >=0.6.2.3 , array - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , blaze-markup >=0.5.1 , bytestring @@ -217,7 +217,7 @@ test-suite unittest , aeson , ansi-terminal >=0.6.2.3 , array - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , blaze-markup >=0.5.1 , bytestring diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 5b820fe0b..18a2f79f4 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -41,7 +41,7 @@ extra-source-files: #data-files: dependencies: -- base >=4.9 && <4.14 +- base >=4.9 && <4.15 - base-compat-batteries >=0.10.1 && <0.12 - aeson - ansi-terminal >=0.6.2.3 diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index c3b0c2eba..644559d78 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: 856f791512f190b68f4f0e62e158d1dfa956f0fa5be963e591472ab2adfa2f4a +-- hash: d942fc87bbac017bc0a5197bc1feb35efafada2078e43679bbf7a56085fcfdd7 name: hledger-ui version: 1.16.99 @@ -68,7 +68,7 @@ executable hledger-ui build-depends: ansi-terminal >=0.6.2.3 , async - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , cmdargs >=0.8 , containers diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 1c8c41ee6..447c89cb7 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -44,7 +44,7 @@ dependencies: - hledger >=1.16.99 && <1.17 - ansi-terminal >=0.6.2.3 - async -- base >=4.9 && <4.14 +- base >=4.9 && <4.15 - base-compat-batteries >=0.10.1 && <0.12 - cmdargs >=0.8 - containers diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 2867a5d10..19b5779de 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.32.0. +-- This file has been generated from package.yaml by hpack version 0.31.2. -- -- see: https://github.com/sol/hpack -- --- hash: 0376acf91d14e3868fa58b399419538104d2187ad41552aa62bd24ca675274b3 +-- hash: dd4bb49b5cd4a8ee266157471b2bb79610dca13664cd3e4f2358c139d81227d3 name: hledger-web version: 1.16.99 @@ -154,7 +154,7 @@ library build-depends: Decimal , aeson - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , blaze-html , blaze-markup , bytestring diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 392c047b7..44ee177ff 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -99,7 +99,7 @@ library: - hledger-lib >=1.16.99 && <1.17 - hledger >=1.16.99 && <1.17 - aeson - - base >=4.9 && <4.14 + - base >=4.9 && <4.15 - blaze-html - blaze-markup - bytestring diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index e451ac594..1a83aad15 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 6ff98e6e17e5d1edb014822f62c4dfeb4b7aef757c434a9a45913640fcc7f845 +-- hash: 62e91c42704c827d860f45861906a26cc47a7bb86090207b35e769861a64b919 name: hledger version: 1.16.99 @@ -150,7 +150,7 @@ library , Diff , aeson , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -202,7 +202,7 @@ executable hledger Decimal , aeson , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -254,7 +254,7 @@ test-suite unittest Decimal , aeson , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -303,7 +303,7 @@ benchmark bench Decimal , aeson , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 diff --git a/hledger/package.yaml b/hledger/package.yaml index e450c75fb..b93ea0740 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -108,7 +108,7 @@ dependencies: - hledger-lib >=1.16.99 && <1.17 - aeson - ansi-terminal >=0.6.2.3 -- base >=4.9 && <4.14 +- base >=4.9 && <4.15 - base-compat-batteries >=0.10.1 && <0.12 - bytestring - cmdargs >=0.10