Skip to content
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
p/haskell-aeson-compat/debian/patches/newer-deps-from-hackage deleted 100644 → 0
View file @ 9cfc5342
--- a/aeson-compat.cabal
+++ b/aeson-compat.cabal
@@ -1,9 +1,6 @@
--- This file has been generated from package.yaml by hpack version 0.14.1.
---
--- see: https://github.com/sol/hpack
-
name: aeson-compat
version: 0.3.6
+x-revision: 6
synopsis: Compatibility layer for aeson
description: Compatibility layer for @aeson@
category: Web
@@ -13,9 +10,13 @@
maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
license: BSD3
license-file: LICENSE
-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.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.1
extra-source-files:
CHANGELOG.md
@@ -32,7 +33,7 @@
build-depends:
base >=4.6 && <4.10
, base-compat >=0.6.0 && <0.10
- , aeson >=0.7.0.6 && <1.1
+ , aeson >=0.7.0.6 && <1.3
, attoparsec >=0.12 && <0.14
, bytestring >=0.10 && <0.11
, containers >=0.5 && <0.6
@@ -44,7 +45,7 @@
, time >=1.4.2 && <1.7
, time-locale-compat >=0.1.0.1 && <0.2
, unordered-containers >=0.2 && <0.3
- , vector >=0.10 && <0.12
+ , vector >=0.10 && <0.13
, semigroups >=0.16.2.2 && <0.19
, tagged >=0.7.3 && <0.9
exposed-modules:
@@ -62,7 +63,7 @@
build-depends:
base >=4.6 && <4.10
, base-compat >=0.6.0 && <0.10
- , aeson >=0.7.0.6 && <1.1
+ , aeson >=0.7.0.6 && <1.3
, attoparsec >=0.12 && <0.14
, bytestring >=0.10 && <0.11
, containers >=0.5 && <0.6
@@ -74,15 +75,15 @@
, time >=1.4.2 && <1.7
, time-locale-compat >=0.1.0.1 && <0.2
, unordered-containers >=0.2 && <0.3
- , vector >=0.10 && <0.12
+ , vector >=0.10 && <0.13
, semigroups >=0.16.2.2 && <0.19
, tagged >=0.7.3 && <0.9
, aeson-compat
- , base-orphans >=0.4.5 && <0.6
+ , base-orphans >=0.4.5 && <0.7
, tasty >=0.10 && <0.12
, tasty-hunit >=0.9 && <0.10
, tasty-quickcheck >=0.8 && <0.9
- , QuickCheck >=2.7.6 && <2.9.2
+ , QuickCheck >=2.7.6 && <2.9.3
, quickcheck-instances >=0.3 && <0.3.13
other-modules:
Orphans
p/haskell-aeson-compat/debian/patches/newer-quickcheck deleted 100644 → 0
View file @ 9cfc5342
--- a/aeson-compat.cabal
+++ b/aeson-compat.cabal
@@ -81,7 +81,7 @@
, tasty >=0.10 && <0.12
, tasty-hunit >=0.9 && <0.10
, tasty-quickcheck >=0.8 && <0.9
- , QuickCheck >=2.7.6 && <2.9.3
+ , QuickCheck >=2.7.6 && <2.10
, quickcheck-instances >=0.3 && <0.3.13
other-modules:
Orphans
p/haskell-aeson-compat/debian/patches/no-nats deleted 100644 → 0
View file @ 9cfc5342
--- a/aeson-compat.cabal
+++ b/aeson-compat.cabal
@@ -39,7 +39,6 @@
, containers >=0.5 && <0.6
, exceptions >=0.8 && <0.9
, hashable >=1.2 && <1.3
- , nats >=1 && <1.2
, scientific >=0.3 && <0.4
, text >=1.2 && <1.3
, time >=1.4.2 && <1.7
@@ -69,7 +68,6 @@
, containers >=0.5 && <0.6
, exceptions >=0.8 && <0.9
, hashable >=1.2 && <1.3
- , nats >=1 && <1.2
, scientific >=0.3 && <0.4
, text >=1.2 && <1.3
, time >=1.4.2 && <1.7
p/haskell-aeson-compat/debian/patches/series deleted 100644 → 0
View file @ 9cfc5342
newer-deps-from-hackage
no-nats
newer-quickcheck
p/haskell-aeson-extra/debian/control
View file @ e4b8a924
......@@ -27,7 +27,7 @@ Build-Depends:
libghc-base-compat-prof,
libghc-exceptions-dev (<< 0.9),
libghc-exceptions-dev (>= 0.8),
libghc-exceptions-prof
libghc-exceptions-prof,
libghc-hashable-dev (<< 1.3),
libghc-hashable-dev (>= 1.2),
libghc-hashable-prof,
......@@ -56,7 +56,7 @@ Build-Depends:
libghc-these-prof,
libghc-unordered-containers-dev (>= 0.2),
libghc-unordered-containers-dev (<< 0.3),
libghc-unordered-containers-prof
libghc-unordered-containers-prof,
libghc-vector-dev (>= 0.10),
libghc-vector-dev (<< 0.13),
libghc-vector-prof,
......
p/haskell-aeson-extra/debian/patches/newer-deps-from-hackage deleted 100644 → 0
View file @ 9cfc5342
Description: Newer dependencies from hackage
Origin: upstream, https://hackage.haskell.org/package/aeson-extra-0.4.0.0/revisions/
---
Index: b/aeson-extra.cabal
===================================================================
--- a/aeson-extra.cabal
+++ b/aeson-extra.cabal
@@ -27,7 +27,7 @@ library
ghc-options: -Wall
build-depends:
base >=4.6 && <4.10
- , aeson >=0.7.0.6 && <1.1
+ , aeson >=0.7.0.6 && <1.3
, aeson-compat >=0.3.0.0 && <0.4
, attoparsec >=0.11.3.4 && <0.14
, base-compat >=0.6.0 && <0.10
@@ -43,7 +43,7 @@ library
, time >=1.4.2 && <1.7
, time-parsers >=0.1.0.0 && <0.2
, unordered-containers >=0.2 && <0.3
- , vector >=0.10 && <0.12
+ , vector >=0.10 && <0.13
if impl(ghc >= 7.8)
exposed-modules:
Data.Aeson.Extra.SingObject
@@ -74,7 +74,7 @@ test-suite aeson-extra-test
, time >=1.4.2 && <1.7
, time-parsers >=0.1.0.0 && <0.2
, unordered-containers >=0.2 && <0.3
- , vector >=0.10 && <0.12
+ , vector >=0.10 && <0.13
, tasty >=0.10 && <0.12
, tasty-hunit >=0.9 && <0.10
, tasty-quickcheck >=0.8 && <0.9
p/haskell-aeson/debian/patches/32bit-fixes.patch deleted 100644 → 0
View file @ 9cfc5342
Origin: https://github.com/bos/aeson/pull/569 https://github.com/bos/aeson/issues/568
Description: this should fix the testsuite issues in 32 bit architectures and big endian ones
--- haskell-aeson-1.0.2.1.orig/tests/UnitTests.hs
+++ haskell-aeson-1.0.2.1/tests/UnitTests.hs
@@ -29,6 +29,7 @@ import Data.Aeson.Text (encodeToTextBuil
import Data.Aeson.Types (Options(..), SumEncoding(..), ToJSON(..), Value, camelTo, camelTo2, defaultOptions, omitNothingFields)
import Data.Char (toUpper)
import Data.Fixed (Pico)
+import Data.Foldable (for_, toList)
import Data.Functor.Compose (Compose(..))
import Data.Functor.Identity (Identity(..))
import Data.Functor.Product (Product(..))
@@ -280,34 +281,49 @@ dotColonMark = [
data Example where
Example
:: (Eq a, Show a, ToJSON a, FromJSON a)
- => String -> L.ByteString -> a -> Example
+ => String -> [L.ByteString] -> a -> Example -- empty bytestring will fail, any p [] == False
MaybeExample
:: (Eq a, Show a, FromJSON a)
=> String -> L.ByteString -> Maybe a -> Example
+
+example :: (Eq a, Show a, ToJSON a, FromJSON a)
+ => String -> L.ByteString -> a -> Example
+example n bs x = Example n [bs] x
+
assertJsonExample :: Example -> Test
-assertJsonExample (Example name bs val) = testCase name $ do
- assertEqual "encode" bs (encode val)
- assertEqual "encode/via value" bs (encode $ toJSON val)
- assertEqual "decode" (Just val) (decode bs)
+assertJsonExample (Example name bss val) = testCase name $ do
+ assertSomeEqual "encode" bss (encode val)
+ assertSomeEqual "encode/via value" bss (encode $ toJSON val)
+ for_ bss $ \bs ->
+ assertEqual "decode" (Just val) (decode bs)
assertJsonExample (MaybeExample name bs mval) = testCase name $
assertEqual "decode" mval (decode bs)
assertJsonEncodingExample :: Example -> Test
-assertJsonEncodingExample (Example name bs val) = testCase name $ do
- assertEqual "encode" bs (encode val)
- assertEqual "encode/via value" bs (encode $ toJSON val)
+assertJsonEncodingExample (Example name bss val) = testCase name $ do
+ assertSomeEqual "encode" bss (encode val)
+ assertSomeEqual "encode/via value" bss (encode $ toJSON val)
assertJsonEncodingExample (MaybeExample name _ _) = testCase name $
assertFailure "cannot encode MaybeExample"
+
+assertSomeEqual :: (Eq a, Show a, Foldable f) => String -> f a -> a -> IO ()
+assertSomeEqual preface expected actual
+ | elem actual expected = return ()
+ | otherwise = assertFailure $ preface
+ ++ ": expecting one of " ++ show (toList expected)
+ ++ ", got " ++ show actual
+
+
jsonEncodingExamples :: [Example]
jsonEncodingExamples =
[
-- Maybe serialising is lossy
-- https://github.com/bos/aeson/issues/376
- Example "Just Nothing" "null" (Just Nothing :: Maybe (Maybe Int))
+ example "Just Nothing" "null" (Just Nothing :: Maybe (Maybe Int))
-- infinities cannot be recovered, null is decoded as NaN
- , Example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
+ , example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
]
jsonDecodingExamples :: [Example]
@@ -329,113 +345,125 @@ jsonDecodingExamples = [
jsonExamples :: [Example]
jsonExamples =
[
- Example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
- , Example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
- , Example "Nothing" "null" (Nothing :: Maybe Int)
- , Example "Just" "1" (Just 1 :: Maybe Int)
- , Example "Proxy Int" "null" (Proxy :: Proxy Int)
- , Example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
+ example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
+ , example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
+ , example "Nothing" "null" (Nothing :: Maybe Int)
+ , example "Just" "1" (Just 1 :: Maybe Int)
+ , example "Proxy Int" "null" (Proxy :: Proxy Int)
+ , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
#if __GLASGOW_HASKELL__ >= 708
-- Test Tagged instance is polykinded
- , Example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)
+ , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)
#endif
- , Example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
- , Example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
- , Example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
- , Example "Seq" "[1,2,3]" (Seq.fromList [1, 2, 3] :: Seq.Seq Int)
- , Example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
- , Example "()" "[]" ()
-
- , Example "HashMap Int Int" "{\"0\":1,\"2\":3}" (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
- , Example "Map Int Int" "{\"0\":1,\"2\":3}" (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
- , Example "Map (Tagged Int Int) Int" "{\"0\":1,\"2\":3}" (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int Int) Int)
- , Example "Map [Int] Int" "[[[0],1],[[2],3]]" (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
- , Example "Map [Char] Int" "{\"ab\":1,\"cd\":3}" (M.fromList [("ab",1),("cd",3)] :: M.Map [Char] Int)
- , Example "Map [I Char] Int" "{\"ab\":1,\"cd\":3}" (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] Int)
-
- , Example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
-
- , Example "Ordering LT" "\"LT\"" LT
- , Example "Ordering EQ" "\"EQ\"" EQ
- , Example "Ordering GT" "\"GT\"" GT
-
- , Example "Float" "3.14" (3.14 :: Float)
- , Example "Pico" "3.14" (3.14 :: Pico)
- , Example "Scientific" "3.14" (3.14 :: Scientific)
-
- , Example "Set Int" "[1,2,3]" (Set.fromList [3, 2, 1] :: Set.Set Int)
- , Example "IntSet" "[1,2,3]" (IntSet.fromList [3, 2, 1])
- , Example "IntMap" "[[1,2],[3,4]]" (IntMap.fromList [(3,4), (1,2)] :: IntMap.IntMap Int)
- , Example "Vector" "[1,2,3]" (Vector.fromList [1, 2, 3] :: Vector.Vector Int)
- , Example "HashSet Int" "[1,2,3]" (HashSet.fromList [3, 2, 1] :: HashSet.HashSet Int)
- , Example "Tree Int" "[1,[[2,[[3,[]],[4,[]]]],[5,[]]]]" (let n = Tree.Node in n 1 [n 2 [n 3 [], n 4 []], n 5 []] :: Tree.Tree Int)
+ , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
+ , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
+ , example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
+ , example "Seq" "[1,2,3]" (Seq.fromList [1, 2, 3] :: Seq.Seq Int)
+ , example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
+ , example "()" "[]" ()
+
+ , Example "HashMap Int Int"
+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
+ (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
+ , Example "Map Int Int"
+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
+ (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
+ , Example "Map (Tagged Int Int) Int"
+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
+ (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int Int) Int)
+ , example "Map [Int] Int"
+ "[[[0],1],[[2],3]]"
+ (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
+ , Example "Map [Char] Int"
+ [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
+ (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
+ , Example "Map [I Char] Int"
+ [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
+ (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] Int)
+
+ , example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
+
+ , example "Ordering LT" "\"LT\"" LT
+ , example "Ordering EQ" "\"EQ\"" EQ
+ , example "Ordering GT" "\"GT\"" GT
+
+ , example "Float" "3.14" (3.14 :: Float)
+ , example "Pico" "3.14" (3.14 :: Pico)
+ , example "Scientific" "3.14" (3.14 :: Scientific)
+
+ , example "Set Int" "[1,2,3]" (Set.fromList [3, 2, 1] :: Set.Set Int)
+ , example "IntSet" "[1,2,3]" (IntSet.fromList [3, 2, 1])
+ , example "IntMap" "[[1,2],[3,4]]" (IntMap.fromList [(3,4), (1,2)] :: IntMap.IntMap Int)
+ , example "Vector" "[1,2,3]" (Vector.fromList [1, 2, 3] :: Vector.Vector Int)
+ , example "HashSet Int" "[1,2,3]" (HashSet.fromList [3, 2, 1] :: HashSet.HashSet Int)
+ , example "Tree Int" "[1,[[2,[[3,[]],[4,[]]]],[5,[]]]]" (let n = Tree.Node in n 1 [n 2 [n 3 [], n 4 []], n 5 []] :: Tree.Tree Int)
-- Three separate cases, as ordering in HashMap is not defined
- , Example "HashMap Float Int, NaN" "{\"NaN\":1}" (Approx $ HM.singleton (0/0) 1 :: Approx (HM.HashMap Float Int))
- , Example "HashMap Float Int, Infinity" "{\"Infinity\":1}" (HM.singleton (1/0) 1 :: HM.HashMap Float Int)
- , Example "HashMap Float Int, +Infinity" "{\"-Infinity\":1}" (HM.singleton (negate 1/0) 1 :: HM.HashMap Float Int)
+ , example "HashMap Float Int, NaN" "{\"NaN\":1}" (Approx $ HM.singleton (0/0) 1 :: Approx (HM.HashMap Float Int))
+ , example "HashMap Float Int, Infinity" "{\"Infinity\":1}" (HM.singleton (1/0) 1 :: HM.HashMap Float Int)
+ , example "HashMap Float Int, +Infinity" "{\"-Infinity\":1}" (HM.singleton (negate 1/0) 1 :: HM.HashMap Float Int)
-- Functors
- , Example "Identity Int" "1" (pure 1 :: Identity Int)
+ , example "Identity Int" "1" (pure 1 :: Identity Int)
- , Example "Identity Char" "\"x\"" (pure 'x' :: Identity Char)
- , Example "Identity String" "\"foo\"" (pure "foo" :: Identity String)
- , Example "[Identity Char]" "\"xy\"" ([pure 'x', pure 'y'] :: [Identity Char])
-
- , Example "Maybe Char" "\"x\"" (pure 'x' :: Maybe Char)
- , Example "Maybe String" "\"foo\"" (pure "foo" :: Maybe String)
- , Example "Maybe [Identity Char]" "\"xy\"" (pure [pure 'x', pure 'y'] :: Maybe [Identity Char])
-
- , Example "Product I Maybe Int" "[1,2]" (Pair (pure 1) (pure 2) :: Product I Maybe Int)
- , Example "Product I Maybe Int" "[1,null]" (Pair (pure 1) Nothing :: Product I Maybe Int)
- , Example "Product I [] Char" "[\"a\",\"foo\"]" (Pair (pure 'a') "foo" :: Product I [] Char)
-
- , Example "Sum I [] Int: InL" "{\"InL\":1}" (InL (pure 1) :: Sum I [] Int)
- , Example "Sum I [] Int: InR" "{\"InR\":[1,2]}" (InR [1, 2] :: Sum I [] Int)
- , Example "Sum I [] Char: InR" "{\"InR\":\"foo\"}" (InR "foo" :: Sum I [] Char)
-
- , Example "Compose I I Int" "1" (pure 1 :: Compose I I Int)
- , Example "Compose I [] Int" "[1]" (pure 1 :: Compose I [] Int)
- , Example "Compose [] I Int" "[1]" (pure 1 :: Compose [] I Int)
- , Example "Compose [] [] Int" "[[1]]" (pure 1 :: Compose [] [] Int)
-
- , Example "Compose I I Char" "\"x\"" (pure 'x' :: Compose I I Char)
- , Example "Compose I [] Char" "\"x\"" (pure 'x' :: Compose I [] Char)
- , Example "Compose [] I Char" "\"x\"" (pure 'x' :: Compose [] I Char)
- , Example "Compose [] [] Char" "[\"x\"]" (pure 'x' :: Compose [] [] Char)
-
- , Example "Compose3 I I I Char" "\"x\"" (pure 'x' :: Compose3 I I I Char)
- , Example "Compose3 I I [] Char" "\"x\"" (pure 'x' :: Compose3 I I [] Char)
- , Example "Compose3 I [] I Char" "\"x\"" (pure 'x' :: Compose3 I [] I Char)
- , Example "Compose3 I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3 I [] [] Char)
- , Example "Compose3 [] I I Char" "\"x\"" (pure 'x' :: Compose3 [] I I Char)
- , Example "Compose3 [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3 [] I [] Char)
- , Example "Compose3 [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3 [] [] I Char)
- , Example "Compose3 [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3 [] [] [] Char)
-
- , Example "Compose3' I I I Char" "\"x\"" (pure 'x' :: Compose3' I I I Char)
- , Example "Compose3' I I [] Char" "\"x\"" (pure 'x' :: Compose3' I I [] Char)
- , Example "Compose3' I [] I Char" "\"x\"" (pure 'x' :: Compose3' I [] I Char)
- , Example "Compose3' I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3' I [] [] Char)
- , Example "Compose3' [] I I Char" "\"x\"" (pure 'x' :: Compose3' [] I I Char)
- , Example "Compose3' [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3' [] I [] Char)
- , Example "Compose3' [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3' [] [] I Char)
- , Example "Compose3' [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3' [] [] [] Char)
+ , example "Identity Char" "\"x\"" (pure 'x' :: Identity Char)
+ , example "Identity String" "\"foo\"" (pure "foo" :: Identity String)
+ , example "[Identity Char]" "\"xy\"" ([pure 'x', pure 'y'] :: [Identity Char])
+
+ , example "Maybe Char" "\"x\"" (pure 'x' :: Maybe Char)
+ , example "Maybe String" "\"foo\"" (pure "foo" :: Maybe String)
+ , example "Maybe [Identity Char]" "\"xy\"" (pure [pure 'x', pure 'y'] :: Maybe [Identity Char])
+
+ , example "Product I Maybe Int" "[1,2]" (Pair (pure 1) (pure 2) :: Product I Maybe Int)
+ , example "Product I Maybe Int" "[1,null]" (Pair (pure 1) Nothing :: Product I Maybe Int)
+ , example "Product I [] Char" "[\"a\",\"foo\"]" (Pair (pure 'a') "foo" :: Product I [] Char)
+
+ , example "Sum I [] Int: InL" "{\"InL\":1}" (InL (pure 1) :: Sum I [] Int)
+ , example "Sum I [] Int: InR" "{\"InR\":[1,2]}" (InR [1, 2] :: Sum I [] Int)
+ , example "Sum I [] Char: InR" "{\"InR\":\"foo\"}" (InR "foo" :: Sum I [] Char)
+
+ , example "Compose I I Int" "1" (pure 1 :: Compose I I Int)
+ , example "Compose I [] Int" "[1]" (pure 1 :: Compose I [] Int)
+ , example "Compose [] I Int" "[1]" (pure 1 :: Compose [] I Int)
+ , example "Compose [] [] Int" "[[1]]" (pure 1 :: Compose [] [] Int)
+
+ , example "Compose I I Char" "\"x\"" (pure 'x' :: Compose I I Char)
+ , example "Compose I [] Char" "\"x\"" (pure 'x' :: Compose I [] Char)
+ , example "Compose [] I Char" "\"x\"" (pure 'x' :: Compose [] I Char)
+ , example "Compose [] [] Char" "[\"x\"]" (pure 'x' :: Compose [] [] Char)
+
+ , example "Compose3 I I I Char" "\"x\"" (pure 'x' :: Compose3 I I I Char)
+ , example "Compose3 I I [] Char" "\"x\"" (pure 'x' :: Compose3 I I [] Char)
+ , example "Compose3 I [] I Char" "\"x\"" (pure 'x' :: Compose3 I [] I Char)
+ , example "Compose3 I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3 I [] [] Char)
+ , example "Compose3 [] I I Char" "\"x\"" (pure 'x' :: Compose3 [] I I Char)
+ , example "Compose3 [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3 [] I [] Char)
+ , example "Compose3 [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3 [] [] I Char)
+ , example "Compose3 [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3 [] [] [] Char)
+
+ , example "Compose3' I I I Char" "\"x\"" (pure 'x' :: Compose3' I I I Char)
+ , example "Compose3' I I [] Char" "\"x\"" (pure 'x' :: Compose3' I I [] Char)
+ , example "Compose3' I [] I Char" "\"x\"" (pure 'x' :: Compose3' I [] I Char)
+ , example "Compose3' I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3' I [] [] Char)
+ , example "Compose3' [] I I Char" "\"x\"" (pure 'x' :: Compose3' [] I I Char)
+ , example "Compose3' [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3' [] I [] Char)
+ , example "Compose3' [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3' [] [] I Char)
+ , example "Compose3' [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3' [] [] [] Char)
- , Example "MyEither Int String: Left" "42" (MyLeft 42 :: MyEither Int String)
- , Example "MyEither Int String: Right" "\"foo\"" (MyRight "foo" :: MyEither Int String)
+ , example "MyEither Int String: Left" "42" (MyLeft 42 :: MyEither Int String)
+ , example "MyEither Int String: Right" "\"foo\"" (MyRight "foo" :: MyEither Int String)
-- newtypes from Monoid/Semigroup
- , Example "Monoid.Dual Int" "2" (pure 2 :: Monoid.Dual Int)
- , Example "Monoid.First Int" "2" (pure 2 :: Monoid.First Int)
- , Example "Monoid.Last Int" "2" (pure 2 :: Monoid.Last Int)
- , Example "Semigroup.Min Int" "2" (pure 2 :: Semigroup.Min Int)
- , Example "Semigroup.Max Int" "2" (pure 2 :: Semigroup.Max Int)
- , Example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
- , Example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
- , Example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
- , Example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
- , Example "Semigroup.Option Nothing" "null" (Semigroup.Option (Nothing :: Maybe Bool))
+ , example "Monoid.Dual Int" "2" (pure 2 :: Monoid.Dual Int)
+ , example "Monoid.First Int" "2" (pure 2 :: Monoid.First Int)
+ , example "Monoid.Last Int" "2" (pure 2 :: Monoid.Last Int)
+ , example "Semigroup.Min Int" "2" (pure 2 :: Semigroup.Min Int)
+ , example "Semigroup.Max Int" "2" (pure 2 :: Semigroup.Max Int)
+ , example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
+ , example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
+ , example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
+ , example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
+ , example "Semigroup.Option Nothing" "null" (Semigroup.Option (Nothing :: Maybe Bool))
]
p/haskell-aeson/debian/patches/series deleted 100644 → 0
View file @ 9cfc5342
th-option.diff
threaded-option.diff
p/haskell-aeson/debian/patches/th-option.diff deleted 100644 → 0
View file @ 9cfc5342
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -78,6 +78,10 @@ flag cffi
default: True
manual: True
+flag th
+ description: build TH bits
+ default: True
+
library
default-language: Haskell2010
hs-source-dirs: .
@@ -88,12 +92,14 @@ library
Data.Aeson.Parser
Data.Aeson.Text
Data.Aeson.Types
- Data.Aeson.TH
Data.Aeson.Encoding.Internal
Data.Aeson.Internal
Data.Aeson.Internal.Time
+ if flag(th)
+ exposed-modules: Data.Aeson.TH
+
-- Deprecated modules
exposed-modules:
Data.Aeson.Encode
p/haskell-aeson/debian/patches/threaded-option.diff deleted 100644 → 0
View file @ 9cfc5342
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -82,6 +82,10 @@ flag th
description: build TH bits
default: True
+flag threaded
+ description: build threaded
+ default: True
+
library
default-language: Haskell2010
hs-source-dirs: .
@@ -174,6 +178,10 @@ library
hs-source-dirs: ffi
other-modules: Data.Aeson.Parser.UnescapeFFI
+ if flag(threaded)
+ ghc-options: -threaded
+
+
test-suite tests
default-language: Haskell2010
type: exitcode-stdio-1.0
p/haskell-attoparsec/debian/patches/no-fail deleted 100644 → 0
View file @ 9cfc5342
--- a/attoparsec.cabal
+++ b/attoparsec.cabal
@@ -52,8 +52,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
+ build-depends: semigroups >=0.16.1 && <0.19
exposed-modules: Data.Attoparsec
Data.Attoparsec.ByteString
@@ -120,8 +119,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
+ build-depends: semigroups >=0.16.1 && <0.19
benchmark benchmarks
type: exitcode-stdio-1.0
@@ -166,8 +164,7 @@ benchmark benchmarks
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
+ build-depends: semigroups >=0.16.1 && <0.19
source-repository head
type: git
p/haskell-attoparsec/debian/patches/no-threaded-testsuite
View file @ e4b8a924
......@@ -3,8 +3,8 @@ Author: Joachim Breitner <nomeata@debian.org>
--- a/attoparsec.cabal
+++ b/attoparsec.cabal
@@ -99,7 +99,7 @@
QC.Text.Regressions
@@ -117,7 +117,7 @@
Data.Attoparsec.Zepto
ghc-options:
- -Wall -threaded -rtsopts
......
p/haskell-aws/debian/patches/newer-xml-conduit deleted 100644 → 0
View file @ 9cfc5342
Description: Support newer version of xml-conduit
Origin: upstream, https://hackage.haskell.org/package/aws-0.16/revisions/
---
Index: b/aws.cabal
===================================================================
--- a/aws.cabal
+++ b/aws.cabal
@@ -145,7 +145,7 @@ Library
unordered-containers >= 0.2,
utf8-string >= 0.3 && < 1.1,
vector >= 0.10,
- xml-conduit >= 1.2 && <1.5
+ xml-conduit >= 1.2 && <1.6
if !impl(ghc >= 7.6)
Build-depends: ghc-prim
p/haskell-binary-orphans/debian/patches/bump-semigroup-bounds.patch deleted 100644 → 0
View file @ 9cfc5342
--- haskell-binary-orphans-0.1.6.0.orig/binary-orphans.cabal
+++ haskell-binary-orphans-0.1.6.0/binary-orphans.cabal
@@ -41,7 +41,7 @@ library
, vector-binary-instances >=0.2.1.0 && <0.3
if !impl(ghc >= 8.0)
build-depends:
- semigroups >=0.16.2.2 && <0.18.3
+ semigroups >=0.16.2.2 && <0.18.4
if !impl(ghc >= 7.10)
build-depends:
void >=0.7 && <0.8
p/haskell-binary-orphans/debian/patches/newer-aeson deleted 100644 → 0
View file @ 9cfc5342
--- a/binary-orphans.cabal
+++ b/binary-orphans.cabal
@@ -27,8 +27,8 @@
ghc-options: -Wall -fno-warn-orphans
build-depends:
base >=4.6.0.1 && <4.10
- , aeson >=0.7.0.6 && <1.2
- , binary >=0.5.1.1 && <0.8.5
+ , aeson >=0.7.0.6 && <1.3
+ , binary >=0.5.1.1 && <0.8.6
, case-insensitive >=1.2.0.4 && <1.2.1
, hashable >=1.2.3.3 && <1.3
, scientific >=0.3.3.8 && <0.4
p/haskell-binary-orphans/debian/patches/series deleted 100644 → 0
View file @ 9cfc5342
newer-aeson
bump-semigroup-bounds.patch
p/haskell-tree-monad/debian/files deleted 100644 → 0
View file @ 9cfc5342
haskell-tree-monad_0.3-1_source.buildinfo haskell optional