| 1 |
commit: f12a95172b8c2d017b7916972fdb7f9e2bd7ca65 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 1 18:23:07 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 1 18:23:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12a9517 |
| 7 |
|
| 8 |
dev-haskell/vector-algorithms: fix test on ghc-8, bug #623326 |
| 9 |
|
| 10 |
Reported-by: Toralf Förster |
| 11 |
Bug: https://bugs.gentoo.org/623326 |
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 13 |
|
| 14 |
.../vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch | 44 ++++++++++++++++++++++ |
| 15 |
.../vector-algorithms-0.7.0.1.ebuild | 6 ++- |
| 16 |
2 files changed, 48 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch b/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..3616dd76d82 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch |
| 23 |
@@ -0,0 +1,44 @@ |
| 24 |
+diff --git a/tests/properties/Tests.hs b/tests/properties/Tests.hs |
| 25 |
+index a0b7d35..8fcfd36 100644 |
| 26 |
+--- a/tests/properties/Tests.hs |
| 27 |
++++ b/tests/properties/Tests.hs |
| 28 |
+@@ -1,2 +1,2 @@ |
| 29 |
+-{-# LANGUAGE ImpredicativeTypes, RankNTypes, TypeOperators, FlexibleContexts #-} |
| 30 |
++{-# LANGUAGE ImpredicativeTypes, RankNTypes, TypeOperators, FlexibleContexts, ScopedTypeVariables #-} |
| 31 |
+ |
| 32 |
+@@ -44,4 +44,4 @@ args = stdArgs |
| 33 |
+ |
| 34 |
+-check_Int_sort = forM_ algos $ \(name,algo) -> |
| 35 |
+- quickCheckWith args (label name . prop_fullsort algo) |
| 36 |
++check_Int_sort = forM_ algos (\(name,algo :: Algo Int ()) -> |
| 37 |
++ quickCheckWith args (label name . prop_fullsort algo)) |
| 38 |
+ where |
| 39 |
+@@ -55,4 +55,4 @@ check_Int_sort = forM_ algos $ \(name,algo) -> |
| 40 |
+ |
| 41 |
+-check_Int_partialsort = forM_ algos $ \(name,algo) -> |
| 42 |
+- quickCheckWith args (label name . prop_partialsort algo) |
| 43 |
++check_Int_partialsort = forM_ algos (\(name,algo :: SizeAlgo Int ()) -> |
| 44 |
++ quickCheckWith args (label name . prop_partialsort algo)) |
| 45 |
+ where |
| 46 |
+@@ -63,4 +63,4 @@ check_Int_partialsort = forM_ algos $ \(name,algo) -> |
| 47 |
+ |
| 48 |
+-check_Int_select = forM_ algos $ \(name,algo) -> |
| 49 |
+- quickCheckWith args (label name . prop_select algo) |
| 50 |
++check_Int_select = forM_ algos (\(name,algo :: SizeAlgo Int ()) -> |
| 51 |
++ quickCheckWith args (label name . prop_select algo)) |
| 52 |
+ where |
| 53 |
+@@ -119,10 +119,10 @@ check_permutation = do |
| 54 |
+ qc $ label "introsort" . prop_permutation (INT.sort :: Algo Int ()) |
| 55 |
+- qc $ label "intropartial" . prop_sized (const . prop_permutation) |
| 56 |
++ qc $ label "intropartial" . prop_sized (\x -> const (prop_permutation x)) |
| 57 |
+ (INT.partialSort :: SizeAlgo Int ()) |
| 58 |
+- qc $ label "introselect" . prop_sized (const . prop_permutation) |
| 59 |
++ qc $ label "introselect" . prop_sized (\x -> const (prop_permutation x)) |
| 60 |
+ (INT.select :: SizeAlgo Int ()) |
| 61 |
+ qc $ label "heapsort" . prop_permutation (H.sort :: Algo Int ()) |
| 62 |
+- qc $ label "heappartial" . prop_sized (const . prop_permutation) |
| 63 |
++ qc $ label "heappartial" . prop_sized (\x -> const (prop_permutation x)) |
| 64 |
+ (H.partialSort :: SizeAlgo Int ()) |
| 65 |
+- qc $ label "heapselect" . prop_sized (const . prop_permutation) |
| 66 |
++ qc $ label "heapselect" . prop_sized (\x -> const (prop_permutation x)) |
| 67 |
+ (H.select :: SizeAlgo Int ()) |
| 68 |
|
| 69 |
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild |
| 70 |
index aae9913a543..131da53ff67 100644 |
| 71 |
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild |
| 72 |
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild |
| 73 |
@@ -1,7 +1,7 @@ |
| 74 |
-# Copyright 1999-2015 Gentoo Foundation |
| 75 |
+# Copyright 1999-2017 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
|
| 78 |
-EAPI=5 |
| 79 |
+EAPI=6 |
| 80 |
|
| 81 |
# ebuild generated by hackport 0.4.6.9999 |
| 82 |
|
| 83 |
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND} |
| 84 |
test? ( properties? ( >=dev-haskell/quickcheck-2 ) ) |
| 85 |
" |
| 86 |
|
| 87 |
+PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch) |
| 88 |
+ |
| 89 |
src_configure() { |
| 90 |
haskell-cabal_src_configure \ |
| 91 |
$(cabal_flag bench bench) \ |
Archives