diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/drift/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/drift/files')
-rw-r--r-- | dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch | 13 | ||||
-rw-r--r-- | dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch | 22 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch b/dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch new file mode 100644 index 000000000000..a7c1f3b5f7ae --- /dev/null +++ b/dev-haskell/drift/files/drift-2.2.3-ghc-7.4.patch @@ -0,0 +1,13 @@ +diff --git a/src/GenUtil.hs b/src/GenUtil.hs +index 4855618..db416ed 100644 +--- a/src/GenUtil.hs ++++ b/src/GenUtil.hs +@@ -482,7 +482,7 @@ overlaps :: Ord a => (a,a) -> (a,a) -> Bool + _ `overlaps` _ = True + + -- | translate a number of seconds to a string representing the duration expressed. +-showDuration :: Integral a => a -> String ++showDuration :: (Integral a, Show a) => a -> String + showDuration x = st "d" dayI ++ st "h" hourI ++ st "m" minI ++ show secI ++ "s" where + (dayI, hourI) = divMod hourI' 24 + (hourI', minI) = divMod minI' 60 diff --git a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch b/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch new file mode 100644 index 000000000000..c45a2945fd2a --- /dev/null +++ b/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch @@ -0,0 +1,22 @@ +diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs +index 730e4be..a7406fa 100644 +--- a/src/ParseLib2.hs ++++ b/src/ParseLib2.hs +@@ -34,2 +34,3 @@ module ParseLib2 + import Data.Char ++import Control.Applicative hiding ( many ) + import Control.Monad +@@ -49,2 +50,6 @@ instance Functor Parser where + ++instance Applicative Parser where ++ pure = return ++ (<*>) = ap -- defined in Control.Monad ++ + instance Monad Parser where +@@ -58,2 +63,6 @@ instance Monad Parser where + ++instance Alternative Parser where ++ (<|>) = mplus ++ empty = mzero ++ + instance MonadPlus Parser where |