diff options
author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-03-27 14:06:39 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-02 01:49:21 -0400 |
commit | 27740f24cb70fc14b00c1212c06642a144a6117d (patch) | |
tree | 3aa2e2ed2dd5be5ee2370e85fb5ed3dfc43727bb /hadrian/hadrian.cabal | |
parent | 88f38b03025386f0f1e8f5861eed67d80495168a (diff) | |
download | haskell-27740f24cb70fc14b00c1212c06642a144a6117d.tar.gz |
Make Hadrian build with Cabal-3.2
GHC 8.10 ships with `Cabal-3.2.0.0`, so it would be convenient to
make Hadrian supporting building against 3.2.* instead of having to
rebuild the entirety of `Cabal-3.0.0.0`. There is one API change in
`Cabal-3.2.*` that affects Hadrian: the `synopsis` and `description`
functions now return `ShortText` instead of `String`. Since Hadrian
manipulates these `String`s in various places, I found that the
simplest fix was to use CPP to convert `ShortText` to `String`s
where appropriate.
Diffstat (limited to 'hadrian/hadrian.cabal')
-rw-r--r-- | hadrian/hadrian.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index dd95e88299..8e3a9289d4 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -133,7 +133,7 @@ executable hadrian other-extensions: MultiParamTypeClasses , TypeFamilies build-depends: base >= 4.8 && < 5 - , Cabal >= 3.0 && < 3.1 + , Cabal >= 3.0 && < 3.3 , containers >= 0.5 && < 0.7 , directory >= 1.3.1.0 && < 1.4 , extra >= 1.4.7 |