nixpkgs/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
2014-04-07 16:37:02 -04:00

24 lines
1.1 KiB
Diff

diff -Naur libjenkins-0.4.2.0-orig/libjenkins.cabal libjenkins-0.4.2.0/libjenkins.cabal
--- libjenkins-0.4.2.0-orig/libjenkins.cabal 2014-02-17 13:11:22.000000000 -0500
+++ libjenkins-0.4.2.0/libjenkins.cabal 2014-04-07 11:40:30.046473593 -0400
@@ -52,6 +52,7 @@
, text >= 0.11
, transformers >= 0.3
, xml-conduit >= 1.1
+ , resourcet
test-suite doctest
default-language: Haskell2010
diff -Naur libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs
--- libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs 2014-02-17 13:11:22.000000000 -0500
+++ libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs 2014-04-07 11:40:02.221415450 -0400
@@ -22,7 +22,7 @@
import Control.Monad.Trans.Reader (ReaderT, runReaderT, ask, local)
import Control.Monad.Trans.Maybe (MaybeT(..), mapMaybeT)
import Data.ByteString.Lazy (ByteString)
-import Data.Conduit (ResourceT)
+import Control.Monad.Trans.Resource (ResourceT)
import Data.Data (Data, Typeable)
import Data.Text (Text)
import qualified Data.Text.Encoding as Text