[Git][haskell-team/package-plan][master] 2 commits: unbreak things

Clint Adams gitlab at salsa.debian.org
Mon Mar 26 22:22:15 UTC 2018


Clint Adams pushed to branch master at Debian Haskell Group / package-plan


Commits:
baacac9d by Clint Adams at 2018-03-26T18:21:49-04:00
unbreak things

- - - - -
74db449a by Clint Adams at 2018-03-26T18:22:03-04:00
add hackage-mirror and dependencies

- - - - -


6 changed files:

- + additional-cabals/MonadRandom-0.5.1.cabal
- + additional-cabals/conduit-extra-1.1.17.cabal
- + additional-cabals/postgresql-simple-0.5.3.0.cabal
- + additional-cabals/warp-3.2.13.cabal
- packages.txt
- patches/conduit-extra/1.1.17/no-bytestring-builder


Changes:

=====================================
additional-cabals/MonadRandom-0.5.1.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/MonadRandom-0.5.1.cabal
@@ -0,0 +1,43 @@
+name:                MonadRandom
+version:             0.5.1
+synopsis:            Random-number generation monad.
+description:         Support for computations which consume random values.
+license:             BSD3
+license-file:        LICENSE
+author:              Cale Gibbard and others
+maintainer:          Brent Yorgey <byorgey at gmail.com>
+bug-reports:         https://github.com/byorgey/MonadRandom/issues
+category:            Control
+build-type:          Simple
+cabal-version:       >=1.10
+extra-source-files:  CHANGES.markdown
+tested-with:
+  GHC==7.4.2,
+  GHC==7.6.3,
+  GHC==7.8.4,
+  GHC==7.10.3,
+  GHC==8.0.1
+
+source-repository head
+  type:     git
+  location: git://github.com/byorgey/MonadRandom.git
+
+library
+  exposed-modules:
+    Control.Monad.Random,
+    Control.Monad.Random.Class,
+    Control.Monad.Random.Lazy,
+    Control.Monad.Random.Strict,
+    Control.Monad.Trans.Random,
+    Control.Monad.Trans.Random.Lazy,
+    Control.Monad.Trans.Random.Strict
+  build-depends:
+    base                >=2   && <5,
+    transformers        >=0.3 && <0.6,
+    transformers-compat >=0.4 && <0.6,
+    mtl                 >=2.1 && <2.3,
+    primitive           >=0.6 && <0.7,
+    fail                >=4.9        ,
+    random
+  ghc-options:         -Wall
+  default-language:    Haskell2010


=====================================
additional-cabals/conduit-extra-1.1.17.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/conduit-extra-1.1.17.cabal
@@ -0,0 +1,123 @@
+Name:                conduit-extra
+Version:             1.1.17
+Synopsis:            Batteries included conduit: adapters for common libraries.
+Description:
+    The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit.
+License:             MIT
+License-file:        LICENSE
+Author:              Michael Snoyman
+Maintainer:          michael at snoyman.com
+Category:            Data, Conduit
+Build-type:          Simple
+Cabal-version:       >=1.8
+Homepage:            http://github.com/snoyberg/conduit
+extra-source-files:
+    test/random
+    test/filesystem/*.txt
+    test/filesystem/bin/*.txt
+    ChangeLog.md
+    README.md
+
+Library
+  Exposed-modules:     Data.Conduit.Attoparsec
+                       Data.Conduit.Binary
+                       Data.Conduit.Blaze
+                       Data.Conduit.ByteString.Builder
+                       Data.Conduit.Filesystem
+                       Data.Conduit.Foldl
+                       Data.Conduit.Lazy
+                       Data.Conduit.Network
+                       Data.Conduit.Network.UDP
+                       Data.Conduit.Process
+                       Data.Conduit.Text
+                       Data.Conduit.Zlib
+  if !os(windows)
+      Exposed-modules: Data.Conduit.Network.Unix
+
+  if arch(x86_64) || arch(i386)
+      -- These architectures are able to perform unaligned memory accesses
+      cpp-options: -DALLOW_UNALIGNED_ACCESS
+
+  Build-depends:       base                     >= 4.5          && < 5
+                     , conduit                  >= 1.1          && < 1.3
+
+                       -- No version bounds necessary, since they're inherited
+                       -- from conduit.
+                     , bytestring
+                     , exceptions
+                     , monad-control
+                     , text
+                     , transformers
+                     , transformers-base
+
+                     , async
+                     , attoparsec               >= 0.10
+                     , blaze-builder            >= 0.3
+                     , directory
+                     , filepath
+                     , network                  >= 2.3
+                     , primitive                >= 0.5
+                     , process
+                     , resourcet                >= 1.1
+                     , stm
+                     , streaming-commons        >= 0.1.16
+
+  ghc-options:     -Wall
+
+test-suite test
+    hs-source-dirs: test
+    main-is: Spec.hs
+    type: exitcode-stdio-1.0
+    ghc-options:   -threaded
+    cpp-options:   -DTEST
+    build-depends:   conduit
+                   , conduit-extra
+                   , base
+                   , hspec >= 1.3
+
+                   , async
+                   , attoparsec
+                   , blaze-builder
+                   , bytestring-builder
+                   , bytestring
+                   , exceptions
+                   , process
+                   , resourcet
+                   , QuickCheck
+                   , stm
+                   , streaming-commons
+                   , text
+                   , transformers
+                   , transformers-base
+                   , directory
+    ghc-options:     -Wall
+    if os(windows)
+        cpp-options: -DWINDOWS
+    other-modules:   Data.Conduit.AttoparsecSpec
+                     Data.Conduit.BinarySpec
+                     Data.Conduit.ByteString.BuilderSpec
+                     Data.Conduit.ExtraSpec
+                     Data.Conduit.FilesystemSpec
+                     Data.Conduit.LazySpec
+                     Data.Conduit.NetworkSpec
+                     Data.Conduit.ProcessSpec
+                     Data.Conduit.TextSpec
+                     Data.Conduit.ZlibSpec
+
+benchmark blaze
+    type:           exitcode-stdio-1.0
+    hs-source-dirs: bench
+    build-depends:  base
+                  , blaze-builder
+                  , conduit
+                  , conduit-extra
+                  , criterion
+                  , bytestring
+                  , bytestring-builder
+                  , transformers
+    main-is:        blaze.hs
+    ghc-options:    -Wall -O2 -rtsopts
+
+source-repository head
+  type:     git
+  location: git://github.com/snoyberg/conduit.git


=====================================
additional-cabals/postgresql-simple-0.5.3.0.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/postgresql-simple-0.5.3.0.cabal
@@ -0,0 +1,133 @@
+Name:                postgresql-simple
+Version:             0.5.3.0
+Synopsis:            Mid-Level PostgreSQL client library
+Description:
+    Mid-Level PostgreSQL client library, forked from mysql-simple.
+License:             BSD3
+License-file:        LICENSE
+Author:              Bryan O'Sullivan, Leon P Smith
+Maintainer:          Leon P Smith <leon at melding-monads.com>
+Copyright:           (c) 2011 MailRank, Inc.
+                     (c) 2011-2015 Leon P Smith
+Category:            Database
+Build-type:          Simple
+
+Cabal-version:       >= 1.9.2
+
+extra-source-files:
+     CONTRIBUTORS
+     CHANGELOG.md
+
+Library
+  hs-source-dirs: src
+  Exposed-modules:
+     Database.PostgreSQL.Simple
+     Database.PostgreSQL.Simple.Arrays
+     Database.PostgreSQL.Simple.Copy
+     Database.PostgreSQL.Simple.Cursor
+     Database.PostgreSQL.Simple.FromField
+     Database.PostgreSQL.Simple.FromRow
+     Database.PostgreSQL.Simple.LargeObjects
+     Database.PostgreSQL.Simple.HStore
+     Database.PostgreSQL.Simple.HStore.Internal
+     Database.PostgreSQL.Simple.Notification
+     Database.PostgreSQL.Simple.Ok
+     Database.PostgreSQL.Simple.Range
+     Database.PostgreSQL.Simple.SqlQQ
+     Database.PostgreSQL.Simple.Time
+     Database.PostgreSQL.Simple.Time.Internal
+     Database.PostgreSQL.Simple.ToField
+     Database.PostgreSQL.Simple.ToRow
+     Database.PostgreSQL.Simple.Transaction
+     Database.PostgreSQL.Simple.TypeInfo
+     Database.PostgreSQL.Simple.TypeInfo.Macro
+     Database.PostgreSQL.Simple.TypeInfo.Static
+     Database.PostgreSQL.Simple.Types
+     Database.PostgreSQL.Simple.Errors
+-- Other-modules:
+     Database.PostgreSQL.Simple.Internal
+
+  Other-modules:
+     Database.PostgreSQL.Simple.Compat
+     Database.PostgreSQL.Simple.HStore.Implementation
+     Database.PostgreSQL.Simple.Internal.PQResultUtils
+     Database.PostgreSQL.Simple.Time.Implementation
+     Database.PostgreSQL.Simple.Time.Internal.Parser
+     Database.PostgreSQL.Simple.Time.Internal.Printer
+     Database.PostgreSQL.Simple.TypeInfo.Types
+
+  Build-depends:
+    aeson >= 0.6,
+    attoparsec >= 0.10.3,
+    base >= 4.6 && < 5,
+    bytestring >= 0.9,
+    bytestring-builder,
+    case-insensitive,
+    containers,
+    hashable,
+    postgresql-libpq >= 0.9 && < 0.10,
+    template-haskell,
+    text >= 0.11.1,
+    time,
+    transformers,
+    uuid-types >= 1.0.0,
+    scientific,
+    vector
+
+  if !impl(ghc >= 7.6)
+    Build-depends:
+      ghc-prim
+
+  extensions: DoAndIfThenElse, OverloadedStrings, BangPatterns, ViewPatterns
+              TypeOperators
+
+  ghc-options: -Wall -fno-warn-name-shadowing
+
+source-repository head
+  type:     git
+  location: http://github.com/lpsmith/postgresql-simple
+
+source-repository this
+  type:     git
+  location: http://github.com/lpsmith/postgresql-simple
+  tag:      v0.5.3.0
+
+test-suite test
+  type:           exitcode-stdio-1.0
+
+  hs-source-dirs: test
+  main-is:        Main.hs
+  other-modules:
+    Common
+    Notify
+    Serializable
+    Time
+
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-unused-do-bind
+
+  extensions: NamedFieldPuns
+            , OverloadedStrings
+            , Rank2Types
+            , RecordWildCards
+            , PatternGuards
+            , ScopedTypeVariables
+
+  build-depends: base
+               , aeson
+               , base16-bytestring
+               , bytestring
+               , containers
+               , cryptohash
+               , filepath
+               , tasty
+               , tasty-hunit
+               , tasty-golden
+               , HUnit
+               , postgresql-simple
+               , text
+               , time
+               , vector
+
+  if !impl(ghc >= 7.6)
+    build-depends:
+      ghc-prim


=====================================
additional-cabals/warp-3.2.13.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/warp-3.2.13.cabal
@@ -0,0 +1,208 @@
+Name:                warp
+Version:             3.2.13
+Synopsis:            A fast, light-weight web server for WAI applications.
+License:             MIT
+License-file:        LICENSE
+Author:              Michael Snoyman, Kazu Yamamoto, Matt Brown
+Maintainer:          michael at snoyman.com
+Homepage:            http://github.com/yesodweb/wai
+Category:            Web, Yesod
+Build-Type:          Simple
+Cabal-Version:       >=1.8
+Stability:           Stable
+description:         HTTP\/1.0, HTTP\/1.1 and HTTP\/2 are supported.
+                     For HTTP\/2,  Warp supports direct and ALPN (in TLS)
+                     but not upgrade.
+                     API docs and the README are available at
+                     <http://www.stackage.org/package/warp>.
+extra-source-files:  attic/hex
+                     ChangeLog.md
+                     README.md
+                     test/head-response
+                     test/inputFile
+
+Flag network-bytestring
+    Default: False
+
+Flag allow-sendfilefd
+    Description: Allow use of sendfileFd (not available on GNU/kFreeBSD)
+    Default:     True
+
+Flag warp-debug
+    Description: print debug output. not suitable for production
+    Default:     False
+
+Library
+  Build-Depends:     base                      >= 3        && < 5
+                   , array
+                   , async
+                   , auto-update               >= 0.1.3    && < 0.2
+                   , blaze-builder             >= 0.4
+                   , bytestring                >= 0.9.1.4
+                   , bytestring-builder
+                   , case-insensitive          >= 0.2
+                   , containers
+                   , ghc-prim
+                   , http-types                >= 0.9.1
+                   , iproute                   >= 1.3.1
+                   , http2                     >= 1.6      && < 1.7
+                   , simple-sendfile           >= 0.2.7    && < 0.3
+                   , unix-compat               >= 0.2
+                   , wai                       >= 3.2      && < 3.3
+                   , text
+                   , streaming-commons         >= 0.1.10
+                   , vault                     >= 0.3
+                   , stm                       >= 2.3
+                   , word8
+                   , hashable
+                   , http-date
+  if flag(network-bytestring)
+      Build-Depends: network                   >= 2.2.1.5  && < 2.2.3
+                   , network-bytestring        >= 0.1.3    && < 0.1.4
+  else
+      Build-Depends: network               >= 2.3
+  Exposed-modules:   Network.Wai.Handler.Warp
+                     Network.Wai.Handler.Warp.Internal
+  Other-modules:     Network.Wai.Handler.Warp.Buffer
+                     Network.Wai.Handler.Warp.Conduit
+                     Network.Wai.Handler.Warp.Counter
+                     Network.Wai.Handler.Warp.Date
+                     Network.Wai.Handler.Warp.FdCache
+                     Network.Wai.Handler.Warp.File
+                     Network.Wai.Handler.Warp.FileInfoCache
+                     Network.Wai.Handler.Warp.HashMap
+                     Network.Wai.Handler.Warp.HTTP2
+                     Network.Wai.Handler.Warp.HTTP2.EncodeFrame
+                     Network.Wai.Handler.Warp.HTTP2.File
+                     Network.Wai.Handler.Warp.HTTP2.HPACK
+                     Network.Wai.Handler.Warp.HTTP2.Manager
+                     Network.Wai.Handler.Warp.HTTP2.Receiver
+                     Network.Wai.Handler.Warp.HTTP2.Request
+                     Network.Wai.Handler.Warp.HTTP2.Sender
+                     Network.Wai.Handler.Warp.HTTP2.Types
+                     Network.Wai.Handler.Warp.HTTP2.Worker
+                     Network.Wai.Handler.Warp.Header
+                     Network.Wai.Handler.Warp.IO
+                     Network.Wai.Handler.Warp.IORef
+                     Network.Wai.Handler.Warp.PackInt
+                     Network.Wai.Handler.Warp.ReadInt
+                     Network.Wai.Handler.Warp.Recv
+                     Network.Wai.Handler.Warp.Request
+                     Network.Wai.Handler.Warp.RequestHeader
+                     Network.Wai.Handler.Warp.Response
+                     Network.Wai.Handler.Warp.ResponseHeader
+                     Network.Wai.Handler.Warp.Run
+                     Network.Wai.Handler.Warp.SendFile
+                     Network.Wai.Handler.Warp.Settings
+                     Network.Wai.Handler.Warp.Some
+                     Network.Wai.Handler.Warp.Timeout
+                     Network.Wai.Handler.Warp.Types
+                     Network.Wai.Handler.Warp.Windows
+                     Network.Wai.Handler.Warp.WithApplication
+                     Paths_warp
+  Ghc-Options:       -Wall
+
+  if flag(warp-debug)
+      Cpp-Options:   -DWARP_DEBUG
+  if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
+      Cpp-Options:   -DSENDFILEFD
+  if os(windows)
+      Cpp-Options:   -DWINDOWS
+      Build-Depends: time
+  else
+      Build-Depends: unix
+      Other-modules: Network.Wai.Handler.Warp.MultiMap
+
+Test-Suite doctest
+  Type:                 exitcode-stdio-1.0
+  HS-Source-Dirs:       test
+  Ghc-Options:          -threaded -Wall
+  Main-Is:              doctests.hs
+  Build-Depends:        base
+                      , doctest >= 0.10.1
+
+Test-Suite spec
+    Main-Is:         Spec.hs
+    Other-modules:   BufferPoolSpec
+                     ConduitSpec
+                     ExceptionSpec
+                     FdCacheSpec
+                     FileSpec
+                     ReadIntSpec
+                     RequestSpec
+                     ResponseHeaderSpec
+                     ResponseSpec
+                     RunSpec
+                     SendFileSpec
+                     WithApplicationSpec
+                     HTTP
+    Hs-Source-Dirs:  test, .
+    Type:            exitcode-stdio-1.0
+
+    Ghc-Options:     -Wall
+    Build-Depends:   base >= 4 && < 5
+                   , array
+                   , auto-update
+                   , blaze-builder             >= 0.4
+                   , bytestring                >= 0.9.1.4
+                   , bytestring-builder
+                   , case-insensitive          >= 0.2
+                   , ghc-prim
+                   , HTTP
+                   , http-types                >= 0.8.5
+                   , iproute                   >= 1.3.1
+                   , lifted-base               >= 0.1
+                   , simple-sendfile           >= 0.2.4    && < 0.3
+                   , transformers              >= 0.2.2
+                   , unix-compat               >= 0.2
+                   , wai                       >= 3.2      && < 3.3
+                   , network
+                   , HUnit
+                   , QuickCheck
+                   , hspec                     >= 1.3
+                   , time
+                   , text
+                   , streaming-commons         >= 0.1.10
+                   , silently
+                   , async
+                   , vault
+                   , stm                       >= 2.3
+                   , directory
+                   , process
+                   , containers
+                   , http2                     >= 1.6      && < 1.7
+                   , word8
+                   , hashable
+                   , http-date
+
+  if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
+    Cpp-Options:   -DSENDFILEFD
+    Build-Depends: unix
+  if os(windows)
+      Cpp-Options:   -DWINDOWS
+
+Benchmark parser
+    Type:           exitcode-stdio-1.0
+    Main-Is:        Parser.hs
+    HS-Source-Dirs: bench .
+    Build-Depends:  base
+                  , auto-update
+                  , bytestring
+                  , containers
+                  , criterion >= 1
+                  , hashable
+                  , http-date
+                  , http-types
+                  , network
+                  , network
+                  , unix-compat
+
+  if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
+    Cpp-Options:   -DSENDFILEFD
+    Build-Depends: unix
+  if os(windows)
+      Cpp-Options:   -DWINDOWS
+
+Source-Repository head
+  Type:     git
+  Location: git://github.com/yesodweb/wai.git


=====================================
packages.txt
=====================================
--- a/packages.txt
+++ b/packages.txt
@@ -316,6 +316,7 @@ gtk 0.14.7
 gtk2hs-buildtools 0.13.3.1 binary
 gtk3 0.14.8
 gtk-traymanager 0.1.6
+hackage-mirror 0.1.1.1
 hackage-security 0.5.2.2
 haddock-library 1.4.3 notest
 hakyll 4.9.8.0
@@ -787,6 +788,7 @@ syb 0.7
 syb-with-class 0.6.1.7
 system-fileio 0.3.16.3
 system-filepath 0.4.13.4
+system-posix-redirect 1.1.0.1
 tabular 0.2.2.7
 taffybar 0.4.6 key
 tagged 0.8.5
@@ -836,6 +838,7 @@ threadscope 0.2.9 key binary
 th-reify-compat 0.0.1.3
 th-reify-many 0.1.8
 th-utilities 0.2.0.1
+thyme 0.3.5.5
 tidal 0.9.5
 time-compat 0.1.0.3
 time-locale-compat 0.1.1.3


=====================================
patches/conduit-extra/1.1.17/no-bytestring-builder
=====================================
--- a/patches/conduit-extra/1.1.17/no-bytestring-builder
+++ b/patches/conduit-extra/1.1.17/no-bytestring-builder
@@ -1,3 +1,7 @@
+Description: Remove bytestring-builder from Build-depends
+ This package is a no-op for Debian (and so, we do not ship it).
+Author: Joachim Breitner <nomeata at debian.org>
+Forwarded: not-needed, debian specific
 --- a/conduit-extra.cabal
 +++ b/conduit-extra.cabal
 @@ -78,7 +78,6 @@



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/0e3d018ca4d79df43f647faf2a098592becf9eb5...74db449a4d5cd79b15fb2ceaf1df4b1eeeb40555

---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/0e3d018ca4d79df43f647faf2a098592becf9eb5...74db449a4d5cd79b15fb2ceaf1df4b1eeeb40555
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20180326/b853fbfc/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list