mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-haskell/haskell-src-meta: drop old
Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich
@@ -1,4 +1 @@
|
||||
DIST haskell-src-meta-0.6.0.10.tar.gz 19432 BLAKE2B 8984179d1964cf06f918175cb08efb444fd8cf7cdf52ac2617b399657dbcf5ba73841fc80fce0dddba1a2d4a21548d3bbbde74ffb49dcc259b4be0ec6c22c5d3 SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d
|
||||
DIST haskell-src-meta-0.6.0.14.tar.gz 20079 BLAKE2B 49d25b0061d46a0f55cc946944e29022998f1b3929df8632a3b74acbc6392054a695585aac5d2e166945ee4e513c1b049d5321c8047527cdfac42ebd23989a17 SHA512 d043ece8f28a47572f59cfc36a9d7b2c505a3d5c2ef24f0e90496c5d57b88791417234777e146a0e75c0fba10775ba41e627a00519c2e9718bf173d95e2a201f
|
||||
DIST haskell-src-meta-0.6.0.8.tar.gz 19449 BLAKE2B 0f8e21e01e26e2eddd8ebd0835b1f69e3dad3111cf7ff264c56a363f8b6f4bd7684ad3fc413c3d1584727d6ab914aa699792a98a092d91bfadae41018f73eca9 SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751
|
||||
DIST haskell-src-meta-0.8.5.tar.gz 24027 BLAKE2B f94f88fa7a5edac23cab13de346056a3b9f6fb30e47de8f98142378211d7d12ad1622317bed04dec3cc322730023b0cce5e571016b6325c05e2503fe9fafa73a SHA512 873a797f53fc30dbb51b719228bc649f47d1c3432380a82b5dca11574b432676ed29d297c7547f1d752bb1c977c8858e55fb5135ffb58146b938d02414fe6723
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
commit 24e6f45408083745080ff2f3710f58209041113c
|
||||
Author: Luite Stegeman <stegeman@gmail.com>
|
||||
Date: Sun Dec 28 21:33:22 2014 +0100
|
||||
|
||||
updates for GHC 7.10 and Template Haskell 2.10
|
||||
|
||||
diff --git a/haskell-src-meta.cabal b/haskell-src-meta.cabal
|
||||
index de6a022..42d9619 100644
|
||||
--- a/haskell-src-meta.cabal
|
||||
+++ b/haskell-src-meta.cabal
|
||||
@@ -18,14 +18,14 @@ description: The translation from haskell-src-exts abstract syntax
|
||||
extra-source-files: ChangeLog README examples/*.hs
|
||||
|
||||
library
|
||||
- build-depends: base >= 4.2 && < 4.8,
|
||||
+ build-depends: base >= 4.2 && < 4.9,
|
||||
haskell-src-exts == 1.16.*,
|
||||
pretty >= 1.0 && < 1.2,
|
||||
syb >= 0.1 && < 0.5,
|
||||
th-orphans >= 0.5 && < 0.9
|
||||
|
||||
if impl(ghc >= 7.4)
|
||||
- Build-depends: template-haskell >= 2.7 && < 2.10
|
||||
+ Build-depends: template-haskell >= 2.7 && < 2.11
|
||||
else
|
||||
Build-depends: template-haskell >= 2.4 && < 2.7,
|
||||
uniplate >= 1.3 && < 1.7
|
||||
diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
|
||||
index 189d32e..36a08f1 100644
|
||||
--- a/src/Language/Haskell/Meta/Syntax/Translate.hs
|
||||
+++ b/src/Language/Haskell/Meta/Syntax/Translate.hs
|
||||
@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b
|
||||
toCxt :: Hs.Context -> Cxt
|
||||
toCxt = fmap toPred
|
||||
where
|
||||
+#if MIN_VERSION_template_haskell(2,10,0)
|
||||
+ toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts)
|
||||
+ toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2])
|
||||
+ toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2])
|
||||
+#else
|
||||
toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts)
|
||||
toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2])
|
||||
toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2)
|
||||
+#endif
|
||||
toPred a@Hs.IParam{} = noTH "toCxt" a
|
||||
|
||||
foldAppT :: Type -> [Type] -> Type
|
||||
diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs
|
||||
index 36f7e96..d194f3e 100644
|
||||
--- a/src/Language/Haskell/Meta/Utils.hs
|
||||
+++ b/src/Language/Haskell/Meta/Utils.hs
|
||||
@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) =
|
||||
unVarT (VarT n) = PlainTV n
|
||||
renamePreds = renameThings renamePred
|
||||
|
||||
+#if MIN_VERSION_template_haskell(2,10,0)
|
||||
+ renamePred = renameT
|
||||
+#else
|
||||
renamePred env new (ClassP n ts) = let
|
||||
(ts', env', new') = renameTs env new [] ts
|
||||
in (ClassP (normaliseName n) ts', env', new')
|
||||
@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) =
|
||||
(t1', env1, new1) = renameT env new t1
|
||||
(t2', env2, new2) = renameT env1 new1 t2
|
||||
in (EqualP t1' t2', env2, new2)
|
||||
-
|
||||
+#endif
|
||||
|
||||
-- | Remove qualification, etc.
|
||||
normaliseName :: Name -> Name
|
||||
@@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.4.5.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Parse source to template-haskell abstract syntax"
|
||||
HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
|
||||
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
|
||||
>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
|
||||
>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?]
|
||||
>=dev-lang/ghc-7.4.1:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.6
|
||||
"
|
||||
@@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
# ebuild generated by hackport 0.5.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Parse source to template-haskell abstract syntax"
|
||||
HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
|
||||
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
|
||||
>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
|
||||
>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
|
||||
>=dev-lang/ghc-7.8.1:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.6
|
||||
"
|
||||
@@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.4.3
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour"
|
||||
inherit base haskell-cabal
|
||||
|
||||
DESCRIPTION="Parse source to template-haskell abstract syntax"
|
||||
HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
|
||||
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
|
||||
>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
|
||||
>=dev-haskell/th-orphans-0.5:=[profile?]
|
||||
>=dev-lang/ghc-7.4.1:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.6
|
||||
"
|
||||
|
||||
PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch")
|
||||
|
||||
src_prepare() {
|
||||
base_src_prepare
|
||||
cabal_chdeps \
|
||||
'th-orphans >= 0.5 && < 0.9' 'th-orphans >= 0.5'
|
||||
}
|
||||
Reference in New Issue
Block a user