summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-02-08 11:01:21 +0100
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-02-08 11:01:41 +0100
commitab9434852a49b3492ec09c7cf00e98bdf0498998 (patch)
tree169a730170a7d718505eddad35d8ba78a48c04e6
parentfa52c5ae207a7f64089133486ce86ea9f869282a (diff)
downloadhaskell-ab9434852a49b3492ec09c7cf00e98bdf0498998.tar.gz
haskell-ab9434852a49b3492ec09c7cf00e98bdf0498998.tar.xz
vecotr: backport patch for ghc 8.0.2
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-haskell/vector/files/db574989ade94315caeb18131063dcf65622825d.patch44
-rw-r--r--packages/dev-haskell/vector/vector-0.11.0.0-r1.exheres-0 (renamed from packages/dev-haskell/vector/vector-0.11.0.0.exheres-0)2
2 files changed, 46 insertions, 0 deletions
diff --git a/packages/dev-haskell/vector/files/db574989ade94315caeb18131063dcf65622825d.patch b/packages/dev-haskell/vector/files/db574989ade94315caeb18131063dcf65622825d.patch
new file mode 100644
index 0000000..8c005ad
--- /dev/null
+++ b/packages/dev-haskell/vector/files/db574989ade94315caeb18131063dcf65622825d.patch
@@ -0,0 +1,44 @@
+Upstream: yes
+From db574989ade94315caeb18131063dcf65622825d Mon Sep 17 00:00:00 2001
+From: Herbert Valerio Riedel <hvr@gnu.org>
+Date: Sun, 20 Dec 2015 23:28:07 +0100
+Subject: [PATCH] Disambiguate `fromList`/`fromListN`
+
+This addresses #104 in a CPP-less way at cost of some minor ugliness...
+---
+ Data/Vector.hs | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Data/Vector.hs b/Data/Vector.hs
+index 2993bed..81a0703 100644
+--- a/Data/Vector.hs
++++ b/Data/Vector.hs
+@@ -150,7 +150,7 @@ module Data.Vector (
+ -- * Conversions
+
+ -- ** Lists
+- toList, fromList, fromListN,
++ toList, Data.Vector.fromList, Data.Vector.fromListN,
+
+ -- ** Other vector types
+ G.convert,
+@@ -223,8 +223,8 @@ instance Read a => Read (Vector a) where
+
+ instance Exts.IsList (Vector a) where
+ type Item (Vector a) = a
+- fromList = fromList
+- fromListN = fromListN
++ fromList = Data.Vector.fromList
++ fromListN = Data.Vector.fromListN
+ toList = toList
+ #endif
+
+@@ -344,7 +344,7 @@ instance Foldable.Foldable Vector where
+
+ instance Traversable.Traversable Vector where
+ {-# INLINE traverse #-}
+- traverse f xs = fromList Applicative.<$> Traversable.traverse f (toList xs)
++ traverse f xs = Data.Vector.fromList Applicative.<$> Traversable.traverse f (toList xs)
+
+ {-# INLINE mapM #-}
+ mapM = mapM
diff --git a/packages/dev-haskell/vector/vector-0.11.0.0.exheres-0 b/packages/dev-haskell/vector/vector-0.11.0.0-r1.exheres-0
index 28b459d..2aaf42b 100644
--- a/packages/dev-haskell/vector/vector-0.11.0.0.exheres-0
+++ b/packages/dev-haskell/vector/vector-0.11.0.0-r1.exheres-0
@@ -20,6 +20,8 @@ DEPENDENCIES="
")
"
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/db574989ade94315caeb18131063dcf65622825d.patch )
+
# Hang
RESTRICT="test"