Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-servant-server for openSUSE:Factory checked in at 2022-08-01 21:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-servant-server (Old) and /work/SRC/openSUSE:Factory/.ghc-servant-server.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-servant-server" Mon Aug 1 21:31:14 2022 rev:6 rq:987144 version:0.19.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-servant-server/ghc-servant-server.changes 2022-02-11 23:11:34.123320674 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-servant-server.new.1533/ghc-servant-server.changes 2022-08-01 21:31:59.713931243 +0200 @@ -1,0 +2,22 @@ +Tue Mar 29 16:33:37 UTC 2022 - Peter Simons <[email protected]> + +- Update servant-server to version 0.19.1 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Mon Mar 21 14:54:33 UTC 2022 - Peter Simons <[email protected]> + +- Update servant-server to version 0.19.1 revision 1. + 0.19.1 + ------ + + - Add `MonadFail` instance for `Handler` wrt [#1545](https://github.com/haskell-servant/servant/issues/1545) + - Support GHC 9.2 [#1525](https://github.com/haskell-servant/servant/issues/1525) + +------------------------------------------------------------------- +Wed Feb 23 10:00:38 UTC 2022 - Peter Simons <[email protected]> + +- Update servant-server to version 0.19 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- Old: ---- servant-server-0.19.tar.gz New: ---- servant-server-0.19.1.tar.gz servant-server.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-servant-server.spec ++++++ --- /var/tmp/diff_new_pack.kLKrY5/_old 2022-08-01 21:32:00.405933228 +0200 +++ /var/tmp/diff_new_pack.kLKrY5/_new 2022-08-01 21:32:00.409933239 +0200 @@ -19,12 +19,13 @@ %global pkg_name servant-server %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.19 +Version: 0.19.1 Release: 0 Summary: A family of combinators for defining webservices APIs and serving them License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel @@ -93,7 +94,8 @@ %prep %autosetup -n %{pkg_name}-%{version} -cabal-tweak-dep-ver base-compat '< 0.12' '< 1' +cp -p %{SOURCE1} %{pkg_name}.cabal +cabal-tweak-dep-ver http-api-data '< 0.4.4' '< 1' %build %ghc_lib_build ++++++ servant-server-0.19.tar.gz -> servant-server-0.19.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-server-0.19/CHANGELOG.md new/servant-server-0.19.1/CHANGELOG.md --- old/servant-server-0.19/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/servant-server-0.19.1/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -3,6 +3,12 @@ Package versions follow the [Package Versioning Policy](https://pvp.haskell.org/): in A.B.C, bumps to either A or B represent major versions. +0.19.1 +------ + +- Add `MonadFail` instance for `Handler` wrt [#1545](https://github.com/haskell-servant/servant/issues/1545) +- Support GHC 9.2 [#1525](https://github.com/haskell-servant/servant/issues/1525) + 0.19 ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-server-0.19/servant-server.cabal new/servant-server-0.19.1/servant-server.cabal --- old/servant-server-0.19/servant-server.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/servant-server-0.19.1/servant-server.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 2.2 name: servant-server -version: 0.19 +version: 0.19.1 synopsis: A family of combinators for defining webservices APIs and serving them category: Servant, Web @@ -60,12 +60,12 @@ -- Bundled with GHC: Lower bound to not force re-installs -- text and mtl are bundled starting with GHC-8.4 build-depends: - base >= 4.9 && < 4.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , constraints >= 0.2 && < 0.14 , containers >= 0.5.7.1 && < 0.7 , mtl >= 2.2.2 && < 2.3 - , text >= 1.2.3.0 && < 1.3 + , text >= 1.2.3.0 && < 2.1 , transformers >= 0.5.2.0 && < 0.6 , filepath >= 1.4.1.1 && < 1.5 @@ -78,7 +78,7 @@ -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.5 && < 0.12 + base-compat >= 0.10.5 && < 0.13 , base64-bytestring >= 1.0.0.1 && < 1.3 , exceptions >= 0.10.0 && < 0.11 , http-media >= 0.7.1.3 && < 0.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-server-0.19/src/Servant/Server/Internal/Handler.hs new/servant-server-0.19.1/src/Servant/Server/Internal/Handler.hs --- old/servant-server-0.19/src/Servant/Server/Internal/Handler.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/servant-server-0.19.1/src/Servant/Server/Internal/Handler.hs 2001-09-09 03:46:40.000000000 +0200 @@ -13,17 +13,19 @@ import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow) import Control.Monad.Error.Class - (MonadError) + (MonadError, throwError) import Control.Monad.IO.Class (MonadIO) import Control.Monad.Trans.Control (MonadBaseControl (..)) import Control.Monad.Trans.Except (ExceptT, runExceptT) +import Data.String + (fromString) import GHC.Generics (Generic) import Servant.Server.Internal.ServerError - (ServerError) + (ServerError, errBody, err500) newtype Handler a = Handler { runHandler' :: ExceptT ServerError IO a } deriving @@ -32,6 +34,9 @@ , MonadThrow, MonadCatch, MonadMask ) +instance MonadFail Handler where + fail str = throwError err500 { errBody = fromString str } + instance MonadBase IO Handler where liftBase = Handler . liftBase diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-server-0.19/src/Servant/Server/Internal.hs new/servant-server-0.19.1/src/Servant/Server/Internal.hs --- old/servant-server-0.19/src/Servant/Server/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/servant-server-0.19.1/src/Servant/Server/Internal.hs 2001-09-09 03:46:40.000000000 +0200 @@ -41,7 +41,7 @@ import qualified Data.ByteString.Builder as BB import qualified Data.ByteString.Char8 as BC8 import qualified Data.ByteString.Lazy as BL -import Data.Constraint (Dict(..)) +import Data.Constraint (Constraint, Dict(..)) import Data.Either (partitionEithers) import Data.Maybe @@ -821,7 +821,7 @@ -- Erroring instance for 'HasServer' when a combinator is not fully applied instance TypeError (PartialApplication HasServer arr) => HasServer ((arr :: a -> b) :> sub) context where - type ServerT (arr :> sub) _ = TypeError (PartialApplication HasServer arr) + type ServerT (arr :> sub) _ = TypeError (PartialApplication (HasServer :: * -> [*] -> Constraint) arr) route = error "unreachable" hoistServerWithContext _ _ _ _ = error "unreachable" ++++++ servant-server.cabal ++++++ cabal-version: 2.2 name: servant-server version: 0.19.1 x-revision: 2 synopsis: A family of combinators for defining webservices APIs and serving them category: Servant, Web description: A family of combinators for defining webservices APIs and serving them . You can learn about the basics in the <http://docs.servant.dev/en/stable/tutorial/index.html tutorial>. . <https://github.com/haskell-servant/servant/blob/master/servant-server/example/greet.hs Here> is a runnable example, with comments, that defines a dummy API and implements a webserver that serves this API, using this package. . <https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md CHANGELOG> homepage: http://docs.servant.dev/ bug-reports: http://github.com/haskell-servant/servant/issues license: BSD-3-Clause license-file: LICENSE author: Servant Contributors maintainer: [email protected] copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 extra-source-files: CHANGELOG.md README.md source-repository head type: git location: http://github.com/haskell-servant/servant.git library exposed-modules: Servant Servant.Server Servant.Server.Experimental.Auth Servant.Server.Generic Servant.Server.Internal Servant.Server.Internal.BasicAuth Servant.Server.Internal.Context Servant.Server.Internal.Delayed Servant.Server.Internal.DelayedIO Servant.Server.Internal.ErrorFormatter Servant.Server.Internal.Handler Servant.Server.Internal.RouteResult Servant.Server.Internal.Router Servant.Server.Internal.RoutingApplication Servant.Server.Internal.ServerError Servant.Server.StaticFiles Servant.Server.UVerb -- deprecated exposed-modules: Servant.Utils.StaticFiles -- Bundled with GHC: Lower bound to not force re-installs -- text and mtl are bundled starting with GHC-8.4 build-depends: base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , constraints >= 0.2 && < 0.14 , containers >= 0.5.7.1 && < 0.7 , mtl >= 2.2.2 && < 2.3 , text >= 1.2.3.0 && < 2.1 , transformers >= 0.5.2.0 && < 0.6 , filepath >= 1.4.1.1 && < 1.5 -- Servant dependencies -- strict dependency as we re-export 'servant' things. build-depends: servant >= 0.19 && < 0.20 , http-api-data >= 0.4.1 && < 0.4.4 -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: base-compat >= 0.10.5 && < 0.13 , base64-bytestring >= 1.0.0.1 && < 1.3 , exceptions >= 0.10.0 && < 0.11 , http-media >= 0.7.1.3 && < 0.9 , http-types >= 0.12.2 && < 0.13 , network-uri >= 2.6.1.0 && < 2.8 , monad-control >= 1.0.2.3 && < 1.1 , network >= 2.8 && < 3.2 , sop-core >= 0.4.0.0 && < 0.6 , string-conversions >= 0.4.0.1 && < 0.5 , resourcet >= 1.2.2 && < 1.3 , tagged >= 0.8.6 && < 0.9 , transformers-base >= 0.4.5.2 && < 0.5 , wai >= 3.2.1.2 && < 3.3 , wai-app-static >= 3.1.6.2 && < 3.2 , word8 >= 0.1.3 && < 0.2 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall -Wno-redundant-constraints executable greet main-is: greet.hs hs-source-dirs: example ghc-options: -Wall default-language: Haskell2010 build-depends: base , base-compat , servant , servant-server , wai , text build-depends: aeson >= 1.4.1.0 && < 3 , warp >= 3.2.25 && < 3.4 test-suite spec type: exitcode-stdio-1.0 ghc-options: -Wall default-language: Haskell2010 hs-source-dirs: test main-is: Spec.hs other-modules: Servant.ArbitraryMonadServerSpec Servant.Server.ErrorSpec Servant.Server.Internal.ContextSpec Servant.Server.Internal.RoutingApplicationSpec Servant.Server.RouterSpec Servant.Server.StaticFilesSpec Servant.Server.StreamingSpec Servant.Server.UsingContextSpec Servant.Server.UsingContextSpec.TestCombinators Servant.HoistSpec Servant.ServerSpec -- Dependencies inherited from the library. No need to specify bounds. build-depends: base , base-compat , base64-bytestring , bytestring , http-types , mtl , resourcet , safe , servant , servant-server , sop-core , string-conversions , text , transformers , transformers-compat , wai -- Additional dependencies build-depends: aeson >= 1.4.1.0 && < 3 , directory >= 1.3.0.0 && < 1.4 , hspec >= 2.6.0 && < 2.10 , hspec-wai >= 0.10.1 && < 0.12 , QuickCheck >= 2.12.6.1 && < 2.15 , should-not-typecheck >= 2.1.0 && < 2.2 , temporary >= 1.3 && < 1.4 , wai-extra >= 3.0.24.3 && < 3.2 build-tool-depends: hspec-discover:hspec-discover >= 2.6.0 && <2.10
