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/cgi/files/cgi-3001.1.8.4-mci.patch | |
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/cgi/files/cgi-3001.1.8.4-mci.patch')
-rw-r--r-- | dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch new file mode 100644 index 000000000000..b672947ab1f9 --- /dev/null +++ b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch @@ -0,0 +1,15 @@ +Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=497496 +Gentoo-Haskell-bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/297 +diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs +index 758ab03..9c41fc3 100644 +--- a/Network/CGI/Monad.hs ++++ b/Network/CGI/Monad.hs +@@ -119,7 +119,7 @@ catchCGI = catch + + -- | Catches any exception thrown by an CGI action, and returns either + -- the exception, or if no exception was raised, the result of the action. +-tryCGI :: (MonadCGI m, MonadCatchIO m) => m a -> m (Either SomeException a) ++tryCGI :: (MonadCGI m, MonadCatchIO m, Functor m) => m a -> m (Either SomeException a) + tryCGI = try + + {-# DEPRECATED handleExceptionCGI "Use catchCGI instead." #-} |