Commit 0a89f945 authored by Ryan Scott's avatar Ryan Scott

Remove old patches and update packages with Hackage revisions

* The patches for `cborg`, `dlist`, and `th-data-compat` were
  removed, since they now have newer versions on Hackage that build
  with GHC HEAD.
* Additional Hackage revisions for `attoparsec`, `cassava`,
  `hackage-security`, `hedgehog`, `lens`, `streaming`, and `turtle`
  are now on Hackage, so update their checked-in `.cabal` files
  (or if their `.cabal` files haven't been checked in yet, as is
  the case for `streaming`, and `turtle`, check them in now).
parent e1373437
Pipeline #9287 passed with stages
in 72 minutes and 11 seconds
name: attoparsec
version: 0.13.2.2
x-revision: 2
x-revision: 3
license: BSD3
license-file: LICENSE
category: Text, Parsing
......@@ -54,7 +54,7 @@ library
if !impl(ghc >= 8.0)
-- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
build-depends: fail == 4.9.*,
semigroups >=0.16.1 && <0.19
semigroups >=0.16.1 && <0.20
exposed-modules: Data.Attoparsec
Data.Attoparsec.ByteString
......@@ -140,7 +140,7 @@ test-suite tests
if !impl(ghc >= 8.0)
-- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
build-depends: fail == 4.9.*,
semigroups >=0.16.1 && <0.19
semigroups >=0.16.1 && <0.20
benchmark benchmarks
type: exitcode-stdio-1.0
......
cabal-version: 1.12
Name: cassava
Version: 0.5.1.0
x-revision: 1
x-revision: 2
Synopsis: A CSV parsing and encoding library
Description: {
......@@ -53,8 +53,6 @@ source-repository head
flag bytestring--LT-0_10_4
description: [bytestring](https://hackage.haskell.org/haskell/package/bytestring) < 0.10.4
manual: True
default: False
Library
default-language: Haskell2010
......@@ -101,7 +99,7 @@ Library
bytestring >= 0.9.2 && < 0.11,
containers >= 0.4.2 && < 0.7,
deepseq >= 1.1 && < 1.5,
hashable < 1.3,
hashable < 1.4,
scientific >= 0.3.4.7 && < 0.4,
text < 1.3,
unordered-containers < 0.3,
......@@ -128,7 +126,7 @@ Library
ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
else
-- provide/emulate `Control.Monad.Fail` and `Data.Semigroups` API for pre-GHC8
build-depends: fail == 4.9.*, semigroups == 0.18.*
build-depends: fail == 4.9.*, semigroups >= 0.18.2 && <0.20
if impl(ghc >= 8.2)
ghc-options: -Wcpp-undef
......@@ -168,14 +166,14 @@ Test-suite unit-tests
-- For Numeric.Natural
if impl(ghc < 7.10)
build-depends: nats >= 1 && < 1.2
build-depends: nats
-- https://ghc.haskell.org/trac/ghc/wiki/Migration/8.0#Recommendationsforforward-compatibility
if impl(ghc >= 8.0)
ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
else
-- provide/emulate `Control.Monad.Fail` and `Data.Semigroups` API for pre-GHC8
build-depends: fail == 4.9.*, semigroups == 0.18.*
build-depends: fail, semigroups
if impl(ghc >= 8.2)
ghc-options: -Wcpp-undef
......
diff -ru cborg-0.2.1.0.orig/src/Codec/CBOR/Decoding.hs cborg-0.2.1.0/src/Codec/CBOR/Decoding.hs
--- cborg-0.2.1.0.orig/src/Codec/CBOR/Decoding.hs 2018-10-11 17:10:04.000000000 -0400
+++ cborg-0.2.1.0/src/Codec/CBOR/Decoding.hs 2019-03-16 07:38:16.792667620 -0400
@@ -282,7 +282,9 @@
{-# INLINE (>>) #-}
(>>) = (*>)
+#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
+#endif
-- | @since 0.2.0.0
instance Fail.MonadFail (Decoder s) where
@@ -828,14 +830,14 @@
decodeListLenCanonicalOf = decodeListLenOfHelper decodeListLenCanonical
{-# INLINE decodeListLenCanonicalOf #-}
-decodeListLenOfHelper :: (Show a, Eq a, Monad m) => m a -> a -> m ()
+decodeListLenOfHelper :: (Show a, Eq a, Fail.MonadFail m) => m a -> a -> m ()
decodeListLenOfHelper decodeFun = \len -> do
len' <- decodeFun
if len == len' then return ()
else fail $ "expected list of length " ++ show len
{-# INLINE decodeListLenOfHelper #-}
-decodeWordOfHelper :: (Show a, Eq a, Monad m) => m a -> a -> m ()
+decodeWordOfHelper :: (Show a, Eq a, Fail.MonadFail m) => m a -> a -> m ()
decodeWordOfHelper decodeFun = \n -> do
n' <- decodeFun
if n == n' then return ()
diff -ru cborg-0.2.1.0.orig/src/Codec/CBOR/Pretty.hs cborg-0.2.1.0/src/Codec/CBOR/Pretty.hs
--- cborg-0.2.1.0.orig/src/Codec/CBOR/Pretty.hs 2018-10-11 17:10:04.000000000 -0400
+++ cborg-0.2.1.0/src/Codec/CBOR/Pretty.hs 2019-03-16 07:38:42.156935413 -0400
@@ -103,7 +103,9 @@
Right (toks', ind', ss', x) -> let PP g' = g x
in g' toks' ind' ss'
return = pure
+#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
+#endif
instance Fail.MonadFail PP where
fail s = PP $ \_ _ _ -> Left s
commit 7942c5ca3e28d2a546e5d351ded87f454655a58c
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri Mar 29 13:57:16 2019 -0400
Adapt to base-4.13.0.0
diff --git a/Data/DList.hs b/Data/DList.hs
index 06f1ce8..27a016e 100644
--- a/Data/DList.hs
+++ b/Data/DList.hs
@@ -65,6 +65,7 @@ import Prelude hiding (concat, foldr, map, head, tail, replicate)
import qualified Data.List as List
import Control.DeepSeq (NFData(..))
import Control.Monad as M
+import qualified Control.Monad.Fail as Fail
import Data.Function (on)
import Data.String (IsString(..))
@@ -278,6 +279,12 @@ instance Monad DList where
return = pure
{-# INLINE return #-}
+#if !(MIN_VERSION_base(4,13,0))
+ fail = Fail.fail
+ {-# INLINE fail #-}
+#endif
+
+instance Fail.MonadFail DList where
fail _ = empty
{-# INLINE fail #-}
cabal-version: 1.12
name: hackage-security
version: 0.5.3.0
x-revision: 4
x-revision: 6
synopsis: Hackage security library
description: The hackage security library provides both server and
......@@ -114,7 +114,7 @@ library
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
-- functionality, 0.5.0 changes type of serialise
tar >= 0.5 && < 0.6,
time >= 1.2 && < 1.9,
time >= 1.2 && < 1.10,
transformers >= 0.4 && < 0.6,
zlib >= 0.5 && < 0.7,
-- whatever versions are bundled with ghc:
......@@ -201,7 +201,7 @@ library
-- dependency in network is not redundant.)
if flag(use-network-uri)
build-depends: network-uri >= 2.6 && < 2.7,
network >= 2.6 && < 2.9
network >= 2.6 && < 2.9 || >= 3.0 && < 3.2
else
build-depends: network >= 2.5 && < 2.6
......
version: 1.0
x-revision: 1
x-revision: 2
name:
hedgehog
......@@ -63,7 +63,7 @@ library
, monad-control >= 1.0 && < 1.1
, mtl >= 2.1 && < 2.3
, pretty-show >= 1.6 && < 1.10
, primitive >= 0.6 && < 0.7
, primitive >= 0.6 && < 0.8
, random >= 1.1 && < 1.2
, resourcet >= 1.1 && < 1.3
, semigroups >= 0.16 && < 0.20
......
name: lens
category: Data, Lenses, Generics
version: 4.17.1
x-revision: 1
x-revision: 2
license: BSD2
cabal-version: 1.18
license-file: LICENSE
......@@ -200,7 +200,7 @@ library
base-orphans >= 0.5.2 && < 1,
bifunctors >= 5.1 && < 6,
bytestring >= 0.9.1.10 && < 0.11,
call-stack >= 0.1 && < 0.2,
call-stack >= 0.1 && < 0.3,
comonad >= 4 && < 6,
contravariant >= 1.3 && < 2,
containers >= 0.4.0 && < 0.7,
......
This diff is collapsed.
commit fc0d2aa1a8fe304dcbe2e49fb9b20a7cb192171a
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Sat Dec 29 20:39:21 2018 -0500
Allow building with template-haskell-2.15.0.0
diff --git a/src/Language/Haskell/TH/Compat/Data/Current.hs b/src/Language/Haskell/TH/Compat/Data/Current.hs
index cdb8f09..a74e8d8 100644
--- a/src/Language/Haskell/TH/Compat/Data/Current.hs
+++ b/src/Language/Haskell/TH/Compat/Data/Current.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
module Language.Haskell.TH.Compat.Data.Current (
dataD', unDataD,
newtypeD', unNewtypeD,
@@ -12,7 +13,9 @@ import Language.Haskell.TH
Dec (DataD, NewtypeD, DataInstD, NewtypeInstD, InstanceD),
DerivClauseQ, DerivClause (..), Pred,
dataD, newtypeD, dataInstD, newtypeInstD, derivClause, conT)
-
+#if MIN_VERSION_template_haskell(2,15,0)
+import Language.Haskell.TH (Type(..))
+#endif
derivesFromNames :: [Name] -> [DerivClauseQ]
derivesFromNames ns = [derivClause Nothing $ map conT ns]
@@ -50,8 +53,15 @@ dataInstD' cxt n as cs ds = dataInstD cxt n as Nothing cs $ derivesFromNames ds
-- | Compatible interface to destruct 'DataInstD'
unDataInstD :: Dec -> Maybe (Cxt, Name, [Type], Maybe Kind, [Con], [Type])
+#if MIN_VERSION_template_haskell(2,15,0)
+unDataInstD (DataInstD cxt _mtvbs nas mk cs ds)
+ | ConT n:as <- unAppsT nas
+ = Just (cxt, n, as, mk, cs, ds >>= unDerivClause)
+unDataInstD _ = Nothing
+#else
unDataInstD (DataInstD cxt n as mk cs ds) = Just (cxt, n, as, mk, cs, ds >>= unDerivClause)
unDataInstD _ = Nothing
+#endif
-- | Definition against 'newtypeInstD',
-- compatible with before temaplate-haskell-2.11
@@ -61,11 +71,26 @@ newtypeInstD' cxt n as c ds = newtypeInstD cxt n as Nothing c $ derivesFromNames
-- | Compatible interface to destruct 'NewtypeInstD'
unNewtypeInstD :: Dec -> Maybe (Cxt, Name, [Type], Maybe Kind, Con, [Type])
+#if MIN_VERSION_template_haskell(2,15,0)
+unNewtypeInstD (NewtypeInstD cxt _mtvbs nas mk c ds)
+ | ConT n:as <- unAppsT nas
+ = Just (cxt, n, as, mk, c, ds >>= unDerivClause)
+unNewtypeInstD _ = Nothing
+#else
unNewtypeInstD (NewtypeInstD cxt n as mk c ds) = Just (cxt, n, as, mk, c, ds >>= unDerivClause)
unNewtypeInstD _ = Nothing
+#endif
-- | Compatible interface to destruct 'InstanceD'
-- No Overlap type is defined before template-haskell-2.11.
unInstanceD :: Dec -> Maybe (Cxt, Type, [Dec])
unInstanceD (InstanceD _ cxt ty decs) = Just (cxt, ty, decs)
unInstanceD _ = Nothing
+
+#if MIN_VERSION_template_haskell(2,15,0)
+unAppsT :: Type -> [Type]
+unAppsT = go []
+ where
+ go xs (AppT l x) = go (x : xs) l
+ go xs ty = ty : xs
+#endif
Name: turtle
Version: 1.5.14
x-revision: 3
Cabal-Version: >=1.10
Build-Type: Simple
License: BSD3
License-File: LICENSE
Copyright: 2015 Gabriel Gonzalez
Author: Gabriel Gonzalez
Maintainer: Gabriel439@gmail.com
Tested-With: GHC == 7.10.2, GHC == 8.0.1
Bug-Reports: https://github.com/Gabriel439/Haskell-Turtle-Library/issues
Synopsis: Shell programming, Haskell-style
Description: @turtle@ is a reimplementation of the Unix command line environment
in Haskell so that you can use Haskell as both a shell and a scripting
language.
.
Features include:
.
* Batteries included: Command an extended suite of predefined utilities
.
* Interoperability: You can still run external shell commands
.
* Portability: Works on Windows, OS X, and Linux
.
* Exception safety: Safely acquire and release resources
.
* Streaming: Transform or fold command output in constant space
.
* Patterns: Use typed regular expressions that can parse structured values
.
* Formatting: Type-safe @printf@-style text formatting
.
* Modern: Supports @text@ and @system-filepath@
.
Read "Turtle.Tutorial" for a detailed tutorial or "Turtle.Prelude" for a
quick-start guide
.
@turtle@ is designed to be beginner-friendly, but as a result lacks certain
features, like tracing commands. If you feel comfortable using @turtle@
then you should also check out the @Shelly@ library which provides similar
functionality.
Category: System
Extra-Source-Files:
CHANGELOG.md
Source-Repository head
Type: git
Location: https://github.com/Gabriel439/Haskell-Turtle-Library
Library
HS-Source-Dirs: src
Build-Depends:
base >= 4.6 && < 5 ,
ansi-wl-pprint >= 0.6 && < 0.7 ,
async >= 2.0.0.0 && < 2.3 ,
bytestring >= 0.9.1.8 && < 0.11,
clock >= 0.4.1.2 && < 0.9 ,
containers >= 0.5.0.0 && < 0.7 ,
directory >= 1.0.7 && < 1.4 ,
exceptions >= 0.4 && < 0.11,
foldl >= 1.1 && < 1.5 ,
hostname < 1.1 ,
managed >= 1.0.3 && < 1.1 ,
process >= 1.0.1.1 && < 1.7 ,
semigroups >= 0.5.0 && < 0.20,
system-filepath >= 0.3.1 && < 0.5 ,
system-fileio >= 0.2.1 && < 0.4 ,
stm < 2.6 ,
temporary < 1.4 ,
text < 1.3 ,
time < 1.9 ,
transformers >= 0.2.0.0 && < 0.6 ,
optparse-applicative >= 0.13 && < 0.16,
optional-args >= 1.0 && < 2.0 ,
unix-compat >= 0.4 && < 0.6
if os(windows)
Build-Depends: Win32 >= 2.2.0.1 && < 2.9
else
Build-Depends: unix >= 2.5.1.0 && < 2.8
Exposed-Modules:
Turtle,
Turtle.Bytes,
Turtle.Format,
Turtle.Pattern,
Turtle.Shell,
Turtle.Options,
Turtle.Line,
Turtle.Prelude,
Turtle.Tutorial
Other-Modules:
Turtle.Internal
GHC-Options: -Wall
Default-Language: Haskell2010
test-suite tests
Type: exitcode-stdio-1.0
HS-Source-Dirs: test
Main-Is: Main.hs
GHC-Options: -Wall
Default-Language: Haskell2010
Build-Depends:
base >= 4 && < 5 ,
doctest >= 0.7 && < 0.17
test-suite regression-broken-pipe
Type: exitcode-stdio-1.0
HS-Source-Dirs: test
Main-Is: RegressionBrokenPipe.hs
GHC-Options: -Wall -threaded
Default-Language: Haskell2010
Build-Depends:
base >= 4 && < 5,
turtle
test-suite regression-masking-exception
Type: exitcode-stdio-1.0
HS-Source-Dirs: test
Main-Is: RegressionMaskingException.hs
GHC-Options: -Wall -threaded
Default-Language: Haskell2010
Build-Depends:
base >= 4 && < 5,
turtle
test-suite cptree
Type: exitcode-stdio-1.0
HS-Source-Dirs: test
Main-Is: cptree.hs
GHC-Options: -Wall -threaded
Default-Language: Haskell2010
Build-Depends:
base >= 4 && < 5,
temporary,
system-filepath >= 0.4,
turtle
benchmark bench
Type: exitcode-stdio-1.0
HS-Source-Dirs: bench
Main-Is: Main.hs
GHC-Options: -O2 -Wall -threaded
Default-Language: Haskell2010
Build-Depends:
base >= 4 && < 5 ,
text < 1.3,
turtle
if impl(ghc < 7.8)
Build-Depends: criterion >= 0.4 && < 1.1.4.0
else
Build-Depends: criterion >= 0.4 && < 1.6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment