[Git][haskell-team/package-plan][master] some patch updates
Clint Adams
gitlab at salsa.debian.org
Mon Apr 16 17:03:08 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
99c9716c by Clint Adams at 2018-04-16T12:02:59-04:00
some patch updates
- - - - -
14 changed files:
- + patches/aeson/1.2.4.0/newer-deps
- + patches/aeson/1.2.4.0/series
- + patches/attoparsec/0.13.2.2/newer-quickcheck
- + patches/attoparsec/0.13.2.2/no-threaded-testsuite
- + patches/attoparsec/0.13.2.2/series
- + patches/blaze-html/0.9.0.1/newer-deps
- + patches/blaze-html/0.9.0.1/series
- patches/cgi/3001.3.0.2/newer-time → patches/cgi/3001.3.0.2/newer-deps
- patches/cgi/3001.3.0.2/series
- patches/conduit-extra/1.1.17/no-bytestring-builder → patches/conduit-extra/1.3.0/no-bytestring-builder
- patches/conduit-extra/1.1.17/series → patches/conduit-extra/1.3.0/series
- + patches/ed25519/0.0.5.0/newer-doctest
- patches/ed25519/0.0.5.0/newer-quickcheck
- patches/ed25519/0.0.5.0/series
Changes:
=====================================
patches/aeson/1.2.4.0/newer-deps
=====================================
--- /dev/null
+++ b/patches/aeson/1.2.4.0/newer-deps
@@ -0,0 +1,25 @@
+--- a/aeson.cabal
++++ b/aeson.cabal
+@@ -200,19 +200,19 @@
+
+ build-depends:
+ HUnit,
+- QuickCheck >= 2.10.0.1 && < 2.11,
++ QuickCheck >= 2.10.0.1 && < 2.12,
+ aeson,
+ integer-logarithms >= 1 && <1.1,
+ attoparsec,
+ base,
+ base-compat,
+- base-orphans >= 0.5.3 && <0.7,
++ base-orphans >= 0.5.3 && <0.8,
+ base16-bytestring,
+ containers,
+ directory,
+ dlist,
+ filepath,
+- generic-deriving >= 1.10 && < 1.12,
++ generic-deriving >= 1.10 && < 1.13,
+ ghc-prim >= 0.2,
+ hashable >= 1.2.4.0,
+ scientific,
=====================================
patches/aeson/1.2.4.0/series
=====================================
--- /dev/null
+++ b/patches/aeson/1.2.4.0/series
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/attoparsec/0.13.2.2/newer-quickcheck
=====================================
--- /dev/null
+++ b/patches/attoparsec/0.13.2.2/newer-quickcheck
@@ -0,0 +1,22 @@
+--- a/attoparsec.cabal
++++ b/attoparsec.cabal
+@@ -127,7 +127,7 @@
+ base >= 4 && < 5,
+ bytestring,
+ deepseq >= 1.1,
+- QuickCheck >= 2.7 && < 2.10,
++ QuickCheck >= 2.7 && < 2.12,
+ quickcheck-unicode,
+ scientific,
+ tasty >= 0.11,
+--- a/tests/QC/ByteString.hs
++++ b/tests/QC/ByteString.hs
+@@ -164,7 +164,7 @@
+ , testProperty "peekWord8" peekWord8
+ , testProperty "peekWord8'" peekWord8'
+ , testProperty "satisfy" satisfy
+- , testProperty "satisfyWith" satisfyWith
++ , testProperty "satisfyWith" (forAll arbitraryASCIIChar satisfyWith)
+ , testProperty "scan" scan
+ , testProperty "skip" skip
+ , testProperty "skipWhile" skipWhile
=====================================
patches/attoparsec/0.13.2.2/no-threaded-testsuite
=====================================
--- /dev/null
+++ b/patches/attoparsec/0.13.2.2/no-threaded-testsuite
@@ -0,0 +1,14 @@
+Description: Do not run test suite threaded, does not work on all arches.
+Author: Joachim Breitner <nomeata at debian.org>
+
+--- a/attoparsec.cabal
++++ b/attoparsec.cabal
+@@ -117,7 +117,7 @@
+ Data.Attoparsec.Zepto
+
+ ghc-options:
+- -Wall -threaded -rtsopts
++ -Wall -rtsopts
+
+ if flag(developer)
+ ghc-options: -Werror
=====================================
patches/attoparsec/0.13.2.2/series
=====================================
--- /dev/null
+++ b/patches/attoparsec/0.13.2.2/series
@@ -0,0 +1,2 @@
+no-threaded-testsuite
+newer-quickcheck
=====================================
patches/blaze-html/0.9.0.1/newer-deps
=====================================
--- /dev/null
+++ b/patches/blaze-html/0.9.0.1/newer-deps
@@ -0,0 +1,13 @@
+--- a/blaze-html.cabal
++++ b/blaze-html.cabal
+@@ -69,8 +69,8 @@
+ Util.Tests
+
+ Build-depends:
+- HUnit >= 1.2 && < 1.6,
+- QuickCheck >= 2.4 && < 2.10,
++ HUnit >= 1.2 && < 1.7,
++ QuickCheck >= 2.4 && < 2.12,
+ containers >= 0.3 && < 0.6,
+ test-framework >= 0.4 && < 0.9,
+ test-framework-hunit >= 0.3 && < 0.4,
=====================================
patches/blaze-html/0.9.0.1/series
=====================================
--- /dev/null
+++ b/patches/blaze-html/0.9.0.1/series
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/cgi/3001.3.0.2/newer-time → patches/cgi/3001.3.0.2/newer-deps
=====================================
--- a/patches/cgi/3001.3.0.2/newer-time
+++ b/patches/cgi/3001.3.0.2/newer-deps
@@ -9,3 +9,14 @@
containers < 0.6,
multipart >= 0.1.2 && < 0.2
If flag(network-uri)
+@@ -72,8 +72,8 @@
+ ghc-options: -Wall
+ build-depends:
+ base
+- , doctest >= 0.8 && < 0.12
+- , QuickCheck >= 2.8.1 && < 2.10
++ , doctest >= 0.8 && < 0.14
++ , QuickCheck >= 2.8.1 && < 2.12
+
+ --Executable: printinput
+ --Main-Is: printinput.hs
=====================================
patches/cgi/3001.3.0.2/series
=====================================
--- a/patches/cgi/3001.3.0.2/series
+++ b/patches/cgi/3001.3.0.2/series
@@ -1 +1 @@
-newer-time
+newer-deps
=====================================
patches/conduit-extra/1.1.17/no-bytestring-builder → patches/conduit-extra/1.3.0/no-bytestring-builder
=====================================
--- a/patches/conduit-extra/1.1.17/no-bytestring-builder
+++ b/patches/conduit-extra/1.3.0/no-bytestring-builder
@@ -4,17 +4,17 @@ Author: Joachim Breitner <nomeata at debian.org>
Forwarded: not-needed, debian specific
--- a/conduit-extra.cabal
+++ b/conduit-extra.cabal
-@@ -78,7 +78,6 @@
+@@ -73,7 +73,6 @@
+
, async
, attoparsec
- , blaze-builder
- , bytestring-builder
, bytestring
, exceptions
, process
-@@ -113,7 +112,6 @@
+@@ -108,7 +107,6 @@
, conduit-extra
- , criterion
+ , gauge
, bytestring
- , bytestring-builder
, transformers
=====================================
patches/conduit-extra/1.1.17/series → patches/conduit-extra/1.3.0/series
=====================================
=====================================
patches/ed25519/0.0.5.0/newer-doctest
=====================================
--- /dev/null
+++ b/patches/ed25519/0.0.5.0/newer-doctest
@@ -0,0 +1,11 @@
+--- a/ed25519.cabal
++++ b/ed25519.cabal
+@@ -130,7 +130,7 @@
+ base >= 4 && < 5,
+ filepath >= 1.0 && < 1.5,
+ directory >= 1.0 && < 1.4,
+- doctest >= 0.10 && < 0.12
++ doctest >= 0.10 && < 0.14
+
+ -------------------------------------------------------------------------------
+ -- Build pt 3: benchmarks
=====================================
patches/ed25519/0.0.5.0/newer-quickcheck
=====================================
--- a/patches/ed25519/0.0.5.0/newer-quickcheck
+++ b/patches/ed25519/0.0.5.0/newer-quickcheck
@@ -5,7 +5,20 @@
base >= 4 && < 5,
bytestring >= 0.9 && < 0.11,
- QuickCheck >= 2.4 && < 2.9,
-+ QuickCheck >= 2.4 && < 2.10,
++ QuickCheck >= 2.4 && < 2.11,
ed25519
--
+--- a/tests/properties.hs
++++ b/tests/properties.hs
+@@ -86,7 +86,9 @@
+ case r of
+ Success n _ _ -> return (True, n)
+ GaveUp n _ _ -> return (True, n)
+-#if MIN_VERSION_QuickCheck(2,7,0)
++#if MIN_VERSION_QuickCheck(2,10,0)
++ Failure n _ _ _ _ _ _ _ _ _ _ -> return (False, n)
++#elif MIN_VERSION_QuickCheck(2,7,0)
+ Failure n _ _ _ _ _ _ _ _ _ -> return (False, n)
+ #elif MIN_VERSION_QuickCheck(2,6,0)
+ Failure n _ _ _ _ _ _ _ -> return (False, n)
=====================================
patches/ed25519/0.0.5.0/series
=====================================
--- a/patches/ed25519/0.0.5.0/series
+++ b/patches/ed25519/0.0.5.0/series
@@ -2,3 +2,4 @@ new-metadata-from-hackage
fix-dist-path
newer-directory
newer-quickcheck
+newer-doctest
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/99c9716c4b1c5c6296c22c716a1c72b53506e635
---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/99c9716c4b1c5c6296c22c716a1c72b53506e635
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180416/3be5d7a3/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list