diff options
Diffstat (limited to 'devel/hs-haskell-src-meta/files')
| -rw-r--r-- | devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts | 28 | ||||
| -rw-r--r-- | devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal | 13 |
2 files changed, 35 insertions, 6 deletions
diff --git a/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts b/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts new file mode 100644 index 000000000000..f2ceb2a8c0f6 --- /dev/null +++ b/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts @@ -0,0 +1,28 @@ +From 109ee29d5fd0f4e23fdd2f80eb122d66341b64a9 Mon Sep 17 00:00:00 2001 +From: Galen Huntington <galen@alumni.reed.edu> +Date: Sun, 23 Dec 2018 22:57:21 -0800 +Subject: [PATCH] Support haskell-src-exts 1.21. + +--- + haskell-src-meta.cabal | 2 +- + src/Language/Haskell/Meta/Syntax/Translate.hs | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs +index 0dba4f5..aa95cff 100644 +--- src/Language/Haskell/Meta/Syntax/Translate.hs ++++ src/Language/Haskell/Meta/Syntax/Translate.hs +@@ -314,11 +314,13 @@ instance ToName TyVarBndr where + toName (PlainTV n) = n + toName (KindedTV n _) = n + ++#if !MIN_VERSION_haskell_src_exts(1,21,0) + instance ToType (Hs.Kind l) where + toType (Hs.KindStar _) = StarT + toType (Hs.KindFn _ k1 k2) = toType k1 .->. toType k2 + toType (Hs.KindParen _ kp) = toType kp + toType (Hs.KindVar _ n) = VarT (toName n) ++#endif + + toKind :: Hs.Kind l -> Kind + toKind = toType diff --git a/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal index d7fb48b310c8..50852723535e 100644 --- a/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal +++ b/devel/hs-haskell-src-meta/files/patch-haskell-src-meta.cabal @@ -1,16 +1,17 @@ ---- haskell-src-meta.cabal.orig 2018-04-28 16:25:53 UTC +--- haskell-src-meta.cabal.orig 2018-06-19 10:23:31 UTC +++ haskell-src-meta.cabal @@ -17,11 +17,11 @@ description: The translation from haskell-src-e extra-source-files: ChangeLog README.md examples/*.hs library -- build-depends: base >= 4.6 && < 4.11, -+ build-depends: base >= 4.6 && < 4.12, - haskell-src-exts >= 1.18 && < 1.21, +- build-depends: base >= 4.6 && < 4.12, +- haskell-src-exts >= 1.18 && < 1.21, ++ build-depends: base >= 4.6 && < 4.13, ++ haskell-src-exts >= 1.18 && < 1.22, pretty >= 1.0 && < 1.2, syb >= 0.1 && < 0.8, -- template-haskell >= 2.8 && < 2.13, -+ template-haskell >= 2.8 && < 2.14, +- template-haskell >= 2.8 && < 2.14, ++ template-haskell >= 2.8 && < 2.15, th-orphans >= 0.9.1 && < 0.14 if impl(ghc < 7.8) |