Commit 82d0fd99 authored by Ryan Scott's avatar Ryan Scott

Add language-haskell-extract patch, update lens patches

* Update `language-haskell-extract` to build against
  `template-haskell-2.16.*`.
* Update `lens` so that its doctests pass on GHC 8.10.
  See ghc#16876.
parent 004d2ef6
Pipeline #10650 passed with stages
in 108 minutes and 37 seconds
diff -ru language-haskell-extract-0.2.4.orig/src/Language/Haskell/Extract.hs language-haskell-extract-0.2.4/src/Language/Haskell/Extract.hs
--- language-haskell-extract-0.2.4.orig/src/Language/Haskell/Extract.hs 2013-01-26 04:00:09.000000000 -0500
+++ language-haskell-extract-0.2.4/src/Language/Haskell/Extract.hs 2019-09-26 16:00:55.572757842 -0400
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
module Language.Haskell.Extract (
functionExtractor,
functionExtractorMap,
@@ -25,7 +26,11 @@
functionExtractor :: String -> ExpQ
functionExtractor pattern =
do functions <- extractAllFunctions pattern
- let makePair n = TupE [ LitE $ StringL n , VarE $ mkName n]
+ let makePair n = TupE
+#if MIN_VERSION_template_haskell(2,16,0)
+ $ map Just
+#endif
+ [ LitE $ StringL n , VarE $ mkName n]
return $ ListE $ map makePair functions
commit 324c0e7a0d9c510b474f9bbc60f358de4566e48a
commit fbfa26bd5a3e66ef58432fa85cf7dda7b98a2d0f
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Wed Jul 3 13:21:45 2019 -0400
Date: Thu Sep 26 16:37:31 2019 -0400
Fix the doctests on GHC 8.9 (see GHC#16876)
diff --git a/src/Data/Data/Lens.hs b/src/Data/Data/Lens.hs
index 0e174d27..b748e05f 100644
--- a/src/Data/Data/Lens.hs
+++ b/src/Data/Data/Lens.hs
@@ -13,6 +13,7 @@
#ifdef TRUSTWORTHY
{-# LANGUAGE Trustworthy #-}
#endif
+{-# OPTIONS_GHC -fbyte-code #-}
{-# OPTIONS_GHC -fno-full-laziness #-}
-----------------------------------------------------------------------------
-- |
commit e6c546452c527cbc85a6ee16c183fae00410c603
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Thu Sep 26 16:36:28 2019 -0400
Adapt to building with template-haskell-2.15.*/2.16.*
......
commit c3f156640e16f784fc73451df0b9f18f9507d288
commit 2cbad99b12d0dd6aecd3a7b66301777c547e390c
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri Sep 13 10:00:42 2019 -0400
Date: Thu Sep 26 16:30:38 2019 -0400
Fix the doctests on GHC 8.9 (see GHC#16876)
diff --git a/src/Data/Data/Lens.hs b/src/Data/Data/Lens.hs
index 744c1fd7..52f07034 100644
--- a/src/Data/Data/Lens.hs
+++ b/src/Data/Data/Lens.hs
@@ -14,6 +14,7 @@
#ifdef TRUSTWORTHY
{-# LANGUAGE Trustworthy #-}
#endif
+{-# OPTIONS_GHC -fbyte-code #-}
{-# OPTIONS_GHC -fno-full-laziness #-}
-----------------------------------------------------------------------------
-- |
commit 17b59c7b04ded561683c548af4e6cf6c7718a7b5
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Thu Sep 26 16:29:49 2019 -0400
Allow building with template-haskell-2.16.*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment