commit: 11f6c5a9566163669056298f67f94a95e3f7600b Author: hololeap <hololeap <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Fri Aug 12 05:55:44 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 21 02:21:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f6c5a9
dev-haskell/doctest-parallel: add 0.2.4, drop 0.2.3 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-haskell/doctest-parallel/Manifest | 2 +- ...-0.2.3.ebuild => doctest-parallel-0.2.4.ebuild} | 29 ++++++++++++---------- ...-parallel-0.2.4-disable-internal-test-lib.patch | 24 ++++++++++++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dev-haskell/doctest-parallel/Manifest b/dev-haskell/doctest-parallel/Manifest index 5bdec94c0bb0..f14427cf3f8b 100644 --- a/dev-haskell/doctest-parallel/Manifest +++ b/dev-haskell/doctest-parallel/Manifest @@ -1 +1 @@ -DIST doctest-parallel-0.2.3.tar.gz 45698 BLAKE2B 1650965be43357d86d497c4545c4673b21add0de3bccb52146519dd109bf34532973ca58285486f8311b4bd0e8b0acc443610a9f4d16d4326fa5a74926c3d6c6 SHA512 7a39b379a4be0bab4e6d360c572d81d4bfd7197d4e2a068ec2b00924ab8866406165eb9aef62a0612619c524f16302fe398edccfbcd117a97891d48fd00b5786 +DIST doctest-parallel-0.2.4.tar.gz 46038 BLAKE2B c5ce7b48c8cf268dc31ef2060bcd3f1322e41b5ca8ca43ea889ccc2fae3eedbdbcdae57477f4e74f4eb815c5f4997295d30ac9ba62f95ebf6a86643e9c88b096 SHA512 9ccc407e317f09cb7bd104b7d1727f33449bae26f6782bc4a9b3c636b9adc53d4fa37d252bf8d1cc608a1a2bd9c27c105f5f5ad2ed36742d4ac50ef783c3ea7f diff --git a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild similarity index 62% rename from dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild rename to 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 <holol...@protonmail.com> +Signed-off-by: hololeap <holol...@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.
