From e68532a35ec119651a5c96e10d1f09a9c18dc740 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 6 Apr 2014 18:49:39 +0300 Subject: [PATCH] Fix a patch for 7.4 --- patching/patches/gitlib-cmdline-3.0.1.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/patching/patches/gitlib-cmdline-3.0.1.patch b/patching/patches/gitlib-cmdline-3.0.1.patch index 4dc4b16e..0f23a1a2 100644 --- a/patching/patches/gitlib-cmdline-3.0.1.patch +++ b/patching/patches/gitlib-cmdline-3.0.1.patch @@ -1,14 +1,17 @@ diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs ---- orig/Git/CmdLine.hs 2014-04-06 09:02:46.027789820 +0300 -+++ new/Git/CmdLine.hs 2014-04-06 09:02:45.000000000 +0300 -@@ -23,6 +23,7 @@ +--- orig/Git/CmdLine.hs 2014-04-06 18:49:23.851795879 +0300 ++++ new/Git/CmdLine.hs 2014-04-06 18:49:23.000000000 +0300 +@@ -23,8 +23,9 @@ import Control.Monad.Reader.Class import Control.Monad.Trans.Class import Control.Monad.Trans.Reader (ReaderT, runReaderT) +import Control.Monad.Trans.Resource (MonadThrow (..)) import qualified Data.ByteString as B - import Data.Conduit hiding (MonadBaseControl) +-import Data.Conduit hiding (MonadBaseControl) ++import Data.Conduit import qualified Data.Conduit.List as CL + import Data.Foldable (for_) + import Data.Function @@ -88,7 +89,7 @@ -- instance HasCliRepo (env, CliRepo) where -- getCliRepo = snd @@ -28,8 +31,8 @@ diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs mkOid :: MonadCli m => forall o. TL.Text -> ReaderT CliRepo m (Tagged o SHA) mkOid = fmap Tagged <$> textToSha . toStrict diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal ---- orig/gitlib-cmdline.cabal 2014-04-06 09:02:46.031789820 +0300 -+++ new/gitlib-cmdline.cabal 2014-04-06 09:02:45.000000000 +0300 +--- orig/gitlib-cmdline.cabal 2014-04-06 18:49:23.895795879 +0300 ++++ new/gitlib-cmdline.cabal 2014-04-06 18:49:23.000000000 +0300 @@ -39,6 +39,7 @@ , transformers >= 0.2.2 , transformers-base >= 0.4.1