[Git][haskell-team/package-plan][master] 2 commits: aeson-extra patches
Clint Adams
gitlab at salsa.debian.org
Tue Apr 17 01:20:10 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
fdd48a51 by Clint Adams at 2018-04-16T19:50:27-04:00
aeson-extra patches
- - - - -
e65c904d by Clint Adams at 2018-04-16T20:20:00-04:00
more patches
- - - - -
12 changed files:
- + additional-cabals/aeson-extra-0.4.1.0.cabal
- + additional-cabals/diagrams-cairo-1.4.cabal
- + additional-cabals/uuid-1.3.13.cabal
- packages.txt
- + patches/aeson-extra/0.4.1.0/newer-deps
- + patches/aeson-extra/0.4.1.0/series
- + patches/diagrams-cairo/1.4/newer-deps
- + patches/diagrams-cairo/1.4/series
- + patches/diagrams-svg/1.4.1.1/newer-lens
- + patches/diagrams-svg/1.4.1.1/series
- + patches/uuid/1.3.13/newer-deps
- + patches/uuid/1.3.13/series
Changes:
=====================================
additional-cabals/aeson-extra-0.4.1.0.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/aeson-extra-0.4.1.0.cabal
@@ -0,0 +1,87 @@
+name: aeson-extra
+version: 0.4.1.0
+synopsis: Extra goodies for aeson
+description: Package provides extra funcitonality on top of @aeson@ and @aeson-compat@
+category: Web
+homepage: https://github.com/phadej/aeson-extra#readme
+bug-reports: https://github.com/phadej/aeson-extra/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/aeson-extra
+
+library
+ hs-source-dirs:
+ src
+ ghc-options: -Wall
+ build-depends:
+ base >=4.6 && <4.11
+ , aeson >=0.7.0.6 && <1.3
+ , aeson-compat >=0.3.0.0 && <0.4
+ , attoparsec >=0.11.3.4 && <0.14
+ , attoparsec-iso8601 >=1.0 && <1.1
+ , base-compat >=0.6.0 && <0.10
+ , bytestring >=0.10 && <0.11
+ , containers >=0.5 && <0.6
+ , deepseq >=1.3 && <1.5
+ , exceptions >=0.8 && <0.9
+ , hashable >=1.2 && <1.3
+ , parsec >=3.1.9 && <3.2
+ , recursion-schemes >=4.1.2 && <5.1
+ , scientific >=0.3 && <0.4
+ , template-haskell >=2.8 && <2.13
+ , text >=1.2 && <1.3
+ , these >=0.7.4 && <0.8
+ , time >=1.4.0.1 && <1.9
+ , unordered-containers >=0.2 && <0.3
+ , vector >=0.10 && <0.13
+ if impl(ghc >= 7.8)
+ exposed-modules:
+ Data.Aeson.Extra.SingObject
+ Data.Aeson.Extra.SymTag
+ exposed-modules:
+ Data.Aeson.Extra
+ Data.Aeson.Extra.CollapsedList
+ Data.Aeson.Extra.Foldable
+ Data.Aeson.Extra.Map
+ Data.Aeson.Extra.Merge
+ Data.Aeson.Extra.Recursive
+ Data.Aeson.Extra.Stream
+ Data.Aeson.Extra.TH
+ Data.Aeson.Extra.Time
+
+ default-language: Haskell2010
+
+test-suite aeson-extra-test
+ type: exitcode-stdio-1.0
+ main-is: Tests.hs
+ hs-source-dirs:
+ test
+ ghc-options: -Wall
+ build-depends:
+ base
+ , aeson-extra
+ , containers
+ , these
+ , time
+ , unordered-containers
+ , vector
+ , time-parsers >=0.1.0.0 && <0.2
+ , tasty >=0.10 && <0.12
+ , tasty-hunit >=0.9 && <0.10
+ , tasty-quickcheck >=0.8 && <0.10
+ , quickcheck-instances >=0.3 && <0.4
+ other-modules:
+ Orphans
+ default-language: Haskell2010
=====================================
additional-cabals/diagrams-cairo-1.4.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/diagrams-cairo-1.4.cabal
@@ -0,0 +1,83 @@
+Name: diagrams-cairo
+Version: 1.4
+Synopsis: Cairo backend for diagrams drawing EDSL
+Description: A full-featured backend for rendering
+ diagrams using the cairo rendering engine.
+ .
+ This ultimately depends on a C library, via
+ Haskell's FFI, and can be difficult to install on
+ some platforms. If you are just looking for a
+ quick way to visualize diagrams, try the
+ diagrams-svg backend; if you want raster output
+ like PNG, try the diagrams-rasterific backend; if
+ you want to embed diagrams in LaTeX documents,
+ try diagrams-pgf.
+ .
+ * "Diagrams.Backend.Cairo.CmdLine" - if you're
+ just getting started with diagrams, begin here.
+ .
+ * "Diagrams.Backend.Cairo" - look at this next.
+ The general API for the cairo backend.
+ .
+ * "Diagrams.Backend.Cairo.Internal" - the
+ implementation guts of the cairo backend.
+ Users should normally not need to import this
+ module.
+ .
+ * "Diagrams.Backend.Cairo.List" - render diagrams
+ to two-dimensional lists of colors (/i.e./
+ pixels).
+ .
+ * "Diagrams.Backend.Cairo.Ptr" - render diagrams
+ to buffers in memory.
+Homepage: http://projects.haskell.org/diagrams
+License: BSD3
+License-file: LICENSE
+Author: Brent Yorgey
+Maintainer: diagrams-discuss at googlegroups.com
+Bug-reports: http://github.com/diagrams/diagrams-cairo/issues
+Category: Graphics
+Build-type: Simple
+Cabal-version: >=1.10
+Extra-source-files: CHANGELOG.md, README.markdown
+Tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1
+Source-repository head
+ type: git
+ location: http://github.com/diagrams/diagrams-cairo.git
+
+Library
+ Exposed-modules: Diagrams.Backend.Cairo
+ Diagrams.Backend.Cairo.CmdLine
+ Diagrams.Backend.Cairo.Internal
+ Diagrams.Backend.Cairo.List
+ Diagrams.Backend.Cairo.Ptr
+ Diagrams.Backend.Cairo.Text
+ Hs-source-dirs: src
+ Build-depends: base >= 4.2 && < 4.10,
+ mtl >= 2.0 && < 2.3,
+ filepath,
+ diagrams-core >= 1.3 && < 1.5,
+ diagrams-lib >= 1.3 && < 1.5,
+ cairo >= 0.12.4 && < 0.14,
+ pango >= 0.12.5 && < 0.14,
+ colour,
+ split >= 0.1.2 && < 0.3,
+ containers >= 0.3 && < 0.6,
+ lens >= 3.8 && < 4.16,
+ data-default-class >= 0.0.1 && < 0.2,
+ statestack >= 0.2 && < 0.3,
+ JuicyPixels >= 3.1.3.2 && < 3.3,
+ vector >= 0.10.0 && < 0.12,
+ array >= 0.4.0 && < 0.6,
+ bytestring >= 0.9 && < 0.11,
+ optparse-applicative >= 0.13 && < 0.14,
+ transformers >= 0.3 && <0.6,
+ hashable >= 1.1 && < 1.3
+ if impl(ghc < 7.6)
+ Build-depends: ghc-prim
+
+ default-language: Haskell2010
+
+ if !os(windows)
+ cpp-options: -DCMDLINELOOP
+ Build-depends: unix >= 2.4 && < 2.8
=====================================
additional-cabals/uuid-1.3.13.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/uuid-1.3.13.cabal
@@ -0,0 +1,90 @@
+Name: uuid
+Version: 1.3.13
+Copyright: (c) 2008-2014 Antoine Latter
+Author: Antoine Latter
+Maintainer: hvr at gnu.org
+License: BSD3
+License-file: LICENSE
+Category: Data
+Build-Type: Simple
+Cabal-Version: >= 1.10
+Tested-With: GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
+
+Synopsis: For creating, comparing, parsing and printing Universally Unique Identifiers
+Description:
+ This library is useful for creating, comparing, parsing and
+ printing Universally Unique Identifiers.
+ .
+ See <http://en.wikipedia.org/wiki/UUID> for the general idea.
+
+Homepage: https://github.com/hvr/uuid
+Bug-Reports: https://github.com/hvr/uuid/issues
+
+Extra-Source-Files:
+ CHANGES.md
+
+Source-Repository head
+ Type: git
+ Location: https://github.com/hvr/uuid.git
+ Subdir: uuid
+
+Library
+ Build-Depends: base >= 4.3 && < 5,
+ binary >= 0.4 && < 0.9,
+ bytestring >= 0.10 && < 0.11,
+ cryptohash-sha1 >= 0.11.100 && < 0.12,
+ cryptohash-md5 >= 0.11.100 && < 0.12,
+ entropy >= 0.3.7 && < 0.4,
+ network-info == 0.2.*,
+ random >= 1.0.1 && < 1.2,
+ time >= 1.1 && < 1.8,
+ text >= 1 && < 1.3,
+ uuid-types >= 1.0.2 && < 2
+
+ Exposed-Modules:
+ Data.UUID
+ Data.UUID.Util
+ Data.UUID.V1
+ Data.UUID.V3
+ Data.UUID.V4
+ Data.UUID.V5
+
+ Other-Modules:
+ Data.UUID.Named
+ Data.Word.Util
+
+ Default-Language: Haskell2010
+ Default-Extensions: DeriveDataTypeable
+ Other-Extensions: TypeFamilies
+ Ghc-Options: -Wall
+
+Test-Suite testuuid
+ Type: exitcode-stdio-1.0
+ Main-is: TestUUID.hs
+ Hs-source-dirs: tests
+ Default-Language: Haskell2010
+ Default-Extensions: DeriveDataTypeable
+ Other-Extensions: ViewPatterns
+ Ghc-Options: -Wall -fno-warn-orphans
+ Build-Depends: uuid
+ Build-Depends: base >= 4.3 && < 5,
+ bytestring >= 0.9 && < 0.11,
+ HUnit >= 1.2 && < 1.4,
+ QuickCheck >= 2.4 && < 2.10,
+ random >= 1.0.1 && < 1.2,
+ tasty >= 0.10 && < 0.12,
+ tasty-hunit == 0.9.*,
+ tasty-quickcheck == 0.8.*
+
+benchmark benchmark
+ Type: exitcode-stdio-1.0
+ Main-is: BenchUUID.hs
+ Hs-source-dirs: tests
+ Default-Language: Haskell2010
+ Default-Extensions: DeriveDataTypeable, CPP
+ Ghc-Options: -Wall -fno-warn-orphans
+ Build-Depends: uuid
+ Build-Depends: base >= 4.3 && < 5,
+ criterion >= 0.4 && < 1.2,
+ mersenne-random-pure64 >= 0.2 && < 0.3,
+ random >= 1.0.1 && < 1.2
=====================================
packages.txt
=====================================
--- a/packages.txt
+++ b/packages.txt
@@ -201,12 +201,12 @@ derive 2.6.3 ignore # BROKEN: LTS 11: newer haskell-src-exts
deriving-compat 0.4.1
descriptive 0.9.4 # dep of structured-haskell-mode, by Thomas Koch
diagrams 1.4 binary=libghc-diagrams-dev ignore # hand-created meta package, does not yet pull in diagrams-contrib
-diagrams-cairo 1.4 ignore # BROKEN: LTS 11: newer lens
-diagrams-core 1.4.0.1 ignore # BROKEN: LTS 11: newer lens
-diagrams-gtk 1.4 ignore # BROKEN: LTS 11: newer lens
-diagrams-lib 1.4.2 ignore # BROKEN: LTS 11: newer lens
-diagrams-solve 0.1.1 ignore # BROKEN: LTS 11: newer lens
-diagrams-svg 1.4.1.1 ignore # BROKEN: LTS 11: newer lens
+diagrams-cairo 1.4
+diagrams-core 1.4.1
+diagrams-gtk 1.4
+diagrams-lib 1.4.2.1
+diagrams-solve 0.1.1
+diagrams-svg 1.4.1.1
dice 0.1
dice-entropy-conduit 1.0.0.1
Diff 0.3.4
=====================================
patches/aeson-extra/0.4.1.0/newer-deps
=====================================
--- /dev/null
+++ b/patches/aeson-extra/0.4.1.0/newer-deps
@@ -0,0 +1,13 @@
+--- a/aeson-extra.cabal
++++ b/aeson-extra.cabal
+@@ -78,8 +78,8 @@
+ , unordered-containers
+ , vector
+ , time-parsers >=0.1.0.0 && <0.2
+- , tasty >=0.10 && <0.12
+- , tasty-hunit >=0.9 && <0.10
++ , tasty >=0.10 && <1.1
++ , tasty-hunit >=0.9 && <0.11
+ , tasty-quickcheck >=0.8 && <0.10
+ , quickcheck-instances >=0.3 && <0.4
+ other-modules:
=====================================
patches/aeson-extra/0.4.1.0/series
=====================================
--- /dev/null
+++ b/patches/aeson-extra/0.4.1.0/series
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/diagrams-cairo/1.4/newer-deps
=====================================
--- /dev/null
+++ b/patches/diagrams-cairo/1.4/newer-deps
@@ -0,0 +1,33 @@
+Description: Newer build-deps from hackage
+Origin: upstream, https://hackage.haskell.org/package/diagrams-cairo-1.4/revisions/
+---
+
+--- a/diagrams-cairo.cabal
++++ b/diagrams-cairo.cabal
+@@ -53,7 +53,7 @@
+ Diagrams.Backend.Cairo.Ptr
+ Diagrams.Backend.Cairo.Text
+ Hs-source-dirs: src
+- Build-depends: base >= 4.2 && < 4.10,
++ Build-depends: base >= 4.2 && < 4.11,
+ mtl >= 2.0 && < 2.3,
+ filepath,
+ diagrams-core >= 1.3 && < 1.5,
+@@ -63,14 +63,14 @@
+ colour,
+ split >= 0.1.2 && < 0.3,
+ containers >= 0.3 && < 0.6,
+- lens >= 3.8 && < 4.16,
++ lens >= 3.8 && < 4.17,
+ data-default-class >= 0.0.1 && < 0.2,
+ statestack >= 0.2 && < 0.3,
+ JuicyPixels >= 3.1.3.2 && < 3.3,
+- vector >= 0.10.0 && < 0.12,
++ vector >= 0.10.0 && < 0.13,
+ array >= 0.4.0 && < 0.6,
+ bytestring >= 0.9 && < 0.11,
+- optparse-applicative >= 0.13 && < 0.14,
++ optparse-applicative >= 0.13 && < 0.15,
+ transformers >= 0.3 && <0.6,
+ hashable >= 1.1 && < 1.3
+ if impl(ghc < 7.6)
=====================================
patches/diagrams-cairo/1.4/series
=====================================
--- /dev/null
+++ b/patches/diagrams-cairo/1.4/series
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/diagrams-svg/1.4.1.1/newer-lens
=====================================
--- /dev/null
+++ b/patches/diagrams-svg/1.4.1.1/newer-lens
@@ -0,0 +1,11 @@
+--- a/diagrams-svg.cabal
++++ b/diagrams-svg.cabal
+@@ -54,7 +54,7 @@
+ , JuicyPixels >= 3.1.5 && < 3.3
+ , split >= 0.1.2 && < 0.3
+ , containers >= 0.3 && < 0.6
+- , lens >= 4.0 && < 4.16
++ , lens >= 4.0 && < 4.17
+ , hashable >= 1.1 && < 1.3
+ , optparse-applicative >= 0.13 && < 0.15
+ , semigroups >= 0.13 && < 0.19
=====================================
patches/diagrams-svg/1.4.1.1/series
=====================================
--- /dev/null
+++ b/patches/diagrams-svg/1.4.1.1/series
@@ -0,0 +1 @@
+newer-lens
=====================================
patches/uuid/1.3.13/newer-deps
=====================================
--- /dev/null
+++ b/patches/uuid/1.3.13/newer-deps
@@ -0,0 +1,29 @@
+--- a/uuid.cabal
++++ b/uuid.cabal
+@@ -37,7 +37,7 @@
+ entropy >= 0.3.7 && < 0.4,
+ network-info == 0.2.*,
+ random >= 1.0.1 && < 1.2,
+- time >= 1.1 && < 1.8,
++ time >= 1.1 && < 1.9,
+ text >= 1 && < 1.3,
+ uuid-types >= 1.0.2 && < 2
+
+@@ -69,12 +69,12 @@
+ Build-Depends: uuid
+ Build-Depends: base >= 4.3 && < 5,
+ bytestring >= 0.9 && < 0.11,
+- HUnit >= 1.2 && < 1.4,
+- QuickCheck >= 2.4 && < 2.10,
++ HUnit >= 1.2 && < 1.7,
++ QuickCheck >= 2.4 && < 2.12,
+ random >= 1.0.1 && < 1.2,
+- tasty >= 0.10 && < 0.12,
+- tasty-hunit == 0.9.*,
+- tasty-quickcheck == 0.8.*
++ tasty >= 0.10,
++ tasty-hunit >= 0.9,
++ tasty-quickcheck >= 0.8
+
+ benchmark benchmark
+ Type: exitcode-stdio-1.0
=====================================
patches/uuid/1.3.13/series
=====================================
--- /dev/null
+++ b/patches/uuid/1.3.13/series
@@ -0,0 +1 @@
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/ca34722f59ddf8ebcb514fd02e6d0fd55e0e3742...e65c904d8b241150dfb9e5307911e5779a65bfd7
---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/ca34722f59ddf8ebcb514fd02e6d0fd55e0e3742...e65c904d8b241150dfb9e5307911e5779a65bfd7
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/20180417/37368a74/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list