git.iko.soy/stackage
on bf52f1d help sign in
stackage/patching/patches/gitlib-cmdline-3.0.1.patch
43 lines 1.8 kB history raw
1diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
2--- orig/Git/CmdLine.hs 2014-04-06 18:49:23.851795879 +0300
3+++ new/Git/CmdLine.hs 2014-04-06 18:49:23.000000000 +0300
4@@ -23,8 +23,9 @@
5 import Control.Monad.Reader.Class
6 import Control.Monad.Trans.Class
7 import Control.Monad.Trans.Reader (ReaderT, runReaderT)
8+import Control.Monad.Trans.Resource (MonadThrow (..))
9 import qualified Data.ByteString as B
10-import Data.Conduit hiding (MonadBaseControl)
11+import Data.Conduit
12 import qualified Data.Conduit.List as CL
13 import Data.Foldable (for_)
14 import Data.Function
15@@ -88,7 +89,7 @@
16 -- instance HasCliRepo (env, CliRepo) where
17 -- getCliRepo = snd
19-instance (Applicative m, Failure GitException m, MonadIO m)
20+instance (Applicative m, Failure GitException m, MonadIO m, MonadThrow m)
21 => MonadGit CliRepo (ReaderT CliRepo m) where
22 type Oid CliRepo = SHA
23 data Tree CliRepo = CmdLineTree (TreeOid CliRepo)
24@@ -127,7 +128,7 @@
26 diffContentsWithTree = error "Not defined cliDiffContentsWithTree"
28-type MonadCli m = (Applicative m, Failure GitException m, MonadIO m)
29+type MonadCli m = (Applicative m, Failure GitException m, MonadIO m, MonadThrow m)
31 mkOid :: MonadCli m => forall o. TL.Text -> ReaderT CliRepo m (Tagged o SHA)
32 mkOid = fmap Tagged <$> textToSha . toStrict
33diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal
34--- orig/gitlib-cmdline.cabal 2014-04-06 18:49:23.895795879 +0300
35+++ new/gitlib-cmdline.cabal 2014-04-06 18:49:23.000000000 +0300
36@@ -39,6 +39,7 @@
37 , transformers >= 0.2.2
38 , transformers-base >= 0.4.1
39 , unordered-containers >= 0.2.3.0
40+ , resourcet
41 exposed-modules:
42 Git.CmdLine