[Git][haskell-team/package-plan][master] 2 commits: re-enable aeson testsuite
Clint Adams
gitlab at salsa.debian.org
Mon Sep 2 00:18:04 BST 2019
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
21284f20 by Clint Adams at 2019-09-01T22:34:21Z
re-enable aeson testsuite
- - - - -
13cdf15e by Clint Adams at 2019-09-01T23:17:51Z
enable cborg testsuite
- - - - -
12 changed files:
- + additional-cabals/aeson-1.4.2.0.cabal
- + additional-cabals/binary-orphans-0.1.8.0.cabal
- packages.txt
- + patches/aeson/1.4.2.0/newer-deps
- + patches/aeson/1.4.2.0/series
- + patches/binary-orphans/0.1.8.0/newer-deps
- + patches/binary-orphans/0.1.8.0/series
- + patches/blaze-markup/0.8.2.2/newer-deps2
- patches/blaze-markup/0.8.2.2/series
- + patches/cborg/0.2.1.0/fix-x32-build
- patches/cborg/0.2.1.0/newer-deps
- patches/cborg/0.2.1.0/series
Changes:
=====================================
additional-cabals/aeson-1.4.2.0.cabal
=====================================
@@ -0,0 +1,260 @@
+name: aeson
+version: 1.4.2.0
+license: BSD3
+license-file: LICENSE
+category: Text, Web, JSON
+copyright: (c) 2011-2016 Bryan O'Sullivan
+ (c) 2011 MailRank, Inc.
+author: Bryan O'Sullivan <bos at serpentine.com>
+maintainer: Adam Bergmark <adam at bergmark.nl>
+stability: experimental
+tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1
+synopsis: Fast JSON parsing and encoding
+cabal-version: >= 1.10
+homepage: https://github.com/bos/aeson
+bug-reports: https://github.com/bos/aeson/issues
+build-type: Simple
+description:
+ A JSON parsing and encoding library optimized for ease of use
+ and high performance.
+ .
+ To get started, see the documentation for the @Data.Aeson@ module
+ below.
+ .
+ (A note on naming: in Greek mythology, Aeson was the father of Jason.)
+
+extra-source-files:
+ *.yaml
+ README.markdown
+ benchmarks/*.cabal
+ benchmarks/*.hs
+ benchmarks/*.py
+ benchmarks/Compare/*.hs
+ benchmarks/Makefile
+ benchmarks/Typed/*.hs
+ benchmarks/json-data/*.json
+ cbits/*.c
+ changelog.md
+ examples/*.cabal
+ examples/*.hs
+ examples/Twitter/*.hs
+ ffi/Data/Aeson/Parser/*.hs
+ include/*.h
+ tests/JSONTestSuite/test_parsing/*.json
+ tests/JSONTestSuite/test_transform/*.json
+ pure/Data/Aeson/Parser/*.hs
+
+flag developer
+ description: operate in developer mode
+ default: False
+ manual: True
+
+flag fast
+ description: compile without optimizations
+ default: False
+ manual: True
+
+flag bytestring-builder
+ description: Depend on the bytestring-builder package for backwards compatibility.
+ default: False
+ manual: False
+
+flag cffi
+ description: Controls whether to include c-ffi bits or pure haskell. Default to False for security.
+ default: False
+ manual: True
+
+library
+ default-language: Haskell2010
+ hs-source-dirs: . attoparsec-iso8601/
+
+ exposed-modules:
+ Data.Aeson
+ Data.Aeson.Encoding
+ Data.Aeson.Parser
+ Data.Aeson.Text
+ Data.Aeson.Types
+ Data.Aeson.TH
+ Data.Aeson.QQ.Simple
+
+ Data.Aeson.Encoding.Internal
+ Data.Aeson.Internal
+ Data.Aeson.Internal.Time
+ Data.Aeson.Parser.Internal
+
+ -- Deprecated modules
+ exposed-modules:
+ Data.Aeson.Encode
+
+ other-modules:
+ Data.Aeson.Compat
+ Data.Aeson.Encoding.Builder
+ Data.Aeson.Internal.Functions
+ Data.Aeson.Parser.Unescape
+ Data.Aeson.Parser.Time
+ Data.Aeson.Types.FromJSON
+ Data.Aeson.Types.Generic
+ Data.Aeson.Types.ToJSON
+ Data.Aeson.Types.Class
+ Data.Aeson.Types.Internal
+ Data.Attoparsec.Time
+ Data.Attoparsec.Time.Internal
+
+ -- GHC bundled libs
+ build-depends:
+ base >= 4.5.0.0 && < 5,
+ containers >= 0.4.2.1 && < 0.7,
+ deepseq >= 1.3.0.0 && < 1.5,
+ ghc-prim >= 0.2 && < 0.6,
+ template-haskell >= 2.7.0.0 && < 2.15,
+ text >= 1.2.3.0 && < 1.3,
+ time >= 1.4 && < 1.9
+
+ -- Compat
+ build-depends:
+ base-compat >= 0.9.1 && < 0.11
+
+ if flag(bytestring-builder)
+ build-depends: bytestring >= 0.9.2 && < 0.10.4,
+ bytestring-builder >= 0.10.4 && < 1
+ else
+ build-depends: bytestring >= 0.10.4 && < 0.11
+
+ if !impl(ghc >= 8.6)
+ build-depends:
+ contravariant >=1.4.1 && <1.6
+
+ if !impl(ghc >= 8.0)
+ -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
+ build-depends:
+ semigroups >= 0.18.5 && < 0.19,
+ transformers >= 0.3.0.0 && < 0.6,
+ transformers-compat >= 0.6.2 && < 0.7,
+ fail == 4.9.*
+
+ if !impl(ghc >= 7.10)
+ -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
+ build-depends: nats >= 1.1.1 && < 1.2,
+ void >= 0.7.2 && < 0.8
+
+ -- cannot use latest version
+ build-depends:
+ unordered-containers >= 0.2.8.0 && < 0.3,
+
+ -- not in LTS-12.10
+ tagged >= 0.8.5 && < 0.9,
+ primitive >= 0.6.3.0 && < 0.7
+
+ -- Other dependencies
+ build-depends:
+ attoparsec >= 0.13.2.2 && < 0.14,
+ dlist >= 0.8.0.4 && < 0.9,
+ hashable >= 1.2.7.0 && < 1.3,
+ scientific >= 0.3.6.2 && < 0.4,
+ th-abstraction >= 0.2.8.0 && < 0.3,
+ time-locale-compat >= 0.1.1.5 && < 0.2,
+ uuid-types >= 1.0.3 && < 1.1,
+ vector >= 0.12.0.1 && < 0.13
+
+ ghc-options: -Wall
+
+ if flag(developer)
+ ghc-options: -Werror
+ ghc-prof-options: -auto-all
+
+ if flag(fast)
+ ghc-options: -O0
+ else
+ ghc-options: -O2
+
+ include-dirs: include
+ if impl(ghcjs) || !flag(cffi)
+ hs-source-dirs: pure
+ other-modules: Data.Aeson.Parser.UnescapePure
+ else
+ c-sources: cbits/unescape_string.c
+ cpp-options: -DCFFI
+ hs-source-dirs: ffi
+ other-modules: Data.Aeson.Parser.UnescapeFFI
+
+test-suite tests
+ default-language: Haskell2010
+ type: exitcode-stdio-1.0
+ hs-source-dirs: tests ffi pure
+ main-is: Tests.hs
+ c-sources: cbits/unescape_string.c
+ ghc-options: -Wall -threaded -rtsopts
+
+ other-modules:
+ Data.Aeson.Parser.UnescapeFFI
+ Data.Aeson.Parser.UnescapePure
+ DataFamilies.Properties
+ DataFamilies.Instances
+ DataFamilies.Encoders
+ DataFamilies.Types
+ Encoders
+ ErrorMessages
+ Functions
+ Instances
+ Options
+ Properties
+ SerializationFormatSpec
+ Types
+ UnitTests
+ UnitTests.NullaryConstructors
+
+ build-depends:
+ QuickCheck >= 2.10.0.1 && < 2.12,
+ aeson,
+ integer-logarithms >= 1 && <1.1,
+ attoparsec,
+ base,
+ base-compat,
+ base-orphans >= 0.5.3 && <0.8,
+ base16-bytestring,
+ containers,
+ directory,
+ dlist,
+ filepath,
+ generic-deriving >= 1.10 && < 1.13,
+ ghc-prim >= 0.2,
+ hashable >= 1.2.4.0,
+ scientific,
+ tagged,
+ template-haskell,
+ tasty,
+ tasty-hunit,
+ tasty-quickcheck,
+ text,
+ time,
+ time-locale-compat,
+ unordered-containers,
+ uuid-types,
+ vector,
+ quickcheck-instances >= 0.3.16
+
+ if flag(bytestring-builder)
+ build-depends: bytestring >= 0.9 && < 0.10.4,
+ bytestring-builder >= 0.10.4 && < 1
+ else
+ build-depends: bytestring >= 0.10.4
+
+ if !impl(ghc >= 8.0)
+ build-depends:
+ semigroups >= 0.18.2 && < 0.19,
+ transformers >= 0.2.2.0,
+ transformers-compat >= 0.3
+
+ if !impl(ghc >= 7.10)
+ build-depends: nats >=1 && <1.2,
+ void >=0.7.2 && <0.8
+
+ if impl(ghc >= 7.8)
+ build-depends: hashable-time >= 0.2 && <0.3
+
+ if flag(fast)
+ ghc-options: -fno-enable-rewrite-rules
+
+source-repository head
+ type: git
+ location: git://github.com/bos/aeson.git
=====================================
additional-cabals/binary-orphans-0.1.8.0.cabal
=====================================
@@ -0,0 +1,83 @@
+name: binary-orphans
+version: 0.1.8.0
+synopsis: Orphan instances for binary
+description: `binary-orphans` defines orphan instances for types in some popular packages.
+category: Web
+homepage: https://github.com/phadej/binary-orphans#readme
+bug-reports: https://github.com/phadej/binary-orphans/issues
+author: Oleg Grenrus <oleg.grenrus at iki.fi>
+maintainer: Oleg Grenrus <oleg.grenrus at iki.fi>
+license: BSD3
+license-file: LICENSE
+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+build-type: Simple
+cabal-version: >= 1.10
+
+extra-source-files:
+ CHANGELOG.md
+ README.md
+
+source-repository head
+ type: git
+ location: https://github.com/phadej/binary-orphans
+
+library
+ hs-source-dirs:
+ src
+ ghc-options: -Wall -fno-warn-orphans
+ build-depends:
+ base >=4.6.0.1 && <4.11
+ , aeson >=0.7.0.6 && <1.3
+ , binary >=0.5.1.1 && <0.8.6 || ==0.9.0.0
+ , case-insensitive >=1.2.0.4 && <1.2.1
+ , hashable >=1.2.3.3 && <1.3
+ , scientific >=0.3.3.8 && <0.4
+ , tagged >=0.7.3 && <0.8.6
+ , text >=1.2.0.6 && <1.3
+ , time >=1.4.0.1 && <1.9
+ , unordered-containers >=0.2.5.1 && <0.3
+ , vector >=0.10.12.3 && <0.13
+ , text-binary >=0.1.0 && <0.3
+ , vector-binary-instances >=0.2.1.0 && <0.3
+ if !impl(ghc >= 8.0)
+ build-depends:
+ semigroups >=0.16.2.2 && <0.18.4
+ if !impl(ghc >= 7.10)
+ build-depends:
+ void >=0.7 && <0.8
+ , nats >=1 && <1.2
+ exposed-modules:
+ Data.Binary.Orphans
+ default-language: Haskell2010
+
+test-suite binary-orphans-test
+ type: exitcode-stdio-1.0
+ main-is: Tests.hs
+ hs-source-dirs:
+ test
+ ghc-options: -Wall -fno-warn-orphans
+ build-depends:
+ base
+ , aeson
+ , binary
+ , case-insensitive
+ , hashable
+ , scientific
+ , tagged
+ , text
+ , time
+ , unordered-containers
+ , vector
+ , binary-orphans
+ , QuickCheck >=2.10 && <2.11
+ , quickcheck-instances >=0.3.16 && <0.4
+ , tasty >=0.10.1.2 && <0.12
+ , tasty-quickcheck >=0.8.3.2 && <0.10
+ if !impl(ghc >= 8.0)
+ build-depends:
+ semigroups >=0.16.2.2 && <0.18.3
+ if !impl(ghc >= 7.10)
+ build-depends:
+ void >=0.7 && <0.8
+ , nats >=1 && <1.2
+ default-language: Haskell2010
=====================================
packages.txt
=====================================
@@ -3,7 +3,7 @@ abstract-par 0.3.3
acid-state 0.14.3 key
active 0.2.0.13
adjunctions 4.4
-aeson 1.4.2.0 notest # aeson-1.3.1.1:test => QuickCheck>=2.10.0.1 && <2.11
+aeson 1.4.2.0
aeson-compat 0.3.9
aeson-extra 0.4.1.1
aeson-pretty 0.8.7
@@ -14,7 +14,7 @@ Allure 0.8.3.0 binary=allure
alsa-core 0.5.0.1
alsa-mixer 0.3.0
annotated-wl-pprint 0.7.0
-ansi-terminal 0.8.2 notest
+ansi-terminal 0.8.2
ansi-wl-pprint 0.6.8.2
appar 0.1.8
arbtt 0.10.2 binary notest key
@@ -45,7 +45,7 @@ basic-prelude 0.7.0
bencode 0.6.0.0
bifunctors 5.5.4
binary-conduit 1.3.1 notest
-binary-orphans 0.1.8.0 notest # BROKEN: LTS 13:
+binary-orphans 0.1.8.0
binary-parsers 0.2.4.0
binary-tagged 0.1.5.2
bindings-DSL 1.0.25
@@ -56,7 +56,7 @@ bitarray 0.0.1.1
blaze-builder 0.4.1.0
blaze-builder-conduit 1.1.0 avoid
blaze-html 0.9.1.1
-blaze-markup 0.8.2.2 notest # BROKEN: LTS 13:
+blaze-markup 0.8.2.2
blaze-svg 0.3.6.1
blaze-textual 0.2.1.0 notest
BlogLiterately 0.8.6.3 key
@@ -98,7 +98,7 @@ case-insensitive 1.2.0.11
cassava 0.5.1.0 notest # cassava-0.5.1.0:test => QuickCheck==2.10.*
cassava-megaparsec 2.0.0
categories 1.0.7 key
-cborg 0.2.1.0 notest # BROKEN: LTS 13:
+cborg 0.2.1.0
cborg-json 0.2.1.0
cereal 0.5.8.1
cereal-conduit 0.8.0
=====================================
patches/aeson/1.4.2.0/newer-deps
=====================================
@@ -0,0 +1,18 @@
+--- a/aeson.cabal
++++ b/aeson.cabal
+@@ -204,13 +204,13 @@
+ UnitTests.NullaryConstructors
+
+ build-depends:
+- QuickCheck >= 2.10.0.1 && < 2.12,
++ QuickCheck >= 2.10.0.1 && < 2.13,
+ aeson,
+ integer-logarithms >= 1 && <1.1,
+ attoparsec,
+ base,
+ base-compat,
+- base-orphans >= 0.5.3 && <0.8,
++ base-orphans >= 0.5.3 && <0.9,
+ base16-bytestring,
+ containers,
+ directory,
=====================================
patches/aeson/1.4.2.0/series
=====================================
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/binary-orphans/0.1.8.0/newer-deps
=====================================
@@ -0,0 +1,69 @@
+--- a/binary-orphans.cabal
++++ b/binary-orphans.cabal
+@@ -9,9 +9,16 @@
+ maintainer: Oleg Grenrus <oleg.grenrus at iki.fi>
+ license: BSD3
+ license-file: LICENSE
+-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
+ build-type: Simple
+ cabal-version: >= 1.10
++tested-with:
++ GHC==7.6.3,
++ GHC==7.8.4,
++ GHC==7.10.3,
++ GHC==8.0.2,
++ GHC==8.2.2,
++ GHC==8.4.3,
++ GHC==8.6.1
+
+ extra-source-files:
+ CHANGELOG.md
+@@ -26,13 +33,13 @@
+ src
+ ghc-options: -Wall -fno-warn-orphans
+ build-depends:
+- base >=4.6.0.1 && <4.11
+- , aeson >=0.7.0.6 && <1.3
+- , binary >=0.5.1.1 && <0.8.6 || ==0.9.0.0
++ base >=4.6.0.1 && <4.13
++ , aeson >=0.7.0.6 && <1.5
++ , binary >=0.5.1.1 && <0.8.7 || ==0.9.0.0 || ==0.10.0.0
+ , case-insensitive >=1.2.0.4 && <1.2.1
+ , hashable >=1.2.3.3 && <1.3
+ , scientific >=0.3.3.8 && <0.4
+- , tagged >=0.7.3 && <0.8.6
++ , tagged >=0.7.3 && <0.8.7
+ , text >=1.2.0.6 && <1.3
+ , time >=1.4.0.1 && <1.9
+ , unordered-containers >=0.2.5.1 && <0.3
+@@ -41,7 +48,7 @@
+ , vector-binary-instances >=0.2.1.0 && <0.3
+ if !impl(ghc >= 8.0)
+ build-depends:
+- semigroups >=0.16.2.2 && <0.18.4
++ semigroups >=0.16.2.2 && <0.18.6
+ if !impl(ghc >= 7.10)
+ build-depends:
+ void >=0.7 && <0.8
+@@ -69,15 +76,15 @@
+ , unordered-containers
+ , vector
+ , binary-orphans
+- , QuickCheck >=2.10 && <2.11
++ , QuickCheck >=2.10 && <2.13
+ , quickcheck-instances >=0.3.16 && <0.4
+- , tasty >=0.10.1.2 && <0.12
+- , tasty-quickcheck >=0.8.3.2 && <0.10
++ , tasty >=0.10.1.2 && <1.3
++ , tasty-quickcheck >=0.8.3.2 && <0.11
+ if !impl(ghc >= 8.0)
+ build-depends:
+- semigroups >=0.16.2.2 && <0.18.3
++ semigroups
+ if !impl(ghc >= 7.10)
+ build-depends:
+- void >=0.7 && <0.8
+- , nats >=1 && <1.2
++ void
++ , nats
+ default-language: Haskell2010
=====================================
patches/binary-orphans/0.1.8.0/series
=====================================
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/blaze-markup/0.8.2.2/newer-deps2
=====================================
@@ -0,0 +1,11 @@
+--- haskell-blaze-markup-0.8.2.2.orig/blaze-markup.cabal
++++ haskell-blaze-markup-0.8.2.2/blaze-markup.cabal
+@@ -61,7 +61,7 @@ Test-suite blaze-markup-tests
+ HUnit >= 1.2 && < 1.7,
+ QuickCheck >= 2.7,
+ containers >= 0.3 && < 0.7,
+- tasty >= 1.0 && < 1.2,
++ tasty >= 1.0 && < 1.3,
+ tasty-hunit >= 0.10 && < 0.11,
+ tasty-quickcheck >= 0.10 && < 0.11,
+ -- Copied from regular dependencies...
=====================================
patches/blaze-markup/0.8.2.2/series
=====================================
@@ -1 +1,2 @@
newer-deps
+newer-deps2
=====================================
patches/cborg/0.2.1.0/fix-x32-build
=====================================
@@ -0,0 +1,13 @@
+https://github.com/well-typed/cborg/commit/bd923f78bb0a2ba3fb1593a4c9267fe4eafe95cd
+
+--- a/src/Codec/CBOR/Magic.hs
++++ b/src/Codec/CBOR/Magic.hs
+@@ -104,7 +104,7 @@
+
+ import qualified Numeric.Half as Half
+
+-#if !defined(HAVE_BYTESWAP_PRIMOPS) || !defined(MEM_UNALIGNED_OPS)
++#if !defined(HAVE_BYTESWAP_PRIMOPS) || !defined(MEM_UNALIGNED_OPS) || !defined(OPTIMIZE_GMP)
+ import Data.Bits ((.|.), unsafeShiftL)
+ #endif
+
=====================================
patches/cborg/0.2.1.0/newer-deps
=====================================
@@ -9,7 +9,7 @@
test-suite tests
type: exitcode-stdio-1.0
-@@ -130,7 +130,6 @@
+@@ -130,11 +130,10 @@
base64-bytestring >= 1.0 && < 1.1,
base16-bytestring >= 0.1 && < 0.2,
deepseq >= 1.0 && < 1.5,
@@ -17,3 +17,8 @@
half >= 0.2.2.3 && < 0.4,
QuickCheck >= 2.9 && < 2.13,
scientific >= 0.3 && < 0.4,
+- tasty >= 0.11 && < 1.2,
++ tasty >= 0.11 && < 1.3,
+ tasty-hunit >= 0.9 && < 0.11,
+ tasty-quickcheck >= 0.8 && < 0.11,
+ vector >= 0.10 && < 0.13
=====================================
patches/cborg/0.2.1.0/series
=====================================
@@ -1 +1,2 @@
newer-deps
+fix-x32-build
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/75866629163a1029825c157ec4e16f4ff6880183...13cdf15ed9df04b6e0eb46c961c3948eea82cb32
--
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/75866629163a1029825c157ec4e16f4ff6880183...13cdf15ed9df04b6e0eb46c961c3948eea82cb32
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/20190901/90932d2e/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list