summaryrefslogtreecommitdiff
path: root/dev-haskell
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-08-21 08:40:51 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-08-21 08:40:51 +0100
commit4dec1dfeca8e16b25934ff861c9eab7d1a8758a1 (patch)
tree6baa6667b5a6f8803404d9c87646bbaccbff3d41 /dev-haskell
parent766dae6306eab8ca7e982499e2cab68eb5ecb105 (diff)
gentoo auto-resync : 21:08:2022 - 08:40:51
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/Manifest.gzbin135233 -> 135241 bytes
-rw-r--r--dev-haskell/dbus/Manifest3
-rw-r--r--dev-haskell/dbus/dbus-1.2.22.ebuild4
-rw-r--r--dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch28
-rw-r--r--dev-haskell/doctest-parallel/Manifest5
-rw-r--r--dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild (renamed from dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild)29
-rw-r--r--dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch24
-rw-r--r--dev-haskell/haskell-src-exts/Manifest6
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild (renamed from dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild)17
-rw-r--r--dev-haskell/haskell-src-exts/metadata.xml22
-rw-r--r--dev-haskell/parser-combinators/Manifest2
-rw-r--r--dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild27
-rw-r--r--dev-haskell/regex-tdfa/Manifest3
-rw-r--r--dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch18
-rw-r--r--dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild9
15 files changed, 132 insertions, 65 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 43943a2975b7..cbc088fb6975 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
Binary files differ
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 9d1110b69ea1..7c9dbefac7e6 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1,3 +1,4 @@
+AUX dbus-1.2.22-disable-integration-tests.patch 868 BLAKE2B ab711ea3076f8bd968e43791c4cd04f8cefdb8751ddb128746a391aa02a9c3a84fecdf98a61b667ec20696dc972beacfc30d8b02f37c8cb155456e9a77999b78 SHA512 14149fabb25d411b7f1d9d015f3ac2c779e5c2a2fc707b20bb7e2ec2c63e9e26d3987c0437f5b12e2df6b1c794bfdab703eb58202ddb5254f78ae8c0a9a9305d
DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9
-EBUILD dbus-1.2.22.ebuild 1274 BLAKE2B 0670669586cf7d0df0024b2d3e08efe0884ce6add0c0d1e19985c0b2b394d5f205266f754dcce9fe8121ba74dd7c5bb684e12bdf7ef10d1c04690d29d7013afc SHA512 17636cfab10d083f5ee1b48ca27dee37cc26b7b7d9cc352c8b4c2c7a5733cdeaa03344fed074c32a074416636716e991b15c0fe10430fdbbd9efe3a9666c8cf6
+EBUILD dbus-1.2.22.ebuild 1347 BLAKE2B c8556ce568eca34bd23586799335030b42a75e8c05de82d65d527b7ec870faa2b38fcc68baed646d4dcf55fe72a22494297af0583e880ae9b4b784ab666728a8 SHA512 9a77829130e1fd656411cc9fb8187c7e45e6aa10a116543de6bb1ec513adf12a2c32241a19060304ffea2e3be978d44a0206cb1ea623b51fa637829f1a629243
MISC metadata.xml 2060 BLAKE2B e0fa39e05ec8f6cb8def9e78735e7f4e062b3d294b506e08df5d0592d1a480490ae4cda8a00fc2af7211a3981ac983326908cca24877d2908af0c0a1b2457c53 SHA512 eff83d2ba57a618d6dd22761f64152c53d1be6ce7a22505c8e9553628df38171d6688503703cee1c55c1e4c949728a5882c9293faed77cf3885c42ca98a7e755
diff --git a/dev-haskell/dbus/dbus-1.2.22.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild
index 58157ba088dc..39a045969ae2 100644
--- a/dev-haskell/dbus/dbus-1.2.22.ebuild
+++ b/dev-haskell/dbus/dbus-1.2.22.ebuild
@@ -16,6 +16,10 @@ LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch"
+)
+
RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
<dev-haskell/lens-5.2:=[profile?]
diff --git a/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
new file mode 100644
index 000000000000..d5c509ca58e3
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
@@ -0,0 +1,28 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+dev-haskell/dbus: Disable integration tests
+
+These tests try to spin up an instance of dbus-daemon
+
+diff -urN dbus-1.2.22/tests/DBusTests.hs dbus-1.2.22-r1/tests/DBusTests.hs
+--- dbus-1.2.22/tests/DBusTests.hs 2021-12-16 12:34:16.000000000 -0700
++++ dbus-1.2.22-r1/tests/DBusTests.hs 2022-08-05 12:51:12.447871229 -0600
+@@ -23,7 +23,7 @@
+ import DBusTests.BusName
+ import DBusTests.Client
+ import DBusTests.ErrorName
+-import DBusTests.Integration
++--import DBusTests.Integration
+ import DBusTests.InterfaceName
+ import DBusTests.Introspection
+ import DBusTests.MemberName
+@@ -55,7 +55,7 @@
+ , test_BusName
+ , test_Client
+ , test_ErrorName
+- , test_Integration
++-- , test_Integration
+ , test_InterfaceName
+ , test_Introspection
+ , test_MemberName
diff --git a/dev-haskell/doctest-parallel/Manifest b/dev-haskell/doctest-parallel/Manifest
index 2f321527a83f..1f6c5977eca7 100644
--- a/dev-haskell/doctest-parallel/Manifest
+++ b/dev-haskell/doctest-parallel/Manifest
@@ -1,3 +1,4 @@
-DIST doctest-parallel-0.2.3.tar.gz 45698 BLAKE2B 1650965be43357d86d497c4545c4673b21add0de3bccb52146519dd109bf34532973ca58285486f8311b4bd0e8b0acc443610a9f4d16d4326fa5a74926c3d6c6 SHA512 7a39b379a4be0bab4e6d360c572d81d4bfd7197d4e2a068ec2b00924ab8866406165eb9aef62a0612619c524f16302fe398edccfbcd117a97891d48fd00b5786
-EBUILD doctest-parallel-0.2.3.ebuild 1300 BLAKE2B 68ab672c2346074830f41bdd384946d53cc64404d4ebcfa38f5e6dd1a5fda287505487393e0bf5866ad7c1df1726dc1fbc41c4ecbfa7f8547ccdac5327081aa7 SHA512 ec3cc3c76aa60ef6f3e07ab6bc821bfc03f2ee29ad41a2b4168a4e5976ab36f0ac0a1aa356ab782178c5feafda52d072dbe1e3d952c8ee4c46a68e48390e7d46
+AUX doctest-parallel-0.2.4-disable-internal-test-lib.patch 917 BLAKE2B 6817c91e82e9d44180fe2f0d263545af08cc2056c886de34c7798cfeae411c6323625d718d8aa7ff8a3ae7fa520aed748557ec9cba64a45b2740545a8fe00d3e SHA512 ca4b5b1f810514a3343315fd11357514a1a6a692452c436f698f644b3ce1eaf296080b5461b6659b043200637dda79fa431ea479350c6744a9c22af58bca9e1c
+DIST doctest-parallel-0.2.4.tar.gz 46038 BLAKE2B c5ce7b48c8cf268dc31ef2060bcd3f1322e41b5ca8ca43ea889ccc2fae3eedbdbcdae57477f4e74f4eb815c5f4997295d30ac9ba62f95ebf6a86643e9c88b096 SHA512 9ccc407e317f09cb7bd104b7d1727f33449bae26f6782bc4a9b3c636b9adc53d4fa37d252bf8d1cc608a1a2bd9c27c105f5f5ad2ed36742d4ac50ef783c3ea7f
+EBUILD doctest-parallel-0.2.4.ebuild 1264 BLAKE2B 92f0ffe50b5f4f3a84fbcac36149aebcc7e23e9f885e3854e6537f56120e38d69022e964aeae72419b694ef061a5c50ef1522063d4c4d139ba6cd9c18a42a249 SHA512 8c6dc40d5988849b74449a86069e9e73561fc5e03b4eb1ed967027168371d6df3bf4e1c0f30196bdfbc16c7afddbc06451a80e4e841752bb88c62af91859ef9d
MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild
index 6aa28f4165c8..677e98996e3f 100644
--- a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild
+++ b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild
@@ -3,20 +3,24 @@
EAPI=8
-# ebuild generated by hackport 0.7.1.1
+# ebuild generated by hackport 0.7.2.1.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
inherit haskell-cabal
DESCRIPTION="Test interactive Haskell examples"
HOMEPAGE="https://github.com/martijnbastiaan/doctest-parallel#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
+
RESTRICT="test" # Known failure, issue #22 on upstream github
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.4-disable-internal-test-lib.patch"
+)
+
RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
>=dev-haskell/cabal-3.4:=[profile?]
>=dev-haskell/code-page-0.1:=[profile?]
@@ -26,18 +30,17 @@ RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
>=dev-haskell/random-1.2:=[profile?]
>=dev-haskell/syb-0.3:=[profile?]
dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-8.2:=[profile?] <dev-lang/ghc-9.3:=[profile?]
>=dev-lang/ghc-8.10.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-3.2.0.0
- test? ( >=dev-haskell/hspec-2.3.0
- >=dev-haskell/hspec-core-2.3.0
- dev-haskell/hspec-discover
- dev-haskell/hunit
- dev-haskell/mockery
- >=dev-haskell/quickcheck-2.13.1
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4 )
"
+# test? ( >=dev-haskell/hspec-2.3.0
+# >=dev-haskell/hspec-core-2.3.0
+# dev-haskell/hspec-discover
+# dev-haskell/hunit
+# dev-haskell/mockery
+# >=dev-haskell/quickcheck-2.13.1
+# dev-haskell/setenv
+# >=dev-haskell/silently-1.2.4
+# >=dev-haskell/stringbuilder-0.4 )
diff --git a/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch b/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch
new file mode 100644
index 000000000000..642f9762c737
--- /dev/null
+++ b/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch
@@ -0,0 +1,24 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+This internal library is only needed for tests (currently disabled) and it
+causes an error when building docs:
+
+Running Haddock on library 'spectests-modules' for doctest-parallel-0.2.4
+setup: internal error when calculating transitive package dependencies
+Debug info: []
+
+Very similar to:
+https://github.com/commercialhaskell/stack/issues/5284
+
+diff -urN doctest-parallel-0.2.4/doctest-parallel.cabal doctest-parallel-0.2.4-r1/doctest-parallel.cabal
+--- doctest-parallel-0.2.4/doctest-parallel.cabal 2022-08-11 23:35:31.648141338 -0600
++++ doctest-parallel-0.2.4-r1/doctest-parallel.cabal 2022-08-11 23:44:18.178141594 -0600
+@@ -119,6 +119,7 @@
+
+
+ library spectests-modules
++ buildable: False
+ default-language: Haskell2010
+ build-depends: base, doctest-parallel, template-haskell
+ -- Too many warnings. TODO: fix.
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 7cac35ffd3e4..6d5b5269e14b 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,3 +1,3 @@
-DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
-EBUILD haskell-src-exts-1.21.1.ebuild 1021 BLAKE2B 27d77b94e881299280118beba5e64cee0ccbd3d605afa380261456fd3ffea7d97c0e502f49aeab0ce5d966e521a939403348cc35854d974ba79f61085f3f9e46 SHA512 f41f15ca25cb0c4f9f3d20720940dabda2f0b4589f5db632c9906279b262270f27e71e447d89795a03a0ee1407128e2dd7e3fdafad2e14d7f32e2b016a63ac7d
-MISC metadata.xml 779 BLAKE2B 2b013888d9598a0d62f1d56a6ddce956ae645c7f8fe518a04a63a3aef1816415666d565b2cca5b1f48aca5a3a2ae04990956e68083597c6f48319e1473c5bddb SHA512 da393ad717c05f7a54e767035c0520a55d8f709eefd153b045151ed4cc10ab0f808d2fd566e44ac93a7d3ca4b15bce3e0791f70358605aea878f66f972742f2f
+DIST haskell-src-exts-1.23.1.tar.gz 1264319 BLAKE2B 4ad6fe7e2cd70523b5169569f57493e595e2700866f5c44e8044c84bcafc17f98efc57302beb0e3a7ed385c23e204dd79bb63a30bcf0ae414e66696a832038c0 SHA512 c9e6e4d93c2b4ee84d57707aed526291b5c4e297f06a3921257feb0c1df3bb095addd4b1d9bb187650490364647385ab6322e4fc54f9a7648da439a34329d734
+EBUILD haskell-src-exts-1.23.1.ebuild 823 BLAKE2B 849d66d53879c5456bf8cfdf83b9de441643806c5ab4d1ff6ce24ce1d9010991914cdb14423d552ba32e1c75d3b969248035b7c4a39c969552dd39bf7e2daace SHA512 0bf5ac8ed8c7a88b09b7f17efe16f44f4f0a413d670c78ac2b5a53a241faa5375b8972a46e9a2d629ff341cbbdea6e01ac4504e919dc3e1ae9e656670cf7d052
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
index e51345e310a5..b25383d74849 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.2.1.9999
#hackport: flags: +base4
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -11,22 +11,17 @@ inherit haskell-cabal
DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="1.21/${PV}"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/semigroups-0.18.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
+ >=dev-haskell/cabal-2.2.0.1
dev-haskell/happy
- test? ( dev-haskell/mtl
- >=dev-haskell/pretty-show-1.6.16
+ test? ( >=dev-haskell/pretty-show-1.6.16
>=dev-haskell/smallcheck-1.0
>=dev-haskell/tasty-0.3
>=dev-haskell/tasty-golden-2.2.2
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
index 1314698031a7..937381521944 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -1,22 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription lang="en">
-Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
-standard haskell-src package, and handles most common syntactic extensions to
-Haskell, including:
-
- * Multi-parameter type classes with functional dependencies
- * Empty data declarations
- * GADTs
- * Implicit parameters (ghc and hugs style)
- * Template Haskell (broken for 6.4, needs redoing)
-</longdescription>
- <upstream>
- <remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index 68426a8ea7c1..f54e4a84632d 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1,4 +1,4 @@
DIST parser-combinators-1.3.0.tar.gz 11699 BLAKE2B 0a24e95c52627a3219cc8e89ed49ebc12e759a487e7daf333f3ab788837576aef88d295f585aecd0831866319ee0445369cc3cd26255d6ef85d602f44d7767fa SHA512 f7a4581d229b788e841d844003e058a6c63827c5cadeb6fe8f1b94e2a920b11d3b08a8a7a412fa95e1b75bca24f6957f88162f8d1af5bb174ca7f91ef47c0b71
DIST parser-combinators-tests-1.3.0.tar.gz 6860 BLAKE2B ececd5d8a47501a90e68ba77da679aed2c00da225c234f8afeebd43bf4cb821c988cd5612e8411e70179b39f0fcf8c15fcd93accd81e42ce1b8999d0cd8c7bdf SHA512 ac863afcbe81ea83c20cbab3229c5321860d1d45b4b04031db1a8cc493239096aef80d24148fe3cd5a18dfc811d806855386736be94e32cecabab3ae656d5389
-EBUILD parser-combinators-1.3.0.ebuild 1681 BLAKE2B 17242e0cffb303f26ba44daec6666eaae676c2023e2b129b2500744a3fb17ba29177f2b8966da50f189a9e33e209e8b3a83f30bdd709e0c2dbf75e8dacfb4a84 SHA512 3cde3247d462d4f95765d097ca90eb4168105403b6c2c223c69b56c268c01aee78387177c405fbde43f213fc2a6b32167257620419cd5a4e5a253501633ef783
+EBUILD parser-combinators-1.3.0.ebuild 1798 BLAKE2B 0bb06c68249a0c45a1c18baa18f1ee337408aa3830217db2a061eb1c4e21c2166e89a0035a1831774a35237846503b205611c3eeb7b50e760c1a0885d1e5e4fe SHA512 c06dfeaca924550ddd4b5b238f88749d2cf202a4a0ec037b2369abad8ab7a56c80b2c1d23b233cbba0f8c2163cc5a88203408fd47a7fecb7733dc028489170a4
MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
index fc3e4a9d5cb2..7c57fcc85c7d 100644
--- a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
+++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
@@ -9,18 +9,16 @@ EAPI=8
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
-TESTS_PN="${PN}-tests"
-TESTS_P="${TESTS_PN}-${PV}"
+TESTS_PN="${CABAL_PN}-tests"
+TESTS_P="${TESTS_PN}-${CABAL_PV}"
DESCRIPTION="Lightweight package providing commonly useful parser combinators"
HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
+SRC_URI+=" https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="test" # tests only work if not already installed
RDEPEND=">=dev-lang/ghc-8.6.3:=
"
@@ -41,18 +39,21 @@ src_configure() {
src_test() {
if use test; then
- ./setup register --inplace --gen-pkg-config || die
- ghc-pkg init pkgdb || die
- ghc-pkg -f pkgdb register "${P}.conf"
+ local -a configure_flags=( "--flag=-dev" )
- old_S="${S}"
+ # Runs the block if the main package is not installed currently
+ if ! ghc-pkg describe "${CABAL_PN}" &>/dev/null; then
+ ./setup register --inplace --gen-pkg-config || die
+ ghc-pkg init pkgdb || die
+ ghc-pkg -f pkgdb register "${CABAL_P}.conf" || die
+ configure_flags+=( "--package-db=${S}/pkgdb" )
+ fi
+
+ local old_S="${S}"
export S="${WORKDIR}/${TESTS_P}"
pushd "${S}" > /dev/null || die
- haskell-cabal_src_configure \
- --package-db="${old_S}/pkgdb" \
- --flag=-dev
-
+ haskell-cabal_src_configure "${configure_flags[@]}"
haskell-cabal_src_compile
haskell-cabal_src_test
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index 1d28a8b04960..bde8db7f9eb0 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,3 +1,4 @@
+AUX regex-tdfa-1.3.2-disable-doctests.patch 617 BLAKE2B 5e2e7dc8ccc6bbf92a46315a736209ce170912971f6df80581f9f6ca2587388fef864d2200d14de21092b784582fd08cb77d2aa118ca3872cd72d67ce31f74ee SHA512 210ee3c910e9f80d904e13c4cefc01d4bef9558bb2c2f8b8273f174022db8bb89b24068f56b84c8d1e3cf0c44476b441f381bd811264123c9fedb22fafedc0d5
DIST regex-tdfa-1.3.2.tar.gz 82839 BLAKE2B e381bc951dfad53b0cd2c83f6c77e3a71fe6b1fd64988f75544e631f49a9d108f39e27bc5bb42fbccc4887321c7655d609c0c13cc58f7be3b93e8131059f4320 SHA512 88bbf8f4d7ac15fb85c899bdeb8f8556c7a284075bf2b600051f529f0e2109dcda6ba74fc95969b824cfb03f00a9eb47e9c375c70b1b9e17096c95acbe517168
-EBUILD regex-tdfa-1.3.2.ebuild 866 BLAKE2B c8f53dd3aa3cbf01fe067bd2eb842f740f5bbecbd5983892363bcb1024a32518a824ffe03624bff3af43a644f388ed59d229a55c1b9324b2d247be178188a9a1 SHA512 69ff4bff75e97916b570b72ecfeee18ebd08673278c45be7a8ee9d6569288328bea4d288dd0578dd53d73e27d52c371c05975a9a8dce19090fcb086c0d7a187a
+EBUILD regex-tdfa-1.3.2.ebuild 893 BLAKE2B ec0b55cae438e784c15fc490970d4e3b3576fcc65d1471846988a3197ae9f811189e809a881547640688b51c151db011eccf932ab7ac75cb77ee5b70ba96da2e SHA512 06a2860335b929535d09957610bd5daf5ddc55f0f97d8b49239d8be58aadfff7f12a65293e6fd2e74757e3d96230cd3535cd9558ed57ccb485500e03b847cf42
MISC metadata.xml 340 BLAKE2B 319aacb72c42132e7ada85d202654dc33109e26c5d5d8c7d429daa3f7f428b779fbd4ba37a328086f51ca6abd7f5371a381ad142a8d16f1101ddbe9b31d1a181 SHA512 d9a7851eef96bea2959de80eecbda08d625c8fa9989beb2cfb4f2e845d2756f309be4a23f2eca4c205e78fa5a78de2087dc816390c27fb6081b8ce0bfbd3ea8c
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
new file mode 100644
index 000000000000..c491fb877d05
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
@@ -0,0 +1,18 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctest-parallel does not currently work with Setup.hs
+
+See: <martijnbastiaan/doctest-parallel#45>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal 2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal 2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+ ghc-options: -O2
+
+ test-suite doc-test
++ buildable: False
+ type: exitcode-stdio-1.0
+ hs-source-dirs: test
+ main-is: DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
index c3aa4194136e..459e5d1880e4 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
@@ -16,13 +16,18 @@ LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.2-disable-doctests.patch"
+)
+
RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
>=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/doctest-parallel-0.2.2
- >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
+ test? (
+ >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+ )
"
src_configure() {