diff options
| author |   Mark Wright <gienah@gentoo.org> | 2015-03-11 12:16:18 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2015-03-11 12:16:18 +0000 |
| commit | 51572f55e28ddbf248f926d085463b5c7669cf97 (patch) | |
| tree | 03c31f3cf4ff496bff22e53f679ec2e0a68c703d /dev-haskell/hourglass | |
| parent | Add newtype (diff) | |
| download | gentoo-2-51572f55e28ddbf248f926d085463b5c7669cf97.tar.gz gentoo-2-51572f55e28ddbf248f926d085463b5c7669cf97.tar.bz2 gentoo-2-51572f55e28ddbf248f926d085463b5c7669cf97.zip | |
Patch hourglass-0.2.6 for ghc 7.10
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/hourglass')
| -rw-r--r-- | dev-haskell/hourglass/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch | 14 | ||||
| -rw-r--r-- | dev-haskell/hourglass/hourglass-0.2.6.ebuild | 8 |
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-haskell/hourglass/ChangeLog b/dev-haskell/hourglass/ChangeLog index 40f04fe289f2..a16074f55f96 100644 --- a/dev-haskell/hourglass/ChangeLog +++ b/dev-haskell/hourglass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hourglass -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/ChangeLog,v 1.1 2014/12/14 05:19:40 gienah Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/ChangeLog,v 1.2 2015/03/11 12:16:18 gienah Exp $ + + 11 Mar 2015; Mark Wright <gienah@gentoo.org> + +files/hourglass-0.2.6-ghc-7.10.patch, hourglass-0.2.6.ebuild: + Patch hourglass-0.2.6 for ghc 7.10 *hourglass-0.2.6 (14 Dec 2014) diff --git a/dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch b/dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch new file mode 100644 index 000000000000..1756ba278d49 --- /dev/null +++ b/dev-haskell/hourglass/files/hourglass-0.2.6-ghc-7.10.patch @@ -0,0 +1,14 @@ +--- hourglass-0.2.6-orig/tests/Tests.hs 2014-10-19 20:25:15.000000000 +1100 ++++ hourglass-0.2.6/tests/Tests.hs 2015-01-03 16:56:11.788832544 +1100 +@@ -25,7 +25,11 @@ + import qualified Data.Time.Clock as T + import qualified Data.Time.Clock.POSIX as T + import qualified Data.Time.Format as T ++#if MIN_VERSION_time(1,5,0) ++import qualified System.Locale as T hiding (defaultTimeLocale) ++#else + import qualified System.Locale as T ++#endif + + import qualified Control.Exception as E + diff --git a/dev-haskell/hourglass/hourglass-0.2.6.ebuild b/dev-haskell/hourglass/hourglass-0.2.6.ebuild index 437470350723..39847575fb0b 100644 --- a/dev-haskell/hourglass/hourglass-0.2.6.ebuild +++ b/dev-haskell/hourglass/hourglass-0.2.6.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/hourglass-0.2.6.ebuild,v 1.1 2014/12/14 05:19:40 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hourglass/hourglass-0.2.6.ebuild,v 1.2 2015/03/11 12:16:18 gienah Exp $ EAPI=5 # ebuild generated by hackport 0.4.3 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal +inherit base haskell-cabal DESCRIPTION="simple performant time related library" HOMEPAGE="https://github.com/vincenthz/hs-hourglass" @@ -27,3 +27,5 @@ DEPEND="${RDEPEND} dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) " + +PATCHES=("${FILESDIR}/${PN}-0.2.6-ghc-7.10.patch") |