git.iko.soy/stackage
on master help sign in
Fix a patch for 7.4
e68532aMichael Snoyman
patching/patches/gitlib-cmdline-3.0.1.patch+9−6
compare with master
unifiedsplit
@@ -1,14 +1,17 @@
1diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
1diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
2−--- orig/Git/CmdLine.hs 2014-04-06 09:02:46.027789820 +0300
2+--- orig/Git/CmdLine.hs 2014-04-06 18:49:23.851795879 +0300
3−+++ new/Git/CmdLine.hs 2014-04-06 09:02:45.000000000 +0300
3++++ new/Git/CmdLine.hs 2014-04-06 18:49:23.000000000 +0300
4−@@ -23,6 +23,7 @@
4+@@ -23,8 +23,9 @@
5 import Control.Monad.Reader.Class
5 import Control.Monad.Reader.Class
6 import Control.Monad.Trans.Class
6 import Control.Monad.Trans.Class
7 import Control.Monad.Trans.Reader (ReaderT, runReaderT)
7 import Control.Monad.Trans.Reader (ReaderT, runReaderT)
8+import Control.Monad.Trans.Resource (MonadThrow (..))
8+import Control.Monad.Trans.Resource (MonadThrow (..))
9 import qualified Data.ByteString as B
9 import qualified Data.ByteString as B
10− import Data.Conduit hiding (MonadBaseControl)
10+-import Data.Conduit hiding (MonadBaseControl)
11++import Data.Conduit
11 import qualified Data.Conduit.List as CL
12 import qualified Data.Conduit.List as CL
13+ import Data.Foldable (for_)
14+ import Data.Function
12@@ -88,7 +89,7 @@
15@@ -88,7 +89,7 @@
13 -- instance HasCliRepo (env, CliRepo) where
16 -- instance HasCliRepo (env, CliRepo) where
14 -- getCliRepo = snd
17 -- getCliRepo = snd
@@ -28,8 +31,8 @@ diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
28 mkOid :: MonadCli m => forall o. TL.Text -> ReaderT CliRepo m (Tagged o SHA)
31 mkOid :: MonadCli m => forall o. TL.Text -> ReaderT CliRepo m (Tagged o SHA)
29 mkOid = fmap Tagged <$> textToSha . toStrict
32 mkOid = fmap Tagged <$> textToSha . toStrict
30diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal
33diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal
31−--- orig/gitlib-cmdline.cabal 2014-04-06 09:02:46.031789820 +0300
34+--- orig/gitlib-cmdline.cabal 2014-04-06 18:49:23.895795879 +0300
32−+++ new/gitlib-cmdline.cabal 2014-04-06 09:02:45.000000000 +0300
35++++ new/gitlib-cmdline.cabal 2014-04-06 18:49:23.000000000 +0300
33@@ -39,6 +39,7 @@
36@@ -39,6 +39,7 @@
34 , transformers >= 0.2.2
37 , transformers >= 0.2.2
35 , transformers-base >= 0.4.1
38 , transformers-base >= 0.4.1