summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-02-16 21:33:46 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2017-02-16 21:57:08 +0000
commit29902db175cb8b0243388e7e46f6244281530c51 (patch)
treee845028d3a23c50cfc4619b33facba75732d93cf /dev-haskell/shelly
parentdev-haskell/criterion: bump up to 1.1.4.0 (diff)
downloadgentoo-29902db175cb8b0243388e7e46f6244281530c51.tar.gz
gentoo-29902db175cb8b0243388e7e46f6244281530c51.tar.bz2
gentoo-29902db175cb8b0243388e7e46f6244281530c51.zip
dev-haskell/shelly: tweak for ghc-8.0.2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-haskell/shelly')
-rw-r--r--dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch9
-rw-r--r--dev-haskell/shelly/shelly-1.6.8.1.ebuild11
2 files changed, 19 insertions, 1 deletions
diff --git a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
new file mode 100644
index 000000000000..078f979fd013
--- /dev/null
+++ b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
@@ -0,0 +1,9 @@
+diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
+index 7fe7d98..cc5668d 100644
+--- a/src/Shelly/Pipe.hs
++++ b/src/Shelly/Pipe.hs
+@@ -121,3 +121,3 @@ import Data.Text as T hiding (concat, all, find, cons)
+
+-default (T.Text)
++-- default (T.Text)
+
diff --git a/dev-haskell/shelly/shelly-1.6.8.1.ebuild b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
index bffac6ca6ed7..ddb90b352c08 100644
--- a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
+++ b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,6 +40,15 @@ DEPEND="${RDEPEND}
>=dev-haskell/text-0.11 )
"
+PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'directory >= 1.1.0.0 && < 1.3.0.0' 'directory >= 1.1.0.0'
+}
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag examples build-examples) \