* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/th-utilities/files/
@ 2021-04-04 20:50 Sergei Trofimovich
0 siblings, 0 replies; only message in thread
From: Sergei Trofimovich @ 2021-04-04 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 8a66331b7c4234908554a59ae51328afd4260ab6
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Apr 4 20:00:13 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 20:50:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a66331b
dev-haskell/th-utilities: remove unused patch(es)
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20256
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/th-utilities-0.2.3.0-ghc-8.8.patch | 67 ----------------------
1 file changed, 67 deletions(-)
diff --git a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
deleted file mode 100644
index 8a3795430b1..00000000000
--- a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5e510f6a6ed24b98d143e5baeb156a8901bf3faa
-Author: Ryan Scott <ryan.gl.scott@gmail.com>
-Date: Mon Dec 10 15:12:47 2018 -0500
-
- Allow building with template-haskell-2.15.0.0
-
-diff --git a/src/TH/ReifySimple.hs b/src/TH/ReifySimple.hs
-index d179829..70b929e 100644
---- a/src/TH/ReifySimple.hs
-+++ b/src/TH/ReifySimple.hs
-@@ -233,18 +233,24 @@ infoToDataFamily info = case info of
- Just $ DataFamily name (map tyVarBndrName tvs) (map go insts)
- _ -> Nothing
- where
--#if MIN_VERSION_template_haskell(2,11,0)
-- go (NewtypeInstD preds name params _kind con _deriving) =
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ go (NewtypeInstD preds _ lhs _kind con _deriving)
-+ | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+ go (NewtypeInstD preds name params _kind con _deriving)
- #else
-- go (NewtypeInstD preds name params con _deriving) =
-+ go (NewtypeInstD preds name params con _deriving)
- #endif
-- DataInst name preds params (conToDataCons con)
--#if MIN_VERSION_template_haskell(2,11,0)
-- go (DataInstD preds name params _kind cons _deriving) =
-+ = DataInst name preds params (conToDataCons con)
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ go (DataInstD preds _ lhs _kind cons _deriving)
-+ | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+ go (DataInstD preds name params _kind cons _deriving)
- #else
-- go (DataInstD preds name params cons _deriving) =
-+ go (DataInstD preds name params cons _deriving)
- #endif
-- DataInst name preds params (concatMap conToDataCons cons)
-+ = DataInst name preds params (concatMap conToDataCons cons)
- go info' = error $
- "Unexpected instance in FamilyI in infoToDataInsts:\n" ++ pprint info'
-
-@@ -263,8 +269,23 @@ infoToTypeFamily info = case info of
- #endif
- _ -> Nothing
- where
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ goEqn _ (TySynEqn _ lhs ty)
-+ | ConT name:params <- unAppsT lhs
-+ = TypeInst name params ty
-+ | otherwise
-+ = error $ "Unexpected type family instance head: " ++ pprint lhs
-+#else
- goEqn name (TySynEqn params ty) = TypeInst name params ty
-+#endif
-+
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ go (TySynInstD (TySynEqn _ lhs ty))
-+ | ConT name:params <- unAppsT lhs
-+ = TypeInst name params ty
-+#else
- go (TySynInstD name (TySynEqn params ty)) = TypeInst name params ty
-+#endif
- go info' = error $
- "Unexpected instance in FamilyI in infoToTypeInsts:\n" ++ pprint info'
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-04 20:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-04 20:50 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/th-utilities/files/ Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox