commit ghc-yesod-core for openSUSE:Factory

2020-10-23 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2020-10-23 15:15:33

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.3463 (New)


Package is "ghc-yesod-core"

Fri Oct 23 15:15:33 2020 rev:5 rq:842777 version:1.6.18.5

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2020-09-30 19:53:51.308755946 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.3463/ghc-yesod-core.changes  
2020-10-23 15:15:41.462173135 +0200
@@ -1,0 +2,8 @@
+Tue Oct 20 02:03:09 UTC 2020 - psim...@suse.com
+
+- Update yesod-core to version 1.6.18.5.
+  ## 1.6.18.5
+
+  Document `ErrorResponse` [#1698](https://github.com/yesodweb/yesod/pull/1698)
+
+---

Old:

  yesod-core-1.6.18.4.tar.gz

New:

  yesod-core-1.6.18.5.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.vAjEP8/_old  2020-10-23 15:15:42.818173789 +0200
+++ /var/tmp/diff_new_pack.vAjEP8/_new  2020-10-23 15:15:42.818173789 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.6.18.4
+Version:1.6.18.5
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT

++ yesod-core-1.6.18.4.tar.gz -> yesod-core-1.6.18.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.6.18.4/ChangeLog.md 
new/yesod-core-1.6.18.5/ChangeLog.md
--- old/yesod-core-1.6.18.4/ChangeLog.md2020-09-22 16:30:38.0 
+0200
+++ new/yesod-core-1.6.18.5/ChangeLog.md2020-10-19 16:16:40.0 
+0200
@@ -1,5 +1,9 @@
 # ChangeLog for yesod-core
 
+## 1.6.18.5
+
+Document `ErrorResponse` [#1698](https://github.com/yesodweb/yesod/pull/1698)
+
 ## 1.6.18.4
 
 * Fixed a bug where `mkYesod` and other TH functions didn't work for datatypes 
with explicitly stated type variables, including the case with typeclass 
constraints. [https://github.com/yesodweb/yesod/pull/1697](#1697)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.6.18.4/src/Yesod/Core/Types.hs 
new/yesod-core-1.6.18.5/src/Yesod/Core/Types.hs
--- old/yesod-core-1.6.18.4/src/Yesod/Core/Types.hs 2020-06-24 
09:26:46.0 +0200
+++ new/yesod-core-1.6.18.5/src/Yesod/Core/Types.hs 2020-10-19 
16:16:40.0 +0200
@@ -326,11 +326,28 @@
 -- | Responses to indicate some form of an error occurred.
 data ErrorResponse =
   NotFound
+-- ^ The requested resource was not found.
+-- Examples of when this occurs include when an incorrect URL is used, 
or @yesod-persistent@'s 'get404' doesn't find a value.
+-- HTTP status: 404.
 | InternalError !Text
+-- ^ Some sort of unexpected exception.
+-- If your application uses `throwIO` or `error` to throw an 
exception, this is the form it would take.
+-- HTTP status: 500.
 | InvalidArgs ![Text]
+-- ^ Indicates some sort of invalid or missing argument, like a 
missing query parameter or malformed JSON body.
+-- Examples Yesod functions that send this include 
'requireCheckJsonBody' and @Yesod.Auth.GoogleEmail2@.
+-- HTTP status: 400.
 | NotAuthenticated
+-- ^ Indicates the user is not logged in.
+-- This is thrown when 'isAuthorized' returns 'AuthenticationRequired'.
+-- HTTP code: 401.
 | PermissionDenied !Text
+-- ^ Indicates the user doesn't have permission to access the 
requested resource.
+-- This is thrown when 'isAuthorized' returns 'Unauthorized'.
+-- HTTP code: 403.
 | BadMethod !H.Method
+-- ^ Indicates the URL would have been valid if used with a different 
HTTP method (e.g. a GET was used, but only POST is handled.)
+-- HTTP code: 405.
 deriving (Show, Eq, Generic)
 instance NFData ErrorResponse
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.6.18.4/yesod-core.cabal 
new/yesod-core-1.6.18.5/yesod-core.cabal
--- old/yesod-core-1.6.18.4/yesod-core.cabal2020-09-22 16:35:45.0 
+0200
+++ new/yesod-core-1.6.18.5/yesod-core.cabal2020-10-19 16:16:40.0 
+0200
@@ -1,5 +1,5 @@
 name:yesod-core
-version: 1.6.18.4
+version: 1.6.18.5
 license: MIT
 license-file:LICENSE
 author:  Michael Snoyman

commit ghc-yesod-core for openSUSE:Factory

2020-09-30 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2020-09-30 19:53:48

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.4249 (New)


Package is "ghc-yesod-core"

Wed Sep 30 19:53:48 2020 rev:4 rq:838498 version:1.6.18.4

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2020-09-07 22:04:42.510130386 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.4249/ghc-yesod-core.changes  
2020-09-30 19:53:51.308755946 +0200
@@ -1,0 +2,20 @@
+Thu Sep 24 02:00:45 UTC 2020 - psim...@suse.com
+
+- Update yesod-core to version 1.6.18.4.
+  ## 1.6.18.4
+
+  * Fixed a bug where `mkYesod` and other TH functions didn't work for 
datatypes with explicitly stated type variables, including the case with 
typeclass constraints. [https://github.com/yesodweb/yesod/pull/1697](#1697)
+
+  ## 1.6.18.3
+
+  * Remove mention of an oudated Yesod type (`GHandler`) from the docs for 
`handlerToIO`. [https://github.com/yesodweb/yesod/pull/1695](#1695)
+
+  ## 1.6.18.2
+
+  * Recommends `.yesodroutes` as the file extension for Yesod routes files. 
[#1686](https://github.com/yesodweb/yesod/pull/1686)
+
+  ## 1.6.18.1
+
+  * Increase the size of CSRF token
+
+---

Old:

  yesod-core-1.6.18.tar.gz
  yesod-core.cabal

New:

  yesod-core-1.6.18.4.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.tKANfn/_old  2020-09-30 19:53:51.976756543 +0200
+++ /var/tmp/diff_new_pack.tKANfn/_new  2020-09-30 19:53:51.980756546 +0200
@@ -19,13 +19,12 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.6.18
+Version:1.6.18.4
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT
 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/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-auto-update-devel
@@ -90,7 +89,6 @@
 
 %prep
 %autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build

++ yesod-core-1.6.18.tar.gz -> yesod-core-1.6.18.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.6.18/ChangeLog.md 
new/yesod-core-1.6.18.4/ChangeLog.md
--- old/yesod-core-1.6.18/ChangeLog.md  2020-03-31 15:21:34.0 +0200
+++ new/yesod-core-1.6.18.4/ChangeLog.md2020-09-22 16:30:38.0 
+0200
@@ -1,5 +1,21 @@
 # ChangeLog for yesod-core
 
+## 1.6.18.4
+
+* Fixed a bug where `mkYesod` and other TH functions didn't work for datatypes 
with explicitly stated type variables, including the case with typeclass 
constraints. [https://github.com/yesodweb/yesod/pull/1697](#1697)
+
+## 1.6.18.3
+
+* Remove mention of an oudated Yesod type (`GHandler`) from the docs for 
`handlerToIO`. [https://github.com/yesodweb/yesod/pull/1695](#1695)
+
+## 1.6.18.2
+
+* Recommends `.yesodroutes` as the file extension for Yesod routes files. 
[#1686](https://github.com/yesodweb/yesod/pull/1686)
+
+## 1.6.18.1
+
+* Increase the size of CSRF token
+
 ## 1.6.18
 
 * Add functions for setting description and OG meta 
[#1663](https://github.com/yesodweb/yesod/pull/1663)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.6.18/src/Yesod/Core/Class/Yesod.hs 
new/yesod-core-1.6.18.4/src/Yesod/Core/Class/Yesod.hs
--- old/yesod-core-1.6.18/src/Yesod/Core/Class/Yesod.hs 2020-01-18 
18:38:53.0 +0100
+++ new/yesod-core-1.6.18.4/src/Yesod/Core/Class/Yesod.hs   2020-09-22 
16:35:10.0 +0200
@@ -531,8 +531,8 @@
 => WidgetFor site ()
 -> HandlerFor site (PageContent (Route site))
 widgetToPageContent w = do
-  jsAttrs <- jsAttributesHandler
-  HandlerFor $ \hd -> do
+ jsAttrs <- jsAttributesHandler
+ HandlerFor $ \hd -> do
   master <- unHandlerFor getYesod hd
   ref <- newIORef mempty
   unWidgetFor w WidgetData
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.6.18/src/Yesod/Core/Handler.hs 
new/yesod-core-1.6.18.4/src/Yesod/Core/Handler.hs
--- old/yesod-core-1.6.18/src/Yesod/Core/Handler.hs 2020-02-11 
07:44:48.0 +0100
+++ new/yesod-core-1.6.18.4/src/Yesod/Core/Handler.hs   2020-09-22 
16:36:23.0 +0200
@@ -9,6

commit ghc-yesod-core for openSUSE:Factory

2020-09-07 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2020-09-07 22:04:41

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.3399 (New)


Package is "ghc-yesod-core"

Mon Sep  7 22:04:41 2020 rev:3 rq:832344 version:1.6.18

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2020-08-28 21:41:57.672900148 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.3399/ghc-yesod-core.changes  
2020-09-07 22:04:42.510130386 +0200
@@ -1,0 +2,6 @@
+Mon Aug 31 09:34:33 UTC 2020 - psim...@suse.com
+
+- Update yesod-core to version 1.6.18 revision 1.
+  Upstream has revised the Cabal build instructions on Hackage.
+
+---



Other differences:
--

commit ghc-yesod-core for openSUSE:Factory

2020-08-28 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2020-08-28 21:41:56

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.3399 (New)


Package is "ghc-yesod-core"

Fri Aug 28 21:41:56 2020 rev:2 rq:829510 version:1.6.18

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2020-06-19 17:06:19.412939985 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new.3399/ghc-yesod-core.changes  
2020-08-28 21:41:57.672900148 +0200
@@ -1,0 +2,10 @@
+Wed Aug 19 08:14:02 UTC 2020 - Michel Normand 
+
+- Add _constraints with 6GB min disk space for ppc64/ppc64le
+
+---
+Tue Aug 18 10:46:46 UTC 2020 - Peter Simons 
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---

New:

  _constraints
  yesod-core.cabal



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.0JNwqM/_old  2020-08-28 21:41:58.204900344 +0200
+++ /var/tmp/diff_new_pack.0JNwqM/_new  2020-08-28 21:41:58.204900344 +0200
@@ -25,6 +25,7 @@
 License:MIT
 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/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-auto-update-devel
@@ -88,7 +89,8 @@
 This package provides the Haskell %{pkg_name} library development files.
 
 %prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build

++ _constraints ++

  

  ppc64
  ppc64le



  6


  


++ yesod-core.cabal ++
name:yesod-core
version: 1.6.18
x-revision: 1
license: MIT
license-file:LICENSE
author:  Michael Snoyman 
maintainer:  Michael Snoyman 
synopsis:Creation of type-safe, RESTful web applications.
description: API docs and the README are available at 

category:Web, Yesod
stability:   Stable
cabal-version:   >= 1.8
build-type:  Simple
homepage:http://www.yesodweb.com/
extra-source-files:
  test/YesodCoreTest.hs
  test/YesodCoreTest/*.hs
  test/YesodCoreTest/JsLoaderSites/Bottom.hs
  test/en.msg
  test/test.hs
  test/fixtures/routes_with_line_continuations
  ChangeLog.md
  README.md

library
hs-source-dirs: src

build-depends:   base  >= 4.10 && < 5
   , aeson >= 1.0
   , auto-update
   , blaze-html>= 0.5
   , blaze-markup  >= 0.7.1
   , bytestring>= 0.10.2
   , case-insensitive  >= 0.2
   , cereal>= 0.3
   , clientsession >= 0.9.1&& < 0.10
   , conduit   >= 1.3
   , conduit-extra
   , containers>= 0.2
   , cookie>= 0.4.3&& < 0.5
   , deepseq   >= 1.3
   , fast-logger   >= 2.2
   , http-types>= 0.7
   , memory
   , monad-logger  >= 0.3.10   && < 0.4
   , mtl
   , parsec>= 2&& < 3.2
   , path-pieces   >= 0.1.2&& < 0.3
   , primitive >= 0.6
   , random>= 1.0.0.2  && < 1.3
   , resourcet >= 1.2
   , shakespeare   >= 2.0
   , template-haskell  >= 2.11
   , text  >= 0.7
   , time  >= 1.5
   , transformers  >= 0.4
   , unix-compat
   , unliftio
   , unordered-containers  >= 0.2
   , vector>= 0.9  && < 0.13
   , wai   >= 3.2
   , wai-extra >= 3.0.7
   , wai-logger>= 0.2
   , warp  >= 3.0.2
   , word8

exposed-modules: Yesod.Core
 Yesod.Core.Content
 Yesod.Core.Dispatch

commit ghc-yesod-core for openSUSE:Factory

2017-08-31 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2017-08-31 21:02:05

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Thu Aug 31 21:02:05 2017 rev:14 rq:513546 version:1.4.35.1

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2017-06-21 13:56:42.971394153 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2017-08-31 21:02:07.083747614 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 14:07:14 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.35.1.
+
+---

Old:

  yesod-core-1.4.35.tar.gz
  yesod-core.cabal

New:

  yesod-core-1.4.35.1.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.onLI8E/_old  2017-08-31 21:02:08.259582406 +0200
+++ /var/tmp/diff_new_pack.onLI8E/_new  2017-08-31 21:02:08.283579035 +0200
@@ -19,14 +19,13 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.35
+Version:1.4.35.1
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT
 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
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-auto-update-devel
@@ -105,7 +104,6 @@
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build

++ yesod-core-1.4.35.tar.gz -> yesod-core-1.4.35.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.35/ChangeLog.md 
new/yesod-core-1.4.35.1/ChangeLog.md
--- old/yesod-core-1.4.35/ChangeLog.md  2017-06-05 10:33:22.0 +0200
+++ new/yesod-core-1.4.35.1/ChangeLog.md2017-07-20 12:58:03.0 
+0200
@@ -1,3 +1,7 @@
+## 1.4.35.1
+
+* TH fix for GHC 8.2
+
 ## 1.4.35
 
 * Contexts can be included in generated TH instances. 
[1365](https://github.com/yesodweb/yesod/issues/1365)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.35/Yesod/Routes/TH/RenderRoute.hs 
new/yesod-core-1.4.35.1/Yesod/Routes/TH/RenderRoute.hs
--- old/yesod-core-1.4.35/Yesod/Routes/TH/RenderRoute.hs2017-06-05 
10:33:22.0 +0200
+++ new/yesod-core-1.4.35.1/Yesod/Routes/TH/RenderRoute.hs  2017-07-20 
12:41:52.0 +0200
@@ -160,7 +160,7 @@
 (cons, decs) <- mkRouteCons ress
 #if MIN_VERSION_template_haskell(2,12,0)
 did <- DataInstD [] ''Route [typ] Nothing cons <$> fmap (pure . 
DerivClause Nothing) (mapM conT (clazzes False))
-let sds = fmap (\t -> StandaloneDerivD cxt $ ConT t `AppT` ( ConT ''Route 
`AppT` typ)) (clazzes True)
+let sds = fmap (\t -> StandaloneDerivD Nothing cxt $ ConT t `AppT` ( ConT 
''Route `AppT` typ)) (clazzes True)
 #elif MIN_VERSION_template_haskell(2,11,0)
 did <- DataInstD [] ''Route [typ] Nothing cons <$> mapM conT (clazzes 
False)
 let sds = fmap (\t -> StandaloneDerivD cxt $ ConT t `AppT` ( ConT ''Route 
`AppT` typ)) (clazzes True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.35/yesod-core.cabal 
new/yesod-core-1.4.35.1/yesod-core.cabal
--- old/yesod-core-1.4.35/yesod-core.cabal  2017-06-05 10:33:22.0 
+0200
+++ new/yesod-core-1.4.35.1/yesod-core.cabal2017-07-20 12:57:56.0 
+0200
@@ -1,5 +1,5 @@
 name:yesod-core
-version: 1.4.35
+version: 1.4.35.1
 license: MIT
 license-file:LICENSE
 author:  Michael Snoyman

commit ghc-yesod-core for openSUSE:Factory

2017-06-21 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2017-06-21 13:56:42

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Wed Jun 21 13:56:42 2017 rev:13 rq:504684 version:1.4.35

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2017-05-10 20:50:13.829277587 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2017-06-21 13:56:42.971394153 +0200
@@ -1,0 +2,5 @@
+Mon Jun 12 09:41:42 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.35 revision 1.
+
+---

Old:

  yesod-core-1.4.33.tar.gz

New:

  yesod-core-1.4.35.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.BtkTaZ/_old  2017-06-21 13:56:45.703008836 +0200
+++ /var/tmp/diff_new_pack.BtkTaZ/_new  2017-06-21 13:56:45.707008272 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.33
+Version:1.4.35
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT

++ yesod-core-1.4.33.tar.gz -> yesod-core-1.4.35.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.33/ChangeLog.md 
new/yesod-core-1.4.35/ChangeLog.md
--- old/yesod-core-1.4.33/ChangeLog.md  2017-03-26 17:14:25.0 +0200
+++ new/yesod-core-1.4.35/ChangeLog.md  2017-06-05 10:33:22.0 +0200
@@ -1,3 +1,12 @@
+## 1.4.35
+
+* Contexts can be included in generated TH instances. 
[1365](https://github.com/yesodweb/yesod/issues/1365)
+* Type variables can be included in routes.
+
+## 1.4.34
+
+* Add `WaiSubsiteWithAuth`. 
[#1394](https://github.com/yesodweb/yesod/pull/1394)
+
 ## 1.4.33
 
 * Adds curly brackets to route parser. 
[#1363](https://github.com/yesodweb/yesod/pull/1363)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.33/Yesod/Core/Class/Dispatch.hs 
new/yesod-core-1.4.35/Yesod/Core/Class/Dispatch.hs
--- old/yesod-core-1.4.33/Yesod/Core/Class/Dispatch.hs  2016-09-25 
13:37:06.0 +0200
+++ new/yesod-core-1.4.35/Yesod/Core/Class/Dispatch.hs  2017-05-12 
07:26:42.0 +0200
@@ -10,7 +10,7 @@
 import qualified Network.Wai as W
 import Yesod.Core.Types
 import Yesod.Core.Content
-import Yesod.Core.Handler (stripHandlerT)
+import Yesod.Core.Handler (sendWaiApplication, stripHandlerT)
 import Yesod.Core.Class.Yesod
 import Yesod.Core.Class.Handler
 
@@ -28,6 +28,15 @@
   where
 WaiSubsite app = ysreGetSub $ yreSite ysreParentEnv
 
+instance YesodSubDispatch WaiSubsiteWithAuth (HandlerT master IO) where
+  yesodSubDispatch YesodSubRunnerEnv {..} req =
+  ysreParentRunner base ysreParentEnv (fmap ysreToParentRoute route) req
+where
+  base  = stripHandlerT handlert ysreGetSub ysreToParentRoute route
+  route = Just $ WaiSubsiteWithAuthRoute (W.pathInfo req) []
+  WaiSubsiteWithAuth set = ysreGetSub $ yreSite $ ysreParentEnv
+  handlert = sendWaiApplication $ set
+
 -- | A helper function for creating YesodSubDispatch instances, used by the
 -- internal generated code. This function has been exported since 1.4.11.
 -- It promotes a subsite handler to a wai application.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.33/Yesod/Core/Dispatch.hs 
new/yesod-core-1.4.35/Yesod/Core/Dispatch.hs
--- old/yesod-core-1.4.33/Yesod/Core/Dispatch.hs2016-12-07 
14:51:04.0 +0100
+++ new/yesod-core-1.4.35/Yesod/Core/Dispatch.hs2017-05-12 
07:26:42.0 +0200
@@ -34,6 +34,7 @@
 , defaultMiddlewaresNoLogging
   -- * WAI subsites
 , WaiSubsite (..)
+, WaiSubsiteWithAuth (..)
 , subHelper
 ) where
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.33/Yesod/Core/Internal/TH.hs 
new/yesod-core-1.4.35/Yesod/Core/Internal/TH.hs
--- old/yesod-core-1.4.33/Yesod/Core/Internal/TH.hs 2016-09-25 
13:37:06.0 +0200
+++ new/yesod-core-1.4.35/Yesod/Core/Internal/TH.hs 2017-06-05 
10:33:22.0 +0200
@@ -4,6 +4,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE FlexibleContexts #-}
 module Yesod.Core.Internal.TH where
 
 import Prelude hiding (exp)
@@ -15,12 +16,18 @@
 import qualified Network.Wai as W
 
 import Data.ByteString.Lazy.Char8 ()
+#if MIN_VERSION_base(4,8,0)
+import Data.List

commit ghc-yesod-core for openSUSE:Factory

2017-05-10 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2017-05-10 20:50:12

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Wed May 10 20:50:12 2017 rev:12 rq:491529 version:1.4.33

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2017-04-11 09:44:04.182349137 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2017-05-10 20:50:13.829277587 +0200
@@ -1,0 +2,10 @@
+Wed Apr 19 13:32:11 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.33 revision 1 with cabal2obs.
+
+---
+Sun Apr  9 18:08:06 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.33 with cabal2obs.
+
+---

Old:

  yesod-core-1.4.32.tar.gz

New:

  yesod-core-1.4.33.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.fcI0q9/_old  2017-05-10 20:50:16.176946310 +0200
+++ /var/tmp/diff_new_pack.fcI0q9/_new  2017-05-10 20:50:16.180945746 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.32
+Version:1.4.33
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT

++ yesod-core-1.4.32.tar.gz -> yesod-core-1.4.33.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.32/ChangeLog.md 
new/yesod-core-1.4.33/ChangeLog.md
--- old/yesod-core-1.4.32/ChangeLog.md  2017-03-01 07:53:06.0 +0100
+++ new/yesod-core-1.4.33/ChangeLog.md  2017-03-26 17:14:25.0 +0200
@@ -1,3 +1,7 @@
+## 1.4.33
+
+* Adds curly brackets to route parser. 
[#1363](https://github.com/yesodweb/yesod/pull/1363)
+
 ## 1.4.32
 
 * Fix warnings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.32/Yesod/Routes/Parse.hs 
new/yesod-core-1.4.33/Yesod/Routes/Parse.hs
--- old/yesod-core-1.4.32/Yesod/Routes/Parse.hs 2017-02-07 16:18:21.0 
+0100
+++ new/yesod-core-1.4.33/Yesod/Routes/Parse.hs 2017-03-26 17:13:58.0 
+0200
@@ -13,7 +13,7 @@
 ) where
 
 import Language.Haskell.TH.Syntax
-import Data.Char (isUpper)
+import Data.Char (isUpper, isSpace)
 import Language.Haskell.TH.Quote
 import qualified System.IO as SIO
 import Yesod.Routes.TH
@@ -86,7 +86,7 @@
 spaces = takeWhile (== ' ') thisLine
 (others, remainder) = parse indent otherLines'
 (this, otherLines') =
-case takeWhile (not . isPrefixOf "--") $ words thisLine of
+case takeWhile (not . isPrefixOf "--") $ splitSpaces thisLine of
 (pattern:rest0)
 | Just (constr:rest) <- stripColonLast rest0
 , Just attrs <- mapM parseAttr rest ->
@@ -102,6 +102,26 @@
 [] -> (id, otherLines)
 _ -> error $ "Invalid resource line: " ++ thisLine
 
+-- | Splits a string by spaces, as long as the spaces are not enclosed by 
curly brackets (not recursive).
+splitSpaces :: String -> [String]
+splitSpaces "" = []
+splitSpaces str = 
+let (rest, piece) = parse $ dropWhile isSpace str in
+piece:(splitSpaces rest)
+
+where 
+parse :: String -> ( String, String)
+parse ('{':s) = fmap ('{':) $ parseBracket s
+parse (c:s) | isSpace c = (s, [])
+parse (c:s) = fmap (c:) $ parse s
+parse "" = ("", "")
+
+parseBracket :: String -> ( String, String)
+parseBracket ('{':_) = error $ "Invalid resource line (nested curly 
bracket): " ++ str
+parseBracket ('}':s) = fmap ('}':) $ parse s
+parseBracket (c:s) = fmap (c:) $ parseBracket s
+parseBracket "" = error $ "Invalid resource line (unclosed curly 
bracket): " ++ str
+
 piecesFromStringCheck :: String -> ([Piece String], Maybe String, Bool)
 piecesFromStringCheck s0 =
 (pieces, mmulti, check)
@@ -181,7 +201,7 @@
 parseTypeTree orig =
 toTypeTree pieces
   where
-pieces = filter (not . null) $ splitOn '-' $ addDashes orig
+pieces = filter (not . null) $ splitOn (\c -> c == '-' || c == ' ') $ 
addDashes orig
 addDashes [] = []
 addDashes (x:xs) =
 front $ addDashes xs
@@ -194,7 +214,7 @@
 _:y -> x : splitOn c y
 [] -> [x]
   where
-(x, y') = break (== c) s
+(x, y') = break c s
 
 data TypeTree = TTTerm String
   | TTApp TypeTree TypeTree
@@ -237,9 +257,9 @@
 ttToType (TTList t) = ListT

commit ghc-yesod-core for openSUSE:Factory

2017-04-11 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2017-04-11 09:43:59

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Tue Apr 11 09:43:59 2017 rev:11 rq:485177 version:1.4.32

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2017-02-21 13:46:10.247658930 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2017-04-11 09:44:04.182349137 +0200
@@ -1,0 +2,10 @@
+Wed Mar 22 09:03:58 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.32 revision 1 with cabal2obs.
+
+---
+Tue Mar  7 11:19:29 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.32 with cabal2obs.
+
+---

Old:

  yesod-core-1.4.31.tar.gz

New:

  yesod-core-1.4.32.tar.gz
  yesod-core.cabal



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.cuhdnB/_old  2017-04-11 09:44:05.938101113 +0200
+++ /var/tmp/diff_new_pack.cuhdnB/_new  2017-04-11 09:44:05.938101113 +0200
@@ -19,13 +19,14 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.31
+Version:1.4.32
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT
 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
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-auto-update-devel
@@ -104,6 +105,7 @@
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build

++ yesod-core-1.4.31.tar.gz -> yesod-core-1.4.32.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.31/ChangeLog.md 
new/yesod-core-1.4.32/ChangeLog.md
--- old/yesod-core-1.4.31/ChangeLog.md  2017-02-02 06:52:44.0 +0100
+++ new/yesod-core-1.4.32/ChangeLog.md  2017-03-01 07:53:06.0 +0100
@@ -1,3 +1,10 @@
+## 1.4.32
+
+* Fix warnings
+* Route parsing handles CRLF line endings
+* Add 'getPostParams' in Yesod.Core.Handler
+* Haddock rendering improved.
+
 ## 1.4.31
 
 * Add `parseCheckJsonBody` and `requireCheckJsonBody`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.31/Yesod/Core/Class/Handler.hs 
new/yesod-core-1.4.32/Yesod/Core/Class/Handler.hs
--- old/yesod-core-1.4.31/Yesod/Core/Class/Handler.hs   2017-02-03 
06:23:23.0 +0100
+++ new/yesod-core-1.4.32/Yesod/Core/Class/Handler.hs   2017-02-05 
13:38:01.0 +0100
@@ -5,6 +5,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} -- Because of ErrorT
 module Yesod.Core.Class.Handler
 ( MonadHandler (..)
 , MonadWidget (..)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.31/Yesod/Core/Class/Yesod.hs 
new/yesod-core-1.4.32/Yesod/Core/Class/Yesod.hs
--- old/yesod-core-1.4.31/Yesod/Core/Class/Yesod.hs 2016-12-08 
02:06:37.0 +0100
+++ new/yesod-core-1.4.32/Yesod/Core/Class/Yesod.hs 2017-02-05 
13:38:01.0 +0100
@@ -442,10 +442,9 @@
 -- headers are ignored over HTTP.
 --
 -- Since 1.4.7
-sslOnlyMiddleware :: Yesod site
- => Int -- ^ minutes
- -> HandlerT site IO res
- -> HandlerT site IO res
+sslOnlyMiddleware :: Int -- ^ minutes
+  -> HandlerT site IO res
+  -> HandlerT site IO res
 sslOnlyMiddleware timeout handler = do
 addHeader "Strict-Transport-Security"
   $ T.pack $ concat [ "max-age="
@@ -496,8 +495,7 @@
 -- For details, see the "AJAX CSRF protection" section of "Yesod.Core.Handler".
 --
 -- Since 1.4.14
-csrfCheckMiddleware :: Yesod site
-=> HandlerT site IO res
+csrfCheckMiddleware :: HandlerT site IO res
 -> HandlerT site IO Bool -- ^ Whether or not to perform 
the CSRF check.
 -> CI S8.ByteString -- ^ The header name to lookup the 
CSRF token from.
 -> Text -- ^ The POST parameter name to lookup the CSRF 
token from.
@@ -512,7 +510,7 @@
 --

commit ghc-yesod-core for openSUSE:Factory

2017-02-21 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2017-02-21 13:46:09

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2017-02-03 17:40:39.427597549 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2017-02-21 13:46:10.247658930 +0100
@@ -1,0 +2,5 @@
+Sun Feb  5 19:31:39 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.31 with cabal2obs.
+
+---

Old:

  yesod-core-1.4.30.tar.gz
  yesod-core.cabal

New:

  yesod-core-1.4.31.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.FLg55k/_old  2017-02-21 13:46:10.691596301 +0100
+++ /var/tmp/diff_new_pack.FLg55k/_new  2017-02-21 13:46:10.695595736 +0100
@@ -19,14 +19,13 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.30
+Version:1.4.31
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT
 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
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-auto-update-devel
@@ -105,7 +104,6 @@
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build
@@ -128,5 +126,6 @@
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%doc ChangeLog.md README.md
 
 %changelog

++ yesod-core-1.4.30.tar.gz -> yesod-core-1.4.31.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.30/ChangeLog.md 
new/yesod-core-1.4.31/ChangeLog.md
--- old/yesod-core-1.4.30/ChangeLog.md  2016-12-11 14:34:13.0 +0100
+++ new/yesod-core-1.4.31/ChangeLog.md  2017-02-02 06:52:44.0 +0100
@@ -1,3 +1,7 @@
+## 1.4.31
+
+* Add `parseCheckJsonBody` and `requireCheckJsonBody`
+
 ## 1.4.30
 
 * Add `defaultMessageWidget`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.30/Yesod/Core/Json.hs 
new/yesod-core-1.4.31/Yesod/Core/Json.hs
--- old/yesod-core-1.4.30/Yesod/Core/Json.hs2016-12-11 14:34:13.0 
+0100
+++ new/yesod-core-1.4.31/Yesod/Core/Json.hs2017-02-02 06:54:42.0 
+0100
@@ -13,8 +13,10 @@
 
   -- * Convert to a JSON value
 , parseJsonBody
+, parseCheckJsonBody
 , parseJsonBody_
 , requireJsonBody
+, requireCheckJsonBody
 
   -- * Produce JSON values
 , J.Value (..)
@@ -33,7 +35,7 @@
 , acceptsJson
 ) where
 
-import Yesod.Core.Handler (HandlerT, getRequest, invalidArgs, redirect, 
selectRep, provideRep, rawRequestBody, ProvidedRep)
+import Yesod.Core.Handler (HandlerT, getRequest, invalidArgs, redirect, 
selectRep, provideRep, rawRequestBody, ProvidedRep, lookupHeader)
 import Control.Monad.Trans.Writer (Writer)
 import Data.Monoid (Endo)
 import Yesod.Core.Content (TypedContent)
@@ -121,6 +123,15 @@
 Left e -> J.Error $ show e
 Right value -> J.fromJSON value
 
+-- | Same as 'parseJsonBody', but ensures that the mime type indicates
+-- JSON content.
+parseCheckJsonBody :: (MonadHandler m, J.FromJSON a) => m (J.Result a)
+parseCheckJsonBody = do
+mct <- lookupHeader "content-type"
+case fmap (B8.takeWhile (/= ';')) mct of
+Just "application/json" -> parseJsonBody
+_ -> return $ J.Error $ "Non-JSON content type: " ++ show mct
+
 -- | Same as 'parseJsonBody', but return an invalid args response on a parse
 -- error.
 parseJsonBody_ :: (MonadHandler m, J.FromJSON a) => m a
@@ -135,6 +146,15 @@
 case ra of
 J.Error s -> invalidArgs [pack s]
 J.Success a -> return a
+
+-- | Same as 'requireJsonBody', but ensures that the mime type
+-- indicates JSON content.
+requireCheckJsonBody :: (MonadHandler m, J.FromJSON a) => m a
+requireCheckJsonBody = do
+ra <- parseCheckJsonBody
+case ra of
+J.Error s -> invalidArgs [pack s]
+J.Success a -> return a
 
 -- | Convert a list of values to an 'J.Array'.
 array :: J.ToJSON a => [a] -> J.Value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.30/Yesod/Core.hs

commit ghc-yesod-core for openSUSE:Factory

2017-02-03 Thread root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2017-01-31 12:45:30

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2017-01-12 15:53:22.152404770 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2017-02-03 17:40:39.427597549 +0100
@@ -1,0 +2,5 @@
+Mon Jan 16 10:00:50 UTC 2017 - psim...@suse.com
+
+- Update to version 1.4.30 revision 1 with cabal2obs.
+
+---

New:

  yesod-core.cabal



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.Lvh6jl/_old  2017-02-03 17:40:39.891531883 +0100
+++ /var/tmp/diff_new_pack.Lvh6jl/_new  2017-02-03 17:40:39.891531883 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package ghc
+# spec file for package ghc-yesod-core
 #
-# 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
@@ -26,6 +26,7 @@
 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
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-auto-update-devel
@@ -104,6 +105,7 @@
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build
@@ -126,6 +128,5 @@
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-%doc ChangeLog.md README.md
 
 %changelog

++ yesod-core.cabal ++
name:yesod-core
version: 1.4.30
x-revision: 1
license: MIT
license-file:LICENSE
author:  Michael Snoyman 
maintainer:  Michael Snoyman 
synopsis:Creation of type-safe, RESTful web applications.
description: API docs and the README are available at 

category:Web, Yesod
stability:   Stable
cabal-version:   >= 1.8
build-type:  Simple
homepage:http://www.yesodweb.com/
extra-source-files:
  test.hs
  test/YesodCoreTest.hs
  test/YesodCoreTest/*.hs
  test/YesodCoreTest/JsLoaderSites/Bottom.hs
  test/en.msg
  test/test.hs
  ChangeLog.md
  README.md

library
build-depends:   base  >= 4.6  && < 5
   , time  >= 1.1.4
   , wai   >= 3.0
   , wai-extra >= 3.0.7
   , bytestring>= 0.10
   , text  >= 0.7
   , template-haskell
   , path-pieces   >= 0.1.2&& < 0.3
   , shakespeare   >= 2.0
   , blaze-builder >= 0.2.1.4  && < 0.5
   , transformers  >= 0.2.2
   , mtl
   , clientsession >= 0.9.1&& < 0.10
   , random>= 1.0.0.2  && < 1.2
   , cereal>= 0.3
   , old-locale>= 1.0.0.2  && < 1.1
   , containers>= 0.2
   , unordered-containers  >= 0.2
   , monad-control >= 0.3  && < 1.1
   , transformers-base >= 0.4
   , cookie>= 0.4.2&& < 0.5
   , http-types>= 0.7
   , case-insensitive  >= 0.2
   , parsec>= 2&& < 3.2
   , directory >= 1
   , vector>= 0.9  && < 0.13
   , aeson >= 0.5
   , fast-logger   >= 2.2
   , wai-logger>= 0.2
   , monad-logger  >= 0.3.1&& < 0.4
   , conduit   >= 1.2
   , resourcet >= 0.4.9&& < 1.2
   , lifted-base   >= 0.1.2
   , blaze-html>= 0.5
   , blaze-markup  >= 0.7.1
   , data-default
   , safe
   , warp

commit ghc-yesod-core for openSUSE:Factory

2016-10-22 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2016-10-22 13:21:23

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2016-08-26 23:17:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2016-10-22 13:21:24.0 +0200
@@ -1,0 +2,10 @@
+Sat Oct  1 17:18:12 UTC 2016 - psim...@suse.com
+
+- Update to version 1.4.25 with cabal2obs.
+
+---
+Thu Sep 15 06:53:57 UTC 2016 - psim...@suse.com
+
+- Update to version 1.4.24 revision 0 with cabal2obs.
+
+---

Old:

  yesod-core-1.4.23.tar.gz

New:

  yesod-core-1.4.25.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.XfM06V/_old  2016-10-22 13:21:25.0 +0200
+++ /var/tmp/diff_new_pack.XfM06V/_new  2016-10-22 13:21:25.0 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.23
+Version:1.4.25
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT

++ yesod-core-1.4.23.tar.gz -> yesod-core-1.4.25.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.23/ChangeLog.md 
new/yesod-core-1.4.25/ChangeLog.md
--- old/yesod-core-1.4.23/ChangeLog.md  2016-08-10 14:21:43.0 +0200
+++ new/yesod-core-1.4.25/ChangeLog.md  2016-09-26 06:19:15.0 +0200
@@ -1,3 +1,16 @@
+## 1.4.25
+
+* Add instance of MonadHandler and MonadWidget for ExceptT 
[#1278](https://github.com/yesodweb/yesod/pull/1278)
+
+## 1.4.24
+
+* cached and cachedBy will not overwrite global state changes 
[#1268](https://github.com/yesodweb/yesod/pull/1268)
+
+## 1.4.23.1
+
+* Don't allow sending multiple cookies with the same name to the client, in 
accordance with [RFC 6265](https://tools.ietf.org/html/rfc6265). This fixes an 
issue where multiple CSRF tokens were sent to the client. 
[#1258](https://github.com/yesodweb/yesod/pull/1258)
+* Default CSRF tokens to the root path "/", fixing an issue where multiple 
tokens were stored in cookies, and using the wrong one led to CSRF errors 
[#1248](https://github.com/yesodweb/yesod/pull/1248)
+
 ## 1.4.23
 
 * urlParamRenderOverride method for Yesod class 
[#1257](https://github.com/yesodweb/yesod/pull/1257)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.23/Yesod/Core/Class/Handler.hs 
new/yesod-core-1.4.25/Yesod/Core/Class/Handler.hs
--- old/yesod-core-1.4.23/Yesod/Core/Class/Handler.hs   2016-08-10 
14:21:43.0 +0200
+++ new/yesod-core-1.4.25/Yesod/Core/Class/Handler.hs   2016-09-26 
06:19:15.0 +0200
@@ -24,6 +24,9 @@
 import Control.Monad.Trans.List ( ListT)
 import Control.Monad.Trans.Maybe( MaybeT   )
 import Control.Monad.Trans.Error( ErrorT, Error)
+#if MIN_VERSION_transformers(0,4,0)
+import Control.Monad.Trans.Except   ( ExceptT  )
+#endif
 import Control.Monad.Trans.Reader   ( ReaderT  )
 import Control.Monad.Trans.State( StateT   )
 import Control.Monad.Trans.Writer   ( WriterT  )
@@ -55,6 +58,9 @@
 GO(ListT)
 GO(MaybeT)
 GOX(Error e, ErrorT e)
+#if MIN_VERSION_transformers(0,4,0)
+GO(ExceptT e)
+#endif
 GO(ReaderT r)
 GO(StateT s)
 GOX(Monoid w, WriterT w)
@@ -78,6 +84,9 @@
 GO(ListT)
 GO(MaybeT)
 GOX(Error e, ErrorT e)
+#if MIN_VERSION_transformers(0,4,0)
+GO(ExceptT e)
+#endif
 GO(ReaderT r)
 GO(StateT s)
 GOX(Monoid w, WriterT w)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.23/Yesod/Core/Class/Yesod.hs 
new/yesod-core-1.4.25/Yesod/Core/Class/Yesod.hs
--- old/yesod-core-1.4.23/Yesod/Core/Class/Yesod.hs 2016-08-10 
14:21:43.0 +0200
+++ new/yesod-core-1.4.25/Yesod/Core/Class/Yesod.hs 2016-09-26 
06:19:15.0 +0200
@@ -419,9 +419,9 @@
 -- all responses so that browsers will rewrite all http links to https
 -- until the timeout expires. For security, the max-age of the STS header
 -- should always equal or exceed the client sessions timeout. This defends
--- against hijacking attacks on the sessions of users who attempt to access
--- the site using an http url. This middleware makes a site functionally
--- inaccessible over vanilla http in all standard browsers.
+-- against SSL-stripping man-in-the-middle attacks. It is only effective if
+-- a secure

commit ghc-yesod-core for openSUSE:Factory

2016-08-26 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2016-08-26 23:17:27

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2016-07-20 09:23:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2016-08-26 23:17:29.0 +0200
@@ -1,0 +2,5 @@
+Wed Aug 17 18:34:36 UTC 2016 - psim...@suse.com
+
+- Update to version 1.4.23 revision 0 with cabal2obs.
+
+---

Old:

  yesod-core-1.4.22.tar.gz

New:

  yesod-core-1.4.23.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.RGVvqs/_old  2016-08-26 23:17:31.0 +0200
+++ /var/tmp/diff_new_pack.RGVvqs/_new  2016-08-26 23:17:31.0 +0200
@@ -19,15 +19,14 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.22
+Version:1.4.23
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT
-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-aeson-devel
 BuildRequires:  ghc-auto-update-devel
 BuildRequires:  ghc-blaze-builder-devel
@@ -87,7 +86,6 @@
 BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-streaming-commons-devel
 %endif
-# End cabal-rpm deps
 
 %description
 API docs and the README are available at
@@ -107,20 +105,14 @@
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
-
 %build
 %ghc_lib_build
 
-
 %install
 %ghc_lib_install
 
-
 %check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
 
 %post devel
 %ghc_pkg_recache

++ yesod-core-1.4.22.tar.gz -> yesod-core-1.4.23.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.22/ChangeLog.md 
new/yesod-core-1.4.23/ChangeLog.md
--- old/yesod-core-1.4.22/ChangeLog.md  2016-06-27 09:45:17.0 +0200
+++ new/yesod-core-1.4.23/ChangeLog.md  2016-08-10 14:21:43.0 +0200
@@ -1,3 +1,8 @@
+## 1.4.23
+
+* urlParamRenderOverride method for Yesod class 
[#1257](https://github.com/yesodweb/yesod/pull/1257)
+* Add laxSameSiteSessions and strictSameSiteSessions 
[#1226](https://github.com/yesodweb/yesod/pull/1226)
+
 ## 1.4.22
 
 * Proper handling of impure exceptions within `HandlerError` values
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.22/Yesod/Core/Class/Dispatch.hs 
new/yesod-core-1.4.23/Yesod/Core/Class/Dispatch.hs
--- old/yesod-core-1.4.22/Yesod/Core/Class/Dispatch.hs  2016-06-27 
09:45:17.0 +0200
+++ new/yesod-core-1.4.23/Yesod/Core/Class/Dispatch.hs  2016-08-10 
14:21:43.0 +0200
@@ -1,7 +1,6 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts  #-}
@@ -25,10 +24,9 @@
  -> W.Application
 
 instance YesodSubDispatch WaiSubsite master where
-yesodSubDispatch YesodSubRunnerEnv {..} req =
-app req
+yesodSubDispatch YesodSubRunnerEnv {..} = app
   where
-WaiSubsite app = ysreGetSub $ yreSite $ ysreParentEnv
+WaiSubsite app = ysreGetSub $ yreSite ysreParentEnv
 
 -- | A helper function for creating YesodSubDispatch instances, used by the
 -- internal generated code. This function has been exported since 1.4.11.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.22/Yesod/Core/Class/Yesod.hs 
new/yesod-core-1.4.23/Yesod/Core/Class/Yesod.hs
--- old/yesod-core-1.4.22/Yesod/Core/Class/Yesod.hs 2016-06-27 
09:45:17.0 +0200
+++ new/yesod-core-1.4.23/Yesod/Core/Class/Yesod.hs 2016-08-10 
14:21:43.0 +0200
@@ -5,26 +5,28 @@
 {-# LANGUAGE CPP   #-}
 module Yesod.Core.Class.Yesod where
 
-import   Control.Monad.Logger   (logErrorS)
 import   Yesod.Core.Content
 import   Yesod.Core.Handler
 
 import   Yesod.Routes.Class
 
-import   Blaze.ByteString.Builder   (Builder)
-import   Blaze.ByteString.Builder.Char.Utf8 (fromText)
+import

commit ghc-yesod-core for openSUSE:Factory

2016-07-20 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2016-07-20 09:23:02

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2016-07-07 15:10:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2016-07-20 09:23:03.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:17:14 UTC 2016 - psim...@suse.com
+
+- Update to version 1.4.22 revision 0 with cabal2obs.
+
+---



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.g8uGzE/_old  2016-07-20 09:23:04.0 +0200
+++ /var/tmp/diff_new_pack.g8uGzE/_new  2016-07-20 09:23:04.0 +0200
@@ -109,11 +109,11 @@
 
 
 %build
-%{ghc_lib_build}
+%ghc_lib_build
 
 
 %install
-%{ghc_lib_install}
+%ghc_lib_install
 
 
 %check
@@ -123,12 +123,10 @@
 
 
 %post devel
-%{ghc_pkg_recache}
-
+%ghc_pkg_recache
 
 %postun devel
-%{ghc_pkg_recache}
-
+%ghc_pkg_recache
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -136,6 +134,6 @@
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-%doc README.md
+%doc ChangeLog.md README.md
 
 %changelog

commit ghc-yesod-core for openSUSE:Factory

2016-07-07 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2016-07-07 15:10:29

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2016-07-01 09:58:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2016-07-07 15:10:29.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun 30 13:28:15 UTC 2016 - mimi...@gmail.com
+
+- update to 1.4.22
+* Proper handling of impure exceptions within HandlerError values
+
+---

Old:

  yesod-core-1.4.21.tar.gz

New:

  yesod-core-1.4.22.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.GNQHCg/_old  2016-07-07 15:10:31.0 +0200
+++ /var/tmp/diff_new_pack.GNQHCg/_new  2016-07-07 15:10:31.0 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.21
+Version:1.4.22
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT
@@ -44,6 +44,7 @@
 BuildRequires:  ghc-cookie-devel
 BuildRequires:  ghc-data-default-devel
 BuildRequires:  ghc-deepseq-devel
+BuildRequires:  ghc-deepseq-generics-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-exceptions-devel
 BuildRequires:  ghc-fast-logger-devel

++ yesod-core-1.4.21.tar.gz -> yesod-core-1.4.22.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.21/ChangeLog.md 
new/yesod-core-1.4.22/ChangeLog.md
--- old/yesod-core-1.4.21/ChangeLog.md  2016-06-20 16:31:06.0 +0200
+++ new/yesod-core-1.4.22/ChangeLog.md  2016-06-27 09:45:17.0 +0200
@@ -1,3 +1,7 @@
+## 1.4.22
+
+* Proper handling of impure exceptions within `HandlerError` values
+
 ## 1.4.21
 
 * Add support for `Encoding` from `aeson-0.11` 
[#1241](https://github.com/yesodweb/yesod/pull/1241)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.21/Yesod/Core/Internal/Run.hs 
new/yesod-core-1.4.22/Yesod/Core/Internal/Run.hs
--- old/yesod-core-1.4.21/Yesod/Core/Internal/Run.hs2016-06-20 
16:31:06.0 +0200
+++ new/yesod-core-1.4.22/Yesod/Core/Internal/Run.hs2016-06-27 
09:45:17.0 +0200
@@ -4,43 +4,36 @@
 {-# LANGUAGE RankNTypes#-}
 {-# LANGUAGE RecordWildCards   #-}
 {-# LANGUAGE TemplateHaskell   #-}
+{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE FlexibleContexts  #-}
 module Yesod.Core.Internal.Run where
 
 
 #if __GLASGOW_HASKELL__ < 710
-import   Data.Monoid  (mempty)
+import   Data.Monoid  (Monoid, mempty)
 #endif
 import Yesod.Core.Internal.Response
 import   Blaze.ByteString.Builder (toByteString)
 import   Control.Exception(fromException, evaluate)
 import qualified Control.Exceptionas E
-import   Control.Exception.Lifted (catch)
-import   Control.Monad(mplus)
-import   Control.Monad.IO.Class   (MonadIO)
-import   Control.Monad.IO.Class   (liftIO)
+import   Control.Monad.IO.Class   (MonadIO, liftIO)
 import   Control.Monad.Logger (LogLevel (LevelError), 
LogSource,
liftLoc)
-import   Control.Monad.Trans.Resource (runResourceT, 
withInternalState, runInternalState)
+import   Control.Monad.Trans.Resource (runResourceT, 
withInternalState, runInternalState, InternalState)
 import qualified Data.ByteString  as S
 import qualified Data.ByteString.Char8as S8
 import qualified Data.IORef   as I
 import qualified Data.Map as Map
-import   Data.Maybe   (isJust)
-import   Data.Maybe   (fromMaybe)
+import   Data.Maybe   (isJust, fromMaybe)
 import   Data.Monoid  (appEndo)
 import   Data.Text(Text)
 import qualified Data.Textas T
-import   Data.Text.Encoding   (encodeUtf8)
-import   Data.Text.Encoding   (decodeUtf8With)
+import   Data.Text.Encoding   (encodeUtf8, decodeUtf8With)
 import   Data.Text.Encoding.Error (lenientDecode)
 import   Language.Haskell.TH.Syntax   (Loc, qLocation)
 import qualified Network.HTTP.Types   as H
 import

commit ghc-yesod-core for openSUSE:Factory

2016-07-01 Thread h_root 
Hello community,

here is the log from the commit of package ghc-yesod-core for openSUSE:Factory 
checked in at 2016-07-01 09:58:52

Comparing /work/SRC/openSUSE:Factory/ghc-yesod-core (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-yesod-core.new (New)


Package is "ghc-yesod-core"

Changes:

--- /work/SRC/openSUSE:Factory/ghc-yesod-core/ghc-yesod-core.changes
2016-05-03 09:36:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yesod-core.new/ghc-yesod-core.changes   
2016-07-01 09:58:53.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 21 04:59:53 UTC 2016 - mimi...@gmail.com
+
+- update to 1.4.21
+* Add support for Encoding from aeson-0.11
+
+---

Old:

  yesod-core-1.4.20.2.tar.gz

New:

  yesod-core-1.4.21.tar.gz



Other differences:
--
++ ghc-yesod-core.spec ++
--- /var/tmp/diff_new_pack.WIvPXN/_old  2016-07-01 09:58:54.0 +0200
+++ /var/tmp/diff_new_pack.WIvPXN/_new  2016-07-01 09:58:54.0 +0200
@@ -19,7 +19,7 @@
 %global pkg_name yesod-core
 %bcond_with tests
 Name:   ghc-%{pkg_name}
-Version:1.4.20.2
+Version:1.4.21
 Release:0
 Summary:Creation of type-safe, RESTful web applications
 License:MIT

++ yesod-core-1.4.20.2.tar.gz -> yesod-core-1.4.21.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.20.2/ChangeLog.md 
new/yesod-core-1.4.21/ChangeLog.md
--- old/yesod-core-1.4.20.2/ChangeLog.md2016-04-25 15:57:33.0 
+0200
+++ new/yesod-core-1.4.21/ChangeLog.md  2016-06-20 16:31:06.0 +0200
@@ -1,3 +1,7 @@
+## 1.4.21
+
+* Add support for `Encoding` from `aeson-0.11` 
[#1241](https://github.com/yesodweb/yesod/pull/1241)
+
 ## 1.4.20.2
 
 * GHC 8 support
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.20.2/Yesod/Core/Class/Yesod.hs 
new/yesod-core-1.4.21/Yesod/Core/Class/Yesod.hs
--- old/yesod-core-1.4.20.2/Yesod/Core/Class/Yesod.hs   2016-03-21 
11:57:27.0 +0100
+++ new/yesod-core-1.4.21/Yesod/Core/Class/Yesod.hs 2016-06-20 
16:31:06.0 +0200
@@ -226,11 +226,7 @@
 messageLoggerSource site = defaultMessageLoggerSource $ shouldLogIO site
 
 -- | Where to Load sripts from. We recommend the default value,
--- 'BottomOfBody'.  Alternatively use the built in async yepnope loader:
---
--- > BottomOfHeadAsync $ loadJsYepnope $ Right $ StaticR js_modernizr_js
---
--- Or write your own async js loader.
+-- 'BottomOfBody'.
 jsLoader :: site -> ScriptLoadPosition site
 jsLoader _ = BottomOfBody
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.20.2/Yesod/Core/Content.hs 
new/yesod-core-1.4.21/Yesod/Core/Content.hs
--- old/yesod-core-1.4.20.2/Yesod/Core/Content.hs   2015-11-24 
03:34:45.0 +0100
+++ new/yesod-core-1.4.21/Yesod/Core/Content.hs 2016-06-20 16:31:06.0 
+0200
@@ -251,9 +251,20 @@
 #else
   . fromValue
 #endif
+
+#if MIN_VERSION_aeson(0, 11, 0)
+instance ToContent J.Encoding where
+toContent = flip ContentBuilder Nothing . J.fromEncoding
+#endif
+
 instance HasContentType J.Value where
 getContentType _ = typeJson
 
+#if MIN_VERSION_aeson(0, 11, 0)
+instance HasContentType J.Encoding where
+getContentType _ = typeJson
+#endif
+
 instance HasContentType Html where
 getContentType _ = typeHtml
 
@@ -289,6 +300,10 @@
 toTypedContent (RepXml c) = TypedContent typeXml c
 instance ToTypedContent J.Value where
 toTypedContent v = TypedContent typeJson (toContent v)
+#if MIN_VERSION_aeson(0, 11, 0)
+instance ToTypedContent J.Encoding where
+toTypedContent e = TypedContent typeJson (toContent e)
+#endif
 instance ToTypedContent Html where
 toTypedContent h = TypedContent typeHtml (toContent h)
 instance ToTypedContent T.Text where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yesod-core-1.4.20.2/Yesod/Core/Json.hs 
new/yesod-core-1.4.21/Yesod/Core/Json.hs
--- old/yesod-core-1.4.20.2/Yesod/Core/Json.hs  2015-11-24 03:34:45.0 
+0100
+++ new/yesod-core-1.4.21/Yesod/Core/Json.hs2016-06-20 16:31:06.0 
+0200
@@ -6,6 +6,9 @@
   defaultLayoutJson
 , jsonToRepJson
 , returnJson
+#if MIN_VERSION_aeson(0, 11, 0)
+, returnJsonEncoding
+#endif
 , provideJson
 
   -- * Convert to a JSON value
@@ -24,6 +27,9 @@
 
   -- * Convenience functions
 , jsonOrRedirect
+#if MIN_VERSION_aeson(0, 11, 0)
+, jsonEncodingOrRedirect
+#endif
 , acceptsJson
 ) where
 
@@ -52,35 +58,51 @@
 -- data, using the default layout