Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
H
head.hackage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
11
Issues
11
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
5
Merge Requests
5
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Glasgow Haskell Compiler
head.hackage
Commits
957ee321
Commit
957ee321
authored
Jul 15, 2019
by
Ben Gamari
🐢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update streaming-0.2.2.0 patch from upstream
From streaming commit a59174400842f6446eefd4b83e1951696ecdf4e1
parent
7c7facab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
8 deletions
+50
-8
patches/streaming-0.2.2.0.patch
patches/streaming-0.2.2.0.patch
+50
-8
No files found.
patches/streaming-0.2.2.0.patch
View file @
957ee321
diff -ru streaming-0.2.2.0.orig/src/Streaming/Internal.hs streaming-0.2.2.0/src/Streaming/Internal.hs
--- streaming-0.2.2.0.orig/src/Streaming/Internal.hs 1969-12-31 19:00:00.000000000 -0500
+++ streaming-0.2.2.0/src/Streaming/Internal.hs 2019-05-02 15:48:52.108061100 -0400
@@ -91,6 +91,7 @@
commit 93324cf750bc289bb1cb8c1f0087367a8510c23d
Author: Ben Gamari <ben@smart-cactus.org>
Date: Mon Jul 15 13:34:47 2019 -0400
Adjust for base 4.13 MonadFail changes.
Adds a MonadFail instance for Stream as well
as removing fail from the Monad instance under
base 4.13.
diff --git a/changelog.md b/changelog.md
index 666ee3a..dac7930 100644
--- a/changelog.md
+++ b/changelog.md
@@ -19,6 +19,10 @@
Generalise type signature of `toList_`.
+ Compatibility with base 4.13.
+
+ Provide a MonadFail instance for Stream.
+
- 0.2.1.0
Adding `Semigroup` instances for GHC 8.4.
diff --git a/src/Streaming/Internal.hs b/src/Streaming/Internal.hs
index a789f68..cd6f7b4 100644
--- a/src/Streaming/Internal.hs
+++ b/src/Streaming/Internal.hs
@@ -91,6 +91,7 @@
import Control.Monad.Trans
import Control.Monad.Reader.Class
import Control.Monad.State.Class
import Control.Monad.Error.Class
+import
qualified
Control.Monad.Fail as Fail
+import Control.Monad.Fail as Fail
import Control.Applicative
import Data.Function ( on )
import Control.Monad.Morph
@@ -244,9 +245,14 @@
@@ -244,9 +245,14 @@
instance (Functor f, Monad m) => Monad (Stream f m) where
Return r -> f r
{-# INLINABLE (>>=) #-}
- fail = lift . fail
- {-#INLINE fail #-}
+#if !(MIN_VERSION_base(4,13,0))
fail = lift .
fail
{-#
INLINE fail #-}
+ fail = lift . Prelude.
fail
+ {-#
INLINE fail #-}
+#endif
+instance (Functor f, MonadFail m) => MonadFail (Stream f m) where
...
...
@@ -24,3 +52,17 @@ diff -ru streaming-0.2.2.0.orig/src/Streaming/Internal.hs streaming-0.2.2.0/src/
-- _bind
-- :: (Functor f, Monad m)
diff --git a/streaming.cabal b/streaming.cabal
index cfc3a13..a1d0433 100644
--- a/streaming.cabal
+++ b/streaming.cabal
@@ -222,5 +222,9 @@
library
, transformers-base < 0.5
, ghc-prim
, containers
+
+ if !impl(ghc >= 8.0)
+ build-depends: fail == 4.9.*
+
hs-source-dirs: src
default-language: Haskell2010
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment