summaryrefslogtreecommitdiff
path: root/devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2019-01-06 12:18:06 +0000
committerGleb Popov <arrowd@FreeBSD.org>2019-01-06 12:18:06 +0000
commite2c3fdc1fdeca1ffbdfef680e3e712ddc2e7e06f (patch)
treeec6e8ffeefbf83bfc231412c2c7a6b883ecd5bd8 /devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts
parentUpdate to alpha-20181227 (diff)
lang/ghc: Update to 8.6.3 and bump PORTREVISION's of all Haskell ports.
As usual, it is recommended to rebuild or reinstall all the dependent ports and the lang/ghc port itself in one of the following ways: # portmaster -w -r ghc or # portupgrade -fr lang/ghc In case of pkg(8), it is probably safer to remove all the GHC-dependent packages along with GHC and reinstall everything from scratch. For example: # pkg query "%ro" ghc > ghc-pkgs.txt # pkg delete -y lang/ghc # pkg install -y `cat ghc-pkgs.txt` During update some hs-* ports got two PORTREVISION bumps in a row. Other ports got a PORTVERSION update together with one PORTREVISION bump. This is caused by bulk-bumping PORTREVISION of all hs-* ports. There are a lot of them updated, so figuring out which ones require a bump and which are not is too tedious. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D18707
Notes
Notes: svn path=/head/; revision=489474
Diffstat (limited to 'devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts')
-rw-r--r--devel/hs-haskell-src-meta/files/patch-fix-build-with-src-exts28
1 files changed, 28 insertions, 0 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