[Git][haskell-team/package-plan][master] patches
Clint Adams
gitlab at salsa.debian.org
Tue May 22 01:26:19 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
4a6c2962 by Clint Adams at 2018-05-21T20:26:06-04:00
patches
- - - - -
12 changed files:
- + additional-cabals/snap-1.1.0.0.cabal
- + additional-cabals/snap-server-1.1.0.0.cabal
- packages.txt
- + patches/snap-server/1.1.0.0/no-bytestring-builder
- + patches/snap-server/1.1.0.0/series
- − patches/snap/1.0.0.2/no-test-framework-smallcheck
- − patches/snap/1.0.0.2/series
- + patches/snap/1.1.0.0/newer-deps
- + patches/snap/1.1.0.0/no-test-framework-smallcheck
- + patches/snap/1.1.0.0/rename-snap-binary
- + patches/snap/1.1.0.0/series
- + patches/snap/1.1.0.0/tests-timeout
Changes:
=====================================
additional-cabals/snap-1.1.0.0.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/snap-1.1.0.0.cabal
@@ -0,0 +1,288 @@
+name: snap
+version: 1.1.0.0
+synopsis: Top-level package for the Snap Web Framework
+description:
+ This is the top-level package for the official Snap Framework libraries.
+ It includes:
+ .
+ * The Snaplets API
+ .
+ * Snaplets for sessions, authentication, and templates
+ .
+ To get started, issue the following sequence of commands:
+ .
+ @$ cabal install snap snap-templates
+ $ mkdir myproject
+ $ cd myproject
+ $ snap init@
+ .
+ If you have trouble or any questions, see our FAQ page
+ (<http://snapframework.com/faq>) or the documentation
+ (<http://snapframework.com/docs>).
+ .
+ Note: since version 1.0, the \"snap\" executable program for generating
+ starter projects is provided by the @snap-templates@ package.
+
+license: BSD3
+license-file: LICENSE
+author: Ozgun Ataman, Doug Beardsley,
+ Gregory Collins, Carl Howells, Chris Smith
+maintainer: snap at snapframework.com
+build-type: Simple
+cabal-version: >= 1.8.0.4
+homepage: http://snapframework.com/
+bug-reports: https://github.com/snapframework/snap/issues
+category: Web, Snap
+Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3,
+ GHC == 8.0.1, GHC == 8.2.1
+
+extra-source-files:
+ .ghci
+ CONTRIBUTORS,
+ LICENSE,
+ README.md,
+ README.SNAP.md,
+ design.md,
+ extra/hscolour.css,
+ extra/haddock.css,
+ extra/logo.gif,
+ haddock.sh,
+ runTestsAndCoverage.sh,
+ test/bad.tpl,
+ test/db.cfg,
+ test/devel.cfg,
+ test/good.tpl,
+ test/snaplets/baz/devel.cfg
+ test/snaplets/baz/templates/bazconfig.tpl
+ test/snaplets/baz/templates/bazpage.tpl
+ test/snaplets/embedded/extra-templates/extra.tpl,
+ test/snaplets/embedded/snaplets/heist/templates/embeddedpage.tpl,
+ test/snaplets/foosnaplet/devel.cfg,
+ test/snaplets/foosnaplet/templates/foopage.tpl,
+ test/snaplets/heist/templates/_foopage.tpl,
+ test/snaplets/heist/templates/extraTemplates/barpage.tpl,
+ test/snaplets/heist/templates/foopage.tpl,
+ test/snaplets/heist/templates/index.tpl,
+ test/snaplets/heist/templates/page.tpl,
+ test/snaplets/heist/templates/session.tpl,
+ test/snaplets/heist/templates/splicepage.tpl,
+ test/snaplets/heist/templates/userpage.tpl
+
+Library
+ hs-source-dirs: src
+
+ exposed-modules:
+ Snap,
+ Snap.Snaplet
+ Snap.Snaplet.Heist
+ Snap.Snaplet.HeistNoClass
+ Snap.Snaplet.Heist.Compiled
+ Snap.Snaplet.Heist.Generic
+ Snap.Snaplet.Heist.Interpreted
+ Snap.Snaplet.Auth
+ Snap.Snaplet.Auth.Backends.JsonFile
+ Snap.Snaplet.Config
+ Snap.Snaplet.Session
+ Snap.Snaplet.Session.Common
+ Snap.Snaplet.Session.SessionManager
+ Snap.Snaplet.Session.Backends.CookieSession
+ Snap.Snaplet.Test
+
+ other-modules:
+ Paths_snap
+ Snap.Snaplet.Auth.AuthManager
+ Snap.Snaplet.Auth.Types
+ Snap.Snaplet.Auth.Handlers
+ Snap.Snaplet.Auth.SpliceHelpers
+ Snap.Snaplet.Heist.Internal
+ Snap.Snaplet.Internal.Initializer
+ Snap.Snaplet.Internal.LensT
+ Snap.Snaplet.Internal.Lensed
+ Snap.Snaplet.Internal.RST
+ Snap.Snaplet.Internal.Types
+ Snap.Snaplet.Session.SecureCookie
+
+ build-depends:
+ aeson >= 0.6 && < 1.3,
+ attoparsec >= 0.10 && < 0.14,
+ base >= 4 && < 4.11,
+ bytestring >= 0.9.1 && < 0.11,
+ cereal >= 0.3 && < 0.6,
+ clientsession >= 0.8 && < 0.10,
+ configurator >= 0.1 && < 0.4,
+ containers >= 0.2 && < 0.6,
+ directory >= 1.1 && < 1.4,
+ directory-tree >= 0.10 && < 0.13,
+ dlist >= 0.5 && < 0.9,
+ filepath >= 1.3 && < 1.5,
+ -- hashable is broken from 1.2.0.0 through 1.2.0.5
+ -- snap does work with hashable 1.1.*, but some have complained that
+ -- the version disjunction causes problems with dependency resolution.
+ hashable >= 1.2.0.6 && < 1.3,
+ heist >= 1.0 && < 1.1,
+ lens >= 3.7.6 && < 4.16,
+ lifted-base >= 0.2 && < 0.3,
+ map-syntax >= 0.2 && < 0.3,
+ monad-control >= 0.3 && < 1.1,
+ mtl >= 2.0 && < 2.3,
+ mwc-random >= 0.8 && < 0.14,
+ pwstore-fast >= 2.2 && < 2.5,
+ snap-core >= 1.0 && < 1.1,
+ snap-server >= 1.0 && < 1.1,
+ stm >= 2.2 && < 2.5,
+ text >= 0.11 && < 1.3,
+ time >= 1.1 && < 1.9,
+ transformers >= 0.2 && < 0.6,
+ transformers-base >= 0.4 && < 0.5,
+ unordered-containers >= 0.1.4 && < 0.3,
+ xmlhtml >= 0.1 && < 0.3
+
+ extensions:
+ BangPatterns,
+ CPP,
+ DeriveDataTypeable,
+ ExistentialQuantification,
+ FlexibleContexts,
+ FlexibleInstances,
+ GeneralizedNewtypeDeriving,
+ MultiParamTypeClasses,
+ NoMonomorphismRestriction,
+ OverloadedStrings,
+ PackageImports,
+ Rank2Types,
+ RecordWildCards,
+ ScopedTypeVariables,
+ TemplateHaskell,
+ TypeFamilies,
+ TypeOperators,
+ TypeSynonymInstances
+
+ if impl(ghc >= 6.12.0)
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+ -fno-warn-orphans -fno-warn-unused-do-bind
+ else
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+ -fno-warn-orphans
+
+Test-suite testsuite
+ hs-source-dirs: src test/suite
+ type: exitcode-stdio-1.0
+ main-is: TestSuite.hs
+
+ other-modules:
+ Blackbox.Tests
+ Paths_snap
+ SafeCWD
+ Snap,
+ Snap.Snaplet
+ Snap.Snaplet.Auth
+ Snap.Snaplet.Auth.AuthManager
+ Snap.Snaplet.Auth.Backends.JsonFile
+ Snap.Snaplet.Auth.Handlers
+ Snap.Snaplet.Auth.Handlers.Tests
+ Snap.Snaplet.Auth.SpliceHelpers
+ Snap.Snaplet.Auth.SpliceTests
+ Snap.Snaplet.Auth.Tests
+ Snap.Snaplet.Auth.Types
+ Snap.Snaplet.Auth.Types.Tests
+ Snap.Snaplet.Test.Common.App
+ Snap.Snaplet.Test.Common.BarSnaplet
+ Snap.Snaplet.Test.Common.EmbeddedSnaplet
+ Snap.Snaplet.Test.Common.FooSnaplet
+ Snap.Snaplet.Test.Common.Handlers
+ Snap.Snaplet.Test.Common.Types
+ Snap.Snaplet.Config
+ Snap.Snaplet.Config.Tests
+ Snap.Snaplet.Heist
+ Snap.Snaplet.Heist.Compiled
+ Snap.Snaplet.Heist.Generic
+ Snap.Snaplet.Heist.Internal
+ Snap.Snaplet.Heist.Interpreted
+ Snap.Snaplet.Heist.Tests
+ Snap.Snaplet.HeistNoClass
+ Snap.Snaplet.Internal.Initializer
+ Snap.Snaplet.Internal.LensT
+ Snap.Snaplet.Internal.LensT.Tests
+ Snap.Snaplet.Internal.Lensed
+ Snap.Snaplet.Internal.Lensed.Tests
+ Snap.Snaplet.Internal.RST
+ Snap.Snaplet.Internal.RST.Tests
+ Snap.Snaplet.Internal.Tests
+ Snap.Snaplet.Internal.Types
+ Snap.Snaplet.Session
+ Snap.Snaplet.Session.Backends.CookieSession
+ Snap.Snaplet.Session.Common
+ Snap.Snaplet.Session.SecureCookie
+ Snap.Snaplet.Session.SessionManager
+ Snap.Snaplet.Test
+ Snap.Snaplet.Test.Tests
+ Snap.TestCommon
+
+ build-depends:
+ aeson,
+ async >= 2.0.1.5 && < 2.2,
+ attoparsec,
+ base,
+ bytestring,
+ cereal,
+ clientsession,
+ configurator,
+ containers,
+ deepseq,
+ directory,
+ directory-tree,
+ dlist,
+ filepath,
+ hashable,
+ heist,
+ http-streams >= 0.7.1.1 && < 0.9,
+ HUnit >= 1.2.5.2 && < 1.7,
+ lens,
+ lifted-base,
+ map-syntax,
+ monad-control,
+ mtl,
+ mwc-random,
+ pwstore-fast,
+ QuickCheck >= 2.4.2 && < 2.11,
+ smallcheck >= 1.1.1 && < 1.2,
+ snap-core,
+ snap-server,
+ snap,
+ stm,
+ syb,
+ test-framework >= 0.8.0.3 && < 0.9,
+ test-framework-hunit >= 0.3.0.1 && < 0.4,
+ test-framework-quickcheck2 >= 0.3.0.3 && < 0.4,
+ test-framework-smallcheck >= 0.2 && < 0.3,
+ text,
+ time,
+ transformers,
+ transformers-base,
+ unordered-containers,
+ xmlhtml
+
+ extensions:
+ BangPatterns,
+ CPP,
+ DeriveDataTypeable,
+ ExistentialQuantification,
+ FlexibleContexts,
+ FlexibleInstances,
+ GeneralizedNewtypeDeriving,
+ MultiParamTypeClasses,
+ NoMonomorphismRestriction,
+ OverloadedStrings,
+ PackageImports,
+ Rank2Types,
+ RecordWildCards,
+ ScopedTypeVariables,
+ TemplateHaskell,
+ TypeFamilies,
+ TypeOperators,
+ TypeSynonymInstances
+
+
+source-repository head
+ type: git
+ location: https://github.com/snapframework/snap.git
=====================================
additional-cabals/snap-server-1.1.0.0.cabal
=====================================
--- /dev/null
+++ b/additional-cabals/snap-server-1.1.0.0.cabal
@@ -0,0 +1,540 @@
+name: snap-server
+version: 1.1.0.0
+synopsis: A web server for the Snap Framework
+description:
+ Snap is a simple and fast web development framework and server written in
+ Haskell. For more information or to download the latest version, you can
+ visit the Snap project website at <http://snapframework.com/>.
+ .
+ The Snap HTTP server is a high performance web server library written in
+ Haskell. Together with the @snap-core@ library upon which it depends, it
+ provides a clean and efficient Haskell programming interface to the HTTP
+ protocol.
+
+license: BSD3
+license-file: LICENSE
+author: Snap Framework Authors (see CONTRIBUTORS)
+maintainer: snap at snapframework.com
+build-type: Simple
+cabal-version: >= 1.10
+homepage: http://snapframework.com/
+bug-reports: https://github.com/snapframework/snap-server/issues
+category: Web, Snap, IO-Streams
+
+
+extra-source-files:
+ CONTRIBUTORS,
+ LICENSE,
+ README.md,
+ README.SNAP.md,
+ test/bad_key.pem,
+ test/cert.pem,
+ test/dummy.txt,
+ test/key.pem,
+ testserver/static/hello.txt
+
+tested-with:
+ GHC==7.6.3,
+ GHC==7.8.4,
+ GHC==7.10.3,
+ GHC==8.0.2,
+ GHC==8.2.1,
+ GHC==8.4.1
+
+Flag portable
+ Description: Compile in cross-platform mode. No platform-specific code or
+ optimizations such as C routines will be used.
+ Default: False
+
+Flag openssl
+ Description: Enable https support using the HsOpenSSL library.
+ Default: False
+ Manual: True
+
+Flag build-pong
+ Description: Build a server that just returns "PONG"? Normally useful only
+ for benchmarks.
+ Default: False
+ Manual: True
+
+Flag build-testserver
+ Description: Build the blackbox testserver?
+ Default: False
+ Manual: True
+
+Flag debug
+ Description: Enable support for debugging.
+ Default: False
+ Manual: True
+
+Library
+ hs-source-dirs: src
+ Default-language: Haskell2010
+
+ exposed-modules:
+ Snap.Http.Server,
+ Snap.Http.Server.Config,
+ Snap.Http.Server.Types,
+ Snap.Internal.Http.Server.Config,
+ Snap.Internal.Http.Server.Types,
+ System.FastLogger
+
+ other-modules:
+ Paths_snap_server,
+ Control.Concurrent.Extended,
+ Snap.Internal.Http.Server.Address,
+ Snap.Internal.Http.Server.Clock,
+ Snap.Internal.Http.Server.Common,
+ Snap.Internal.Http.Server.Date,
+ Snap.Internal.Http.Server.Parser,
+ Snap.Internal.Http.Server.Session,
+ Snap.Internal.Http.Server.Socket,
+ Snap.Internal.Http.Server.Thread,
+ Snap.Internal.Http.Server.TimeoutManager,
+ Snap.Internal.Http.Server.TLS
+
+ build-depends:
+ attoparsec >= 0.12 && < 0.14,
+ base >= 4.6 && < 4.12,
+ blaze-builder >= 0.4 && < 0.5,
+ bytestring >= 0.9.1 && < 0.11,
+ bytestring-builder >= 0.10.4 && < 0.11,
+ case-insensitive >= 1.1 && < 1.3,
+ clock >= 0.7.1 && < 0.8,
+ containers >= 0.3 && < 0.6,
+ filepath >= 1.1 && < 2.0,
+ io-streams >= 1.3 && < 1.6,
+ io-streams-haproxy >= 1.0 && < 1.1,
+ lifted-base >= 0.1 && < 0.3,
+ mtl >= 2.0 && < 2.3,
+ network >= 2.3 && < 2.7,
+ old-locale >= 1.0 && < 1.1,
+ snap-core >= 1.0 && < 1.1,
+ text >= 0.11 && < 1.3,
+ time >= 1.0 && < 1.9,
+ unix-compat >= 0.2 && < 0.6,
+ vector >= 0.7 && < 0.13
+
+ other-extensions:
+ BangPatterns,
+ CPP,
+ MagicHash,
+ Rank2Types,
+ OverloadedStrings,
+ ScopedTypeVariables,
+ DeriveDataTypeable,
+ PackageImports,
+ ViewPatterns,
+ ForeignFunctionInterface,
+ EmptyDataDecls,
+ GeneralizedNewtypeDeriving
+
+ if !impl(ghc >= 8.0)
+ build-depends: semigroups >= 0.16 && < 0.19
+
+ if flag(portable) || os(windows)
+ cpp-options: -DPORTABLE
+ else
+ build-depends: unix < 2.8
+
+ if flag(openssl)
+ cpp-options: -DOPENSSL
+ build-depends: HsOpenSSL >= 0.10.4 && < 0.12,
+ openssl-streams >= 1.1 && < 1.3
+
+ if os(linux) && !flag(portable)
+ cpp-options: -DLINUX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.Linux
+
+-- Disabling sendfile() on OSX for now. See
+--
+-- https://github.com/snapframework/snap-core/issues/274 and
+-- https://github.com/snapframework/snap-core/issues/91
+--
+ if os(darwin) && !flag(portable)
+ cpp-options: -DHAS_UNIX_SOCKETS
+ -- if os(darwin) && !flag(portable)
+ -- cpp-options: -DOSX -DHAS_UNIX_SOCKETS
+
+ if os(freebsd) && !flag(portable)
+ cpp-options: -DFREEBSD -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.FreeBSD
+
+ if impl(ghc >= 6.12.0)
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -fno-warn-unused-do-bind
+ else
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+
+ if flag(debug)
+ cpp-options: -DLABEL_THREADS
+
+Test-suite testsuite
+ hs-source-dirs: src test
+ Type: exitcode-stdio-1.0
+ Main-is: TestSuite.hs
+ Default-language: Haskell2010
+
+ other-modules:
+ Control.Concurrent.Extended,
+ Paths_snap_server,
+ Snap.Http.Server,
+ Snap.Http.Server.Config,
+ Snap.Http.Server.Types,
+ Snap.Internal.Http.Server.Address,
+ Snap.Internal.Http.Server.Clock,
+ Snap.Internal.Http.Server.Common,
+ Snap.Internal.Http.Server.Config,
+ Snap.Internal.Http.Server.Date,
+ Snap.Internal.Http.Server.Parser,
+ Snap.Internal.Http.Server.Session,
+ Snap.Internal.Http.Server.Socket,
+ Snap.Internal.Http.Server.Thread,
+ Snap.Internal.Http.Server.TimeoutManager,
+ Snap.Internal.Http.Server.TLS
+ Snap.Internal.Http.Server.Types,
+ System.FastLogger,
+
+ Snap.Internal.Http.Server.Address.Tests,
+ Snap.Internal.Http.Server.Parser.Tests,
+ Snap.Internal.Http.Server.Session.Tests,
+ Snap.Internal.Http.Server.Socket.Tests,
+ Snap.Internal.Http.Server.TimeoutManager.Tests,
+ Snap.Test.Common,
+ Test.Blackbox,
+ Test.Common.Rot13,
+ Test.Common.TestHandler
+
+ build-depends:
+ attoparsec,
+ base,
+ base16-bytestring >= 0.1 && < 0.2,
+ blaze-builder,
+ bytestring-builder,
+ bytestring,
+ case-insensitive,
+ clock,
+ containers,
+ directory >= 1.1 && < 1.4,
+ filepath,
+ io-streams,
+ io-streams-haproxy,
+ lifted-base,
+ monad-control >= 1.0 && < 1.1,
+ mtl,
+ network,
+ old-locale,
+ random >= 1.0 && < 1.2,
+ snap-core,
+ text,
+ threads >= 0.5 && < 0.6,
+ time,
+ transformers >= 0.3 && < 0.6,
+ unix-compat,
+ vector,
+
+ HUnit >= 1.2 && < 2,
+ QuickCheck >= 2.3.0.2 && < 3,
+ deepseq >= 1.3 && < 2,
+ http-streams >= 0.7 && < 0.9,
+ http-common >= 0.7 && < 0.9,
+ parallel >= 3 && < 4,
+ test-framework >= 0.8.0.3 && < 0.9,
+ test-framework-hunit >= 0.2.7 && < 0.4,
+ test-framework-quickcheck2 >= 0.2.12.1 && < 0.4
+
+ other-extensions:
+ BangPatterns,
+ CPP,
+ MagicHash,
+ Rank2Types,
+ OverloadedStrings,
+ ScopedTypeVariables,
+ DeriveDataTypeable,
+ PackageImports,
+ ViewPatterns,
+ ForeignFunctionInterface,
+ EmptyDataDecls,
+ GeneralizedNewtypeDeriving
+
+ if !impl(ghc >= 8.0)
+ build-depends: semigroups
+
+ if flag(portable) || os(windows)
+ cpp-options: -DPORTABLE
+ else
+ build-depends: unix
+
+ -- always label threads in testsuite
+ cpp-options: -DLABEL_THREADS
+
+ if flag(openssl)
+ cpp-options: -DOPENSSL
+ build-depends: HsOpenSSL,
+ openssl-streams
+
+ if os(linux) && !flag(portable)
+ cpp-options: -DLINUX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.Linux,
+ System.SendFile.Tests
+ c-sources: test/cbits/errno_util.c
+
+ if os(darwin) && !flag(portable)
+ cpp-options: -DHAS_UNIX_SOCKETS
+-- if os(darwin) && !flag(portable)
+-- cpp-options: -DOSX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+-- other-modules:
+-- System.SendFile,
+-- System.SendFile.Darwin,
+-- System.SendFile.Tests
+-- c-sources: test/cbits/errno_util.c
+
+ if os(freebsd) && !flag(portable)
+ cpp-options: -DFREEBSD -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.FreeBSD,
+ System.SendFile.Tests
+ c-sources: test/cbits/errno_util.c
+
+ cpp-options: -DTESTSUITE
+
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+ -fno-warn-unused-do-bind -threaded
+
+
+Benchmark benchmark
+ type: exitcode-stdio-1.0
+ hs-source-dirs: benchmark src
+ main-is: Benchmark.hs
+ default-language: Haskell2010
+
+ other-modules:
+ Snap.Internal.Http.Parser.Benchmark,
+ Snap.Internal.Http.Parser.Data,
+ Snap.Internal.Http.Server.Parser
+
+ build-depends:
+ attoparsec,
+ base,
+ blaze-builder,
+ bytestring,
+ bytestring-builder,
+ criterion >= 0.6 && < 1.5,
+ io-streams,
+ io-streams-haproxy,
+ snap-core,
+ vector
+
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+ -fno-warn-unused-do-bind -rtsopts
+
+ other-extensions:
+ BangPatterns,
+ CPP,
+ MagicHash,
+ Rank2Types,
+ OverloadedStrings,
+ ScopedTypeVariables,
+ DeriveDataTypeable,
+ PackageImports,
+ ViewPatterns,
+ ForeignFunctionInterface,
+ EmptyDataDecls,
+ GeneralizedNewtypeDeriving
+
+Executable snap-test-pong-server
+ hs-source-dirs: src pong
+ main-is: Main.hs
+
+ if !flag(build-pong)
+ buildable: False
+
+ default-language: Haskell2010
+
+ other-modules:
+ Paths_snap_server,
+ Snap.Internal.Http.Server.Address,
+ Snap.Internal.Http.Server.Clock,
+ Snap.Internal.Http.Server.Common,
+ Snap.Internal.Http.Server.Config,
+ Snap.Internal.Http.Server.Date,
+ Snap.Internal.Http.Server.Parser,
+ Snap.Internal.Http.Server.Session,
+ Snap.Internal.Http.Server.Socket,
+ Snap.Internal.Http.Server.Thread,
+ Snap.Internal.Http.Server.TimeoutManager,
+ Snap.Internal.Http.Server.TLS,
+ Snap.Internal.Http.Server.Types
+
+ if flag(portable) || os(windows)
+ cpp-options: -DPORTABLE
+ else
+ build-depends: unix
+
+ if os(linux) && !flag(portable)
+ cpp-options: -DLINUX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.Linux
+
+ if os(darwin) && !flag(portable)
+ cpp-options: -DHAS_UNIX_SOCKETS
+-- if os(darwin) && !flag(portable)
+-- cpp-options: -DOSX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+-- other-modules:
+-- System.SendFile,
+-- System.SendFile.Darwin
+
+ if os(freebsd) && !flag(portable)
+ cpp-options: -DFREEBSD -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.FreeBSD
+
+ if flag(openssl)
+ cpp-options: -DOPENSSL
+ build-depends: HsOpenSSL,
+ openssl-streams
+
+ build-depends:
+ attoparsec,
+ base,
+ blaze-builder,
+ bytestring,
+ bytestring-builder,
+ case-insensitive,
+ clock,
+ containers,
+ io-streams,
+ io-streams-haproxy,
+ lifted-base,
+ mtl,
+ network,
+ old-locale,
+ snap-core,
+ text,
+ time,
+ unix-compat,
+ vector
+
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+ -fno-warn-unused-do-bind -threaded -rtsopts
+
+ other-extensions:
+ BangPatterns,
+ CPP,
+ MagicHash,
+ Rank2Types,
+ OverloadedStrings,
+ ScopedTypeVariables,
+ DeriveDataTypeable,
+ PackageImports,
+ ViewPatterns,
+ ForeignFunctionInterface,
+ EmptyDataDecls,
+ GeneralizedNewtypeDeriving
+
+
+Executable snap-test-server
+ hs-source-dirs: src testserver test
+ main-is: Main.hs
+
+ if !flag(build-testserver)
+ buildable: False
+
+ if flag(openssl)
+ cpp-options: -DOPENSSL
+ build-depends: HsOpenSSL,
+ openssl-streams
+
+ default-language: Haskell2010
+
+ other-modules:
+ Paths_snap_server,
+ Snap.Internal.Http.Server.Address,
+ Snap.Internal.Http.Server.Clock,
+ Snap.Internal.Http.Server.Common,
+ Snap.Internal.Http.Server.Config,
+ Snap.Internal.Http.Server.Date,
+ Snap.Internal.Http.Server.Parser,
+ Snap.Internal.Http.Server.Session,
+ Snap.Internal.Http.Server.Socket,
+ Snap.Internal.Http.Server.Thread,
+ Snap.Internal.Http.Server.TimeoutManager,
+ Snap.Internal.Http.Server.TLS,
+ Snap.Internal.Http.Server.Types
+
+ if flag(portable) || os(windows)
+ cpp-options: -DPORTABLE
+ else
+ build-depends: unix
+
+ if os(linux) && !flag(portable)
+ cpp-options: -DLINUX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.Linux
+
+ if os(darwin) && !flag(portable)
+ cpp-options: -DHAS_UNIX_SOCKETS
+ -- if os(darwin) && !flag(portable)
+ -- cpp-options: -DOSX -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ -- other-modules:
+ -- System.SendFile,
+ -- System.SendFile.Darwin
+
+ if os(freebsd) && !flag(portable)
+ cpp-options: -DFREEBSD -DHAS_SENDFILE -DHAS_UNIX_SOCKETS
+ other-modules:
+ System.SendFile,
+ System.SendFile.FreeBSD
+
+ build-depends:
+ attoparsec,
+ base,
+ blaze-builder,
+ bytestring,
+ bytestring-builder,
+ case-insensitive,
+ clock,
+ containers,
+ directory,
+ io-streams,
+ io-streams-haproxy,
+ lifted-base,
+ mtl,
+ network,
+ old-locale,
+ snap-core,
+ text,
+ time,
+ transformers,
+ unix-compat,
+ vector
+
+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
+ -fno-warn-unused-do-bind -threaded -rtsopts
+
+ other-extensions:
+ BangPatterns,
+ CPP,
+ MagicHash,
+ Rank2Types,
+ OverloadedStrings,
+ ScopedTypeVariables,
+ DeriveDataTypeable,
+ PackageImports,
+ ViewPatterns,
+ ForeignFunctionInterface,
+ EmptyDataDecls,
+ GeneralizedNewtypeDeriving
+
+source-repository head
+ type: git
+ location: git://github.com/snapframework/snap-server.git
=====================================
packages.txt
=====================================
--- a/packages.txt
+++ b/packages.txt
@@ -237,7 +237,7 @@ EdisonAPI 1.3.1
EdisonCore 1.3.2.1
edit-distance 0.2.2.1
either 5 # by accident
-ekg 0.4.0.15 key ignore # BROKEN: LTS 11: via snap-server
+ekg 0.4.0.15 key
ekg-core 0.1.1.4
ekg-json 0.1.0.6
email-validate 2.3.2.5
@@ -773,9 +773,9 @@ skylighting 0.6 -fsystem-pcre
smallcheck 1.1.4
smtLib 1.0.8
smtp-mail 0.1.4.6
-snap 1.1.0.0 ignore # BROKEN: LTS 11: newer snap-server
+snap 1.1.0.0
snap-core 1.0.3.2
-snap-server 1.1.0.0 ignore ahead # BROKEN: needs repatching
+snap-server 1.1.0.0 ahead
snap-templates 1.0.0.1 binary
soap 0.2.3.6
soap-tls 0.1.1.4
@@ -952,7 +952,7 @@ wl-pprint-text 1.2.0.0 ahead
word8 0.1.3
word-trie 0.3.0
word-wrap 0.4.1
-wreq 0.5.2.1 ignore # BROKEN: LTS 11: via snap-server
+wreq 0.5.2.1
X11 1.8
X11-xft 0.3.1
x509 1.7.3
=====================================
patches/snap-server/1.1.0.0/no-bytestring-builder
=====================================
--- /dev/null
+++ b/patches/snap-server/1.1.0.0/no-bytestring-builder
@@ -0,0 +1,42 @@
+--- a/snap-server.cabal
++++ b/snap-server.cabal
+@@ -98,7 +98,6 @@
+ base >= 4.6 && < 4.12,
+ blaze-builder >= 0.4 && < 0.5,
+ bytestring >= 0.9.1 && < 0.11,
+- bytestring-builder >= 0.10.4 && < 0.11,
+ case-insensitive >= 1.1 && < 1.3,
+ clock >= 0.7.1 && < 0.8,
+ containers >= 0.3 && < 0.6,
+@@ -213,7 +212,6 @@
+ base,
+ base16-bytestring >= 0.1 && < 0.2,
+ blaze-builder,
+- bytestring-builder,
+ bytestring,
+ case-insensitive,
+ clock,
+@@ -324,7 +322,6 @@
+ base,
+ blaze-builder,
+ bytestring,
+- bytestring-builder,
+ criterion >= 0.6 && < 1.5,
+ io-streams,
+ io-streams-haproxy,
+@@ -407,7 +404,6 @@
+ base,
+ blaze-builder,
+ bytestring,
+- bytestring-builder,
+ case-insensitive,
+ clock,
+ containers,
+@@ -500,7 +496,6 @@
+ base,
+ blaze-builder,
+ bytestring,
+- bytestring-builder,
+ case-insensitive,
+ clock,
+ containers,
=====================================
patches/snap-server/1.1.0.0/series
=====================================
--- /dev/null
+++ b/patches/snap-server/1.1.0.0/series
@@ -0,0 +1 @@
+no-bytestring-builder
=====================================
patches/snap/1.0.0.2/no-test-framework-smallcheck deleted
=====================================
--- a/patches/snap/1.0.0.2/no-test-framework-smallcheck
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: b/snap.cabal
-===================================================================
---- a/snap.cabal
-+++ b/snap.cabal
-@@ -256,7 +256,6 @@ Test-suite testsuite
- test-framework >= 0.8.0.3 && < 0.9,
- test-framework-hunit >= 0.3.0.1 && < 0.4,
- test-framework-quickcheck2 >= 0.3.0.3 && < 0.4,
-- test-framework-smallcheck >= 0.2 && < 0.3,
- text,
- time,
- transformers,
=====================================
patches/snap/1.0.0.2/series deleted
=====================================
--- a/patches/snap/1.0.0.2/series
+++ /dev/null
@@ -1 +0,0 @@
-no-test-framework-smallcheck
=====================================
patches/snap/1.1.0.0/newer-deps
=====================================
--- /dev/null
+++ b/patches/snap/1.1.0.0/newer-deps
@@ -0,0 +1,41 @@
+--- a/snap.cabal
++++ b/snap.cabal
+@@ -103,7 +103,7 @@
+ Snap.Snaplet.Session.SecureCookie
+
+ build-depends:
+- aeson >= 0.6 && < 1.3,
++ aeson >= 0.6 && < 1.4,
+ attoparsec >= 0.10 && < 0.14,
+ base >= 4 && < 4.11,
+ bytestring >= 0.9.1 && < 0.11,
+@@ -119,16 +119,16 @@
+ -- snap does work with hashable 1.1.*, but some have complained that
+ -- the version disjunction causes problems with dependency resolution.
+ hashable >= 1.2.0.6 && < 1.3,
+- heist >= 1.0 && < 1.1,
+- lens >= 3.7.6 && < 4.16,
++ heist >= 1.0 && < 1.2,
++ lens >= 3.7.6 && < 4.17,
+ lifted-base >= 0.2 && < 0.3,
+- map-syntax >= 0.2 && < 0.3,
++ map-syntax >= 0.2 && < 0.4,
+ monad-control >= 0.3 && < 1.1,
+ mtl >= 2.0 && < 2.3,
+ mwc-random >= 0.8 && < 0.14,
+ pwstore-fast >= 2.2 && < 2.5,
+ snap-core >= 1.0 && < 1.1,
+- snap-server >= 1.0 && < 1.1,
++ snap-server >= 1.0 && < 1.2,
+ stm >= 2.2 && < 2.5,
+ text >= 0.11 && < 1.3,
+ time >= 1.1 && < 1.9,
+@@ -220,7 +220,7 @@
+
+ build-depends:
+ aeson,
+- async >= 2.0.1.5 && < 2.2,
++ async >= 2.0.1.5 && < 2.3,
+ attoparsec,
+ base,
+ bytestring,
=====================================
patches/snap/1.1.0.0/no-test-framework-smallcheck
=====================================
--- /dev/null
+++ b/patches/snap/1.1.0.0/no-test-framework-smallcheck
@@ -0,0 +1,29 @@
+--- a/snap.cabal
++++ b/snap.cabal
+@@ -254,7 +254,6 @@
+ test-framework >= 0.8.0.3 && < 0.9,
+ test-framework-hunit >= 0.3.0.1 && < 0.4,
+ test-framework-quickcheck2 >= 0.3.0.3 && < 0.4,
+- test-framework-smallcheck >= 0.2 && < 0.3,
+ text,
+ time,
+ transformers,
+--- a/test/suite/Snap/Snaplet/Internal/Tests.hs
++++ b/test/suite/Snap/Snaplet/Internal/Tests.hs
+@@ -16,7 +16,6 @@
+ import System.Directory (getCurrentDirectory)
+ import Test.Framework (Test, testGroup)
+ import Test.Framework.Providers.HUnit (testCase)
+-import Test.Framework.Providers.SmallCheck (testProperty)
+ import Test.HUnit hiding (Test, path)
+ import Test.SmallCheck ((==>))
+ ------------------------------------------------------------------------------
+@@ -124,7 +123,7 @@
+ tests :: Test
+ tests = testGroup "Snap.Snaplet.Internal"
+ [ testCase "initializer tests" initTest
+- , testProperty "buildPath generates no double slashes" doubleSlashes
++-- , testProperty "buildPath generates no double slashes" doubleSlashes
+ ]
+
+ --doubleSlashes :: Monad m => [String] -> Property m
=====================================
patches/snap/1.1.0.0/rename-snap-binary
=====================================
--- /dev/null
+++ b/patches/snap/1.1.0.0/rename-snap-binary
@@ -0,0 +1,17 @@
+Description: Rename snap binary
+ To avoid a conflict
+Author: Joachim Breitner <nomeata at debian.org>
+Bug-Debian: http://bugs.debian.org/741503
+Forwarded: not-needed
+
+--- a/snap.cabal
++++ b/snap.cabal
+@@ -14,7 +14,7 @@ description:
+ @$ cabal install snap snap-templates
+ $ mkdir myproject
+ $ cd myproject
+- $ snap init@
++ $ snap-framework init@
+ .
+ If you have trouble or any questions, see our FAQ page
+ (<http://snapframework.com/faq>) or the documentation
=====================================
patches/snap/1.1.0.0/series
=====================================
--- /dev/null
+++ b/patches/snap/1.1.0.0/series
@@ -0,0 +1,4 @@
+rename-snap-binary
+no-test-framework-smallcheck
+tests-timeout
+newer-deps
=====================================
patches/snap/1.1.0.0/tests-timeout
=====================================
--- /dev/null
+++ b/patches/snap/1.1.0.0/tests-timeout
@@ -0,0 +1,18 @@
+Description: Increase timeout for tests
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Forwarded: https://github.com/snapframework/snap/issues/195
+---
+
+Index: b/test/suite/Snap/Snaplet/Test/Tests.hs
+===================================================================
+--- a/test/suite/Snap/Snaplet/Test/Tests.hs
++++ b/test/suite/Snap/Snaplet/Test/Tests.hs
+@@ -121,7 +121,7 @@ readRequestBodyHangIssue =
+ assertReadRqBody =
+ do let hdl = readRequestBody 5000 >>= writeLBS
+ res <- race
+- (threadDelay 1000000)
++ (threadDelay 100000000)
+ (runHandler Nothing (ST.get "" Map.empty) hdl appInit)
+ either (assertFailure . ("readRequestBody timeout" ++) . show)
+ (either (assertFailure . show) ST.assertSuccess) res
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/4a6c2962ebd016a5bc0b208f302db5d4f6ba7f0f
---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/4a6c2962ebd016a5bc0b208f302db5d4f6ba7f0f
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/20180522/bf28df30/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list