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/dav/files/dav-1.0.3-ghc-7.10.patch
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/dav/files/dav-1.0.3-ghc-7.10.patch')
-rw-r--r--dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch b/dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch
new file mode 100644
index 000000000000..a291e7308c00
--- /dev/null
+++ b/dev-haskell/dav/files/dav-1.0.3-ghc-7.10.patch
@@ -0,0 +1,31 @@
+--- DAV-1.0.3-orig/hdav.hs 2014-10-15 03:15:28.000000000 +1100
++++ DAV-1.0.3/hdav.hs 2015-04-05 14:41:10.869833370 +1000
+@@ -16,6 +16,8 @@
+ -- You should have received a copy of the GNU General Public License
+ -- along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++{-# LANGUAGE FlexibleContexts #-}
++
+ import qualified Data.ByteString.Char8 as BC8
+
+ import Paths_DAV (version)
+--- DAV-1.0.3-orig/Network/Protocol/HTTP/DAV.hs 2014-10-15 03:15:28.000000000 +1100
++++ DAV-1.0.3/Network/Protocol/HTTP/DAV.hs 2015-04-05 14:40:00.119911047 +1000
+@@ -52,7 +52,7 @@
+
+ import Network.Protocol.HTTP.DAV.TH
+
+-import Control.Applicative (liftA2, Applicative)
++import Control.Applicative (liftA2, Alternative, Applicative)
+ import Control.Error (EitherT(..))
+ import Control.Lens ((^.), (.=), (%=), (.~))
+ import Control.Monad (when, MonadPlus)
+@@ -89,7 +89,7 @@
+ def = DAVContext [] def B.empty B.empty [] Nothing def Nothing "hDav-using application"
+
+ newtype DAVT m a = DAVT { runDAVT :: EitherT String (StateT DAVContext m) a }
+- deriving (Applicative, Functor, Monad, MonadBase b, MonadError String, MonadFix, MonadIO, MonadPlus, MonadState DAVContext)
++ deriving (Alternative, Applicative, Functor, Monad, MonadBase b, MonadError String, MonadFix, MonadIO, MonadPlus, MonadState DAVContext)
+
+ -- this orphan instance is probably a bad idea
+ instance MonadMask m => MonadMask (EitherT e m) where