slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

hledger, web: allow shakespeare 2.*

Browse Source
This commit is contained in:
Simon Michael 2014-04-19 12:15:20 -07:00
parent f2d4378028
commit 499cf41b03
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hledger-web/hledger-web.cabal
View File

@ -123,7 +123,6 @@ library
, data-default , data-default
, directory , directory
, filepath , filepath
, hamlet
, hjsmin , hjsmin
, http-conduit , http-conduit
, http-client >= 0.2 && < 0.4 , http-client >= 0.2 && < 0.4
@ -134,7 +133,17 @@ library
, parsec , parsec
, regexpr >= 0.5.1 , regexpr >= 0.5.1
, safe >= 0.2 , safe >= 0.2
, shakespeare-text -- http://www.yesodweb.com/blog/2014/04/consolidation-progress
-- in order to support both the old and new versions of shakespeare,
-- you just need to ensure that you have both the shakespeare and
-- deprecated packages listed in your cabal file. In other words, if
-- previously you depended on hamlet, now you should depend on hamlet
-- and shakespeare. When you're ready to drop backwards compatibility,
-- simply put a lower bound of >= 2.0 on shakespeare and remove the
-- deprecated packages.
, hamlet
, shakespeare-text >= 1.0 && < 1.2
, shakespeare >= 1.0 && < 2.1
, template-haskell , template-haskell
, text , text
, time , time
@ -216,7 +225,6 @@ executable hledger-web
, data-default , data-default
, directory , directory
, filepath , filepath
, hamlet
, hjsmin , hjsmin
, http-conduit , http-conduit
, http-client >= 0.2 && < 0.4 , http-client >= 0.2 && < 0.4
@ -227,7 +235,9 @@ executable hledger-web
, parsec , parsec
, regexpr >= 0.5.1 , regexpr >= 0.5.1
, safe >= 0.2 , safe >= 0.2
, shakespeare-text , hamlet
, shakespeare-text >= 1.0 && < 1.2
, shakespeare >= 1.0 && < 2.1
, template-haskell , template-haskell
, text , text
, time , time

17
hledger/hledger.cabal
View File

@ -83,7 +83,16 @@ library
,process ,process
,regexpr >= 0.5.1 ,regexpr >= 0.5.1
,safe >= 0.2 ,safe >= 0.2
,shakespeare-text == 1.0.* -- http://www.yesodweb.com/blog/2014/04/consolidation-progress
-- in order to support both the old and new versions of shakespeare,
-- you just need to ensure that you have both the shakespeare and
-- deprecated packages listed in your cabal file. In other words, if
-- previously you depended on hamlet, now you should depend on hamlet
-- and shakespeare. When you're ready to drop backwards compatibility,
-- simply put a lower bound of >= 2.0 on shakespeare and remove the
-- deprecated packages.
,shakespeare-text >= 1.0 && < 1.2
,shakespeare >= 1.0 && < 2.1
,split >= 0.1 && < 0.3 ,split >= 0.1 && < 0.3
,text >= 0.11 && < 1.2 ,text >= 0.11 && < 1.2
,tabular >= 0.2 && < 0.3 ,tabular >= 0.2 && < 0.3
@ -143,7 +152,8 @@ executable hledger
,process ,process
,regexpr >= 0.5.1 ,regexpr >= 0.5.1
,safe >= 0.2 ,safe >= 0.2
,shakespeare-text == 1.0.* ,shakespeare-text >= 1.0 && < 1.2
,shakespeare >= 1.0 && < 2.1
,split >= 0.1 && < 0.3 ,split >= 0.1 && < 0.3
,tabular >= 0.2 && < 0.3 ,tabular >= 0.2 && < 0.3
,text >= 0.11 && < 1.2 ,text >= 0.11 && < 1.2
@ -176,7 +186,8 @@ test-suite tests
, process , process
, regexpr , regexpr
, safe , safe
, shakespeare-text , shakespeare-text >= 1.0 && < 1.2
, shakespeare >= 1.0 && < 2.1
, split , split
,tabular >= 0.2 && < 0.3 ,tabular >= 0.2 && < 0.3
, test-framework , test-framework