haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-15 15:55:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a patch for 7.4

Browse Source
This commit is contained in:
Michael Snoyman 2014-04-06 18:49:39 +03:00
parent 180dee2999
commit e68532a35e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patching/patches/gitlib-cmdline-3.0.1.patch
View File

@ -1,14 +1,17 @@
diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs diff -ru orig/Git/CmdLine.hs new/Git/CmdLine.hs
--- orig/Git/CmdLine.hs 2014-04-06 09:02:46.027789820 +0300 --- orig/Git/CmdLine.hs 2014-04-06 18:49:23.851795879 +0300
+++ new/Git/CmdLine.hs 2014-04-06 09:02:45.000000000 +0300 +++ new/Git/CmdLine.hs 2014-04-06 18:49:23.000000000 +0300
@@ -23,6 +23,7 @@ @@ -23,8 +23,9 @@
import Control.Monad.Reader.Class import Control.Monad.Reader.Class
import Control.Monad.Trans.Class import Control.Monad.Trans.Class
import Control.Monad.Trans.Reader (ReaderT, runReaderT) import Control.Monad.Trans.Reader (ReaderT, runReaderT)
+import Control.Monad.Trans.Resource (MonadThrow (..)) +import Control.Monad.Trans.Resource (MonadThrow (..))
import qualified Data.ByteString as B 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 qualified Data.Conduit.List as CL
import Data.Foldable (for_)
import Data.Function
@@ -88,7 +89,7 @@ @@ -88,7 +89,7 @@
-- instance HasCliRepo (env, CliRepo) where -- instance HasCliRepo (env, CliRepo) where
-- getCliRepo = snd -- 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 :: MonadCli m => forall o. TL.Text -> ReaderT CliRepo m (Tagged o SHA)
mkOid = fmap Tagged <$> textToSha . toStrict mkOid = fmap Tagged <$> textToSha . toStrict
diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal diff -ru orig/gitlib-cmdline.cabal new/gitlib-cmdline.cabal
--- orig/gitlib-cmdline.cabal 2014-04-06 09:02:46.031789820 +0300 --- orig/gitlib-cmdline.cabal 2014-04-06 18:49:23.895795879 +0300
+++ new/gitlib-cmdline.cabal 2014-04-06 09:02:45.000000000 +0300 +++ new/gitlib-cmdline.cabal 2014-04-06 18:49:23.000000000 +0300
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
, transformers >= 0.2.2 , transformers >= 0.2.2
, transformers-base >= 0.4.1 , transformers-base >= 0.4.1