Hello community, here is the log from the commit of package ghc-Spock-lucid for openSUSE:Factory checked in at 2017-08-31 20:50:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-Spock-lucid (Old) and /work/SRC/openSUSE:Factory/.ghc-Spock-lucid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-Spock-lucid" Thu Aug 31 20:50:01 2017 rev:2 rq:513196 version:0.4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-Spock-lucid/ghc-Spock-lucid.changes 2017-04-14 13:32:29.199776692 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-Spock-lucid.new/ghc-Spock-lucid.changes 2017-08-31 20:50:02.497534463 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:08:04 UTC 2017 - psim...@suse.com + +- Update to version 0.4.0.0. + +------------------------------------------------------------------- Old: ---- Spock-lucid-0.3.0.0.tar.gz New: ---- Spock-lucid-0.4.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-Spock-lucid.spec ++++++ --- /var/tmp/diff_new_pack.bxom4I/_old 2017-08-31 20:50:03.465398604 +0200 +++ /var/tmp/diff_new_pack.bxom4I/_new 2017-08-31 20:50:03.469398042 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-Spock-lucid # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,22 +18,19 @@ %global pkg_name Spock-lucid Name: ghc-%{pkg_name} -Version: 0.3.0.0 +Version: 0.4.0.0 Release: 0 Summary: Lucid support for Spock License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-Spock-devel -BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-lucid-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Lucid support for Spock. @@ -52,15 +49,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ Spock-lucid-0.3.0.0.tar.gz -> Spock-lucid-0.4.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spock-lucid-0.3.0.0/CHANGELOG.md new/Spock-lucid-0.4.0.0/CHANGELOG.md --- old/Spock-lucid-0.3.0.0/CHANGELOG.md 2016-03-21 22:08:03.000000000 +0100 +++ new/Spock-lucid-0.4.0.0/CHANGELOG.md 2017-02-16 11:59:23.000000000 +0100 @@ -1,3 +1,7 @@ +# 0.4.0.0 + +* Generalized all types by not returning the value (since it can't be used anyway). + # 0.3.0.0 * Added `lucidT`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spock-lucid-0.3.0.0/Spock-lucid.cabal new/Spock-lucid-0.4.0.0/Spock-lucid.cabal --- old/Spock-lucid-0.3.0.0/Spock-lucid.cabal 2016-03-21 22:08:03.000000000 +0100 +++ new/Spock-lucid-0.4.0.0/Spock-lucid.cabal 2017-02-16 11:59:23.000000000 +0100 @@ -1,5 +1,5 @@ name: Spock-lucid -version: 0.3.0.0 +version: 0.4.0.0 synopsis: Lucid support for Spock description: Lucid support for Spock @@ -26,7 +26,6 @@ -- other-extensions: build-depends: Spock >= 0.9 , base >= 4.7 && < 4.10 - , blaze-builder , lucid == 2.* , transformers ghc-options: -Wall -fno-warn-unused-do-bind diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spock-lucid-0.3.0.0/lib/Web/Spock/Lucid.hs new/Spock-lucid-0.4.0.0/lib/Web/Spock/Lucid.hs --- old/Spock-lucid-0.3.0.0/lib/Web/Spock/Lucid.hs 2016-03-21 22:08:03.000000000 +0100 +++ new/Spock-lucid-0.4.0.0/lib/Web/Spock/Lucid.hs 2017-02-16 11:59:23.000000000 +0100 @@ -1,8 +1,5 @@ -{-# LANGUAGE -CPP, -OverloadedStrings, -RankNTypes - #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RankNTypes #-} module Web.Spock.Lucid @@ -19,37 +16,26 @@ import Control.Monad.Trans.Class import Web.Spock import Lucid.Base -import Blaze.ByteString.Builder - -#if !MIN_VERSION_base(4,8,0) -import Data.Monoid (mempty) -#endif -- | Render HTML and send as response body. Content-type will be @text/html@. -lucid :: MonadIO m => Html a -> ActionCtxT cxt m a +lucid :: MonadIO m => Html a -> ActionCtxT cxt m b lucid x = do setHeader "Content-Type" "text/html; charset=utf-8" - let Identity (render, a) = runHtmlT x - lazyBytes (toLazyByteString (render mempty)) - return a + lazyBytes (renderBS x) {-# INLINE lucid #-} -- | Like 'lucid', but for @HtmlT IO@. -lucidIO :: MonadIO m => HtmlT IO a -> ActionCtxT cxt m a +lucidIO :: MonadIO m => HtmlT IO a -> ActionCtxT cxt m b lucidIO x = do setHeader "Content-Type" "text/html; charset=utf-8" - (render, a) <- liftIO (runHtmlT x) - lazyBytes (toLazyByteString (render mempty)) - return a + lazyBytes =<< liftIO (renderBST x) {-# INLINE lucidIO #-} -- | Like 'lucid', but for arbitrary monads. Might require some additional -- boilerplate. -lucidT :: MonadIO m => HtmlT m a -> ActionCtxT cxt m a +lucidT :: MonadIO m => HtmlT m a -> ActionCtxT cxt m b lucidT x = do setHeader "Content-Type" "text/html; charset=utf-8" - (render, a) <- lift (runHtmlT x) - lazyBytes (toLazyByteString (render mempty)) - return a + lazyBytes =<< lift (renderBST x) {-# INLINE lucidT #-}