Skip to content
Snippets Groups Projects
Commit abea3946 authored by Ryan Scott's avatar Ryan Scott
Browse files

Update patches to allow attoparsec-0.14.*

parent 9494ad24
No related branches found
No related tags found
No related merge requests found
diff --git a/cassava.cabal b/cassava.cabal
index 82977ce..7d2630b 100644
index 82977ce..0a9064a 100644
--- a/cassava.cabal
+++ b/cassava.cabal
@@ -1,6 +1,7 @@
cabal-version: 1.12
Name: cassava
Version: 0.5.2.0
+x-revision: 1
+x-revision: 5
Synopsis: A CSV parsing and encoding library
Description: {
@@ -42,7 +43,7 @@ Build-type: Simple
@@ -42,7 +43,19 @@ Build-type: Simple
Extra-source-files: examples/*.hs,
CHANGES.md,
README.md
-Tested-with: GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC ==8.2.2, GHC ==8.0.2, GHC ==7.10.3, GHC ==7.8.4, GHC ==7.6.3, GHC ==7.4.2
+Tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC ==8.2.2, GHC ==8.0.2, GHC ==7.10.3, GHC ==7.8.4, GHC ==7.6.3, GHC ==7.4.2
+Tested-with:
+ GHC == 9.2.1
+ GHC == 9.0.1
+ GHC == 8.10.7
+ GHC == 8.8.4
+ GHC == 8.6.5
+ GHC == 8.4.4
+ GHC == 8.2.2
+ GHC == 8.0.2
+ GHC == 7.10.3
+ GHC == 7.8.4
+ GHC == 7.6.3
+ GHC == 7.4.2
----------------------------------------------------------------------------
@@ -52,6 +53,9 @@ source-repository head
@@ -52,6 +65,9 @@ source-repository head
flag bytestring--LT-0_10_4
description: [bytestring](https://hackage.haskell.org/haskell/package/bytestring) < 0.10.4
......@@ -29,12 +41,33 @@ index 82977ce..7d2630b 100644
Library
default-language: Haskell2010
@@ -96,7 +100,7 @@ Library
@@ -95,15 +111,15 @@ Library
Build-depends:
array >= 0.4 && < 0.6,
attoparsec >= 0.11.3.0 && < 0.14,
- attoparsec >= 0.11.3.0 && < 0.14,
- base >= 4.5 && < 4.14,
+ base >= 4.5 && < 4.15,
bytestring >= 0.9.2 && < 0.11,
- bytestring >= 0.9.2 && < 0.11,
+ attoparsec >= 0.11.3.0 && < 0.15,
+ base >= 4.5 && < 4.17,
+ bytestring >= 0.9.2 && < 0.12,
containers >= 0.4.2 && < 0.7,
deepseq >= 1.1 && < 1.5,
- hashable < 1.4,
+ hashable < 1.5,
scientific >= 0.3.4.7 && < 0.4,
text < 1.3,
- transformers >= 0.2 && < 0.6,
+ transformers >= 0.2 && < 0.7,
unordered-containers < 0.3,
vector >= 0.8 && < 0.13,
Only >= 0.1 && < 0.1.1
@@ -158,7 +174,7 @@ Test-suite unit-tests
, vector
-- extra dependencies not already used by lib:cassava
build-depends: HUnit < 1.7
- , QuickCheck == 2.13.*
+ , QuickCheck >= 2.13 && < 2.15
, quickcheck-instances >= 0.3.12 && < 0.4
, test-framework == 0.8.*
, test-framework-hunit == 0.3.*
diff --git a/snap-core.cabal b/snap-core.cabal
index 75eb5fc..dcd507f 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -1,5 +1,6 @@
name: snap-core
version: 1.0.4.2
+x-revision: 1
synopsis: Snap: A Haskell Web Framework (core interfaces and types)
description:
@@ -131,9 +132,9 @@ Library
build-depends:
HUnit >= 1.2 && < 2,
- attoparsec >= 0.12 && < 0.14,
+ attoparsec >= 0.12 && < 0.15,
base >= 4 && < 5,
- bytestring >= 0.9 && < 0.11,
+ bytestring >= 0.9 && < 0.12,
bytestring-builder >= 0.10.4 && < 0.11,
case-insensitive >= 1.1 && < 1.3,
containers >= 0.3 && < 1.0,
@@ -184,7 +185,7 @@ Library
if impl(ghc >= 8.0)
ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
else
- build-depends: fail == 4.9.*, semigroups == 0.18.*
+ build-depends: fail == 4.9.*, semigroups >= 0.18 && < 0.20
if flag(network-uri)
-- Leaving network-uri-2.7.0.0 out for now because it is marked deprecated
@@ -291,7 +292,7 @@ Test-suite testsuite
if impl(ghc >= 8.0)
ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
else
- build-depends: fail == 4.9.*, semigroups == 0.18.*
+ build-depends: fail == 4.9.*, semigroups >= 0.18 && < 0.20
other-extensions:
BangPatterns,
diff --git a/src/Snap/Internal/Parsing.hs b/src/Snap/Internal/Parsing.hs
index a43aeba..c6676cc 100644
--- a/src/Snap/Internal/Parsing.hs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment