summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/syb/files
downloadgentoo-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/syb/files')
-rw-r--r--dev-haskell/syb/files/syb-0.3.2-ghc-7.2.patch13
-rw-r--r--dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch152
2 files changed, 165 insertions, 0 deletions
diff --git a/dev-haskell/syb/files/syb-0.3.2-ghc-7.2.patch b/dev-haskell/syb/files/syb-0.3.2-ghc-7.2.patch
new file mode 100644
index 00000000000..07678304309
--- /dev/null
+++ b/dev-haskell/syb/files/syb-0.3.2-ghc-7.2.patch
@@ -0,0 +1,13 @@
+diff --git a/syb.cabal b/syb.cabal
+index cc3aaa8..1f3a313 100644
+--- a/syb.cabal
++++ b/syb.cabal
+@@ -26,7 +26,7 @@ extra-source-files: tests/*.hs,
+
+ Library {
+ hs-source-dirs: src
+- build-depends: base >= 4.0 && < 4.4
++ build-depends: base >= 4.0 && < 4.5
+ exposed-modules: Data.Generics,
+ Data.Generics.Basics,
+ Data.Generics.Instances,
diff --git a/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch b/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch
new file mode 100644
index 00000000000..2773bdc5a63
--- /dev/null
+++ b/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch
@@ -0,0 +1,152 @@
+--- syb-0.4.3-orig/tests/XML.hs 2014-12-31 19:40:41.000000000 +1100
++++ syb-0.4.3/tests/XML.hs 2015-01-02 12:47:10.082782760 +1100
+@@ -13,6 +13,7 @@
+
+ import Test.HUnit
+
++import Control.Applicative (Alternative(..), Applicative(..))
+ import Control.Monad
+ import Data.Maybe
+ import Data.Generics
+@@ -157,6 +158,17 @@
+ else Just (tail x, head x)
+ )
+
++instance Functor ReadX where
++ fmap = liftM
++
++instance Applicative ReadX where
++ pure = return
++ (<*>) = ap
++
++instance Alternative ReadX where
++ (<|>) = mplus
++ empty = mzero
++
+ -- ReadX is a monad!
+ instance Monad ReadX where
+ return x = ReadX (\y -> Just (y,x))
+--- syb-0.4.3-orig/tests/Perm.hs 2014-12-31 19:40:41.000000000 +1100
++++ syb-0.4.3/tests/Perm.hs 2015-01-02 12:47:02.751422866 +1100
+@@ -11,6 +11,7 @@
+
+ import Test.HUnit
+
++import Control.Applicative (Alternative(..), Applicative(..))
+ import Control.Monad
+ import Data.Generics
+
+@@ -44,6 +45,17 @@
+ else Just (tail x, head x)
+ )
+
++instance Functor ReadT where
++ fmap = liftM
++
++instance Applicative ReadT where
++ pure = return
++ (<*>) = ap
++
++instance Alternative ReadT where
++ (<|>) = mplus
++ empty = mzero
++
+ -- ReadT is a monad!
+ instance Monad ReadT where
+ return x = ReadT (\y -> Just (y,x))
+--- syb-0.4.3-orig/tests/Bits.hs 2014-12-31 19:40:41.000000000 +1100
++++ syb-0.4.3/tests/Bits.hs 2015-01-02 12:46:37.842839944 +1100
+@@ -39,6 +39,7 @@
+ import Data.Generics
+ import Data.Char
+ import Data.Maybe
++import Control.Applicative (Alternative(..), Applicative(..))
+ import Control.Monad
+ import CompanyDatatypes
+
+@@ -129,6 +130,16 @@
+ data ReadB a = ReadB (Bin -> (Maybe a, Bin))
+ unReadB (ReadB f) = f
+
++instance Functor ReadB where
++ fmap = liftM
++
++instance Applicative ReadB where
++ pure = return
++ (<*>) = ap
++
++instance Alternative ReadB where
++ (<|>) = mplus
++ empty = mzero
+
+ -- It's a monad.
+ instance Monad ReadB where
+--- syb-0.4.3-orig/tests/Encode.hs 2014-12-31 19:40:41.000000000 +1100
++++ syb-0.4.3/tests/Encode.hs 2015-01-02 12:51:48.500949407 +1100
+@@ -6,6 +6,8 @@
+
+ module Encode () where
+
++import Control.Applicative (Applicative(..))
++import Control.Monad (ap, liftM)
+ import Data.Generics
+
+ data Bit = Zero | One
+@@ -62,6 +64,11 @@
+ -- Sec. 3.3 cont'd
+
+ data EncM a -- The encoder monad
++instance Functor EncM where
++ fmap = liftM
++instance Applicative EncM where
++ pure = return
++ (<*>) = ap
+ instance Monad EncM
+ where
+ return = undefined
+--- syb-0.4.3-orig/tests/GRead2.hs 2014-12-31 19:40:41.000000000 +1100
++++ syb-0.4.3/tests/GRead2.hs 2015-01-02 12:51:27.524567019 +1100
+@@ -10,6 +10,8 @@
+
+ -}
+
++import Control.Applicative (Applicative(..))
++import Control.Monad (ap, liftM)
+ import Data.Generics
+
+ gread :: Data a => String -> Maybe a
+@@ -18,6 +20,13 @@
+ -- The decoder monad
+ newtype DecM a = D (String -> Maybe (String, a))
+
++instance Functor DecM where
++ fmap = liftM
++
++instance Applicative DecM where
++ pure = return
++ (<*>) = ap
++
+ instance Monad DecM where
+ return a = D (\s -> Just (s,a))
+ (D m) >>= k = D (\s ->
+--- syb-0.4.3-orig/tests/Ext1.hs 2014-12-31 19:40:41.000000000 +1100
++++ syb-0.4.3/tests/Ext1.hs 2015-01-02 10:30:39.396517984 +1100
+@@ -1,4 +1,5 @@
+ {-# OPTIONS -fglasgow-exts #-}
++{-# LANGUAGE CPP #-}
+
+ module Ext1 (tests) where
+
+@@ -11,8 +12,11 @@
+ import Test.HUnit
+
+ import Data.Generics
++#if MIN_VERSION_base(4,8,0)
++import GHC.Base hiding(foldr)
++#else
+ import GHC.Base
+-
++#endif
+
+ -- Unsafe coerce
+ unsafeCoerce :: a -> b