Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-yesod-persistent for
openSUSE:Factory checked in at 2026-06-22 17:44:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-yesod-persistent (Old)
and /work/SRC/openSUSE:Factory/.ghc-yesod-persistent.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yesod-persistent"
Mon Jun 22 17:44:18 2026 rev:9 rq:1361110 version:1.6.0.9
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-yesod-persistent/ghc-yesod-persistent.changes
2023-04-04 21:25:44.331004525 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-yesod-persistent.new.1956/ghc-yesod-persistent.changes
2026-06-22 17:44:52.630223448 +0200
@@ -1,0 +2,9 @@
+Tue Jun 16 20:33:49 UTC 2026 - Peter Simons <[email protected]>
+
+- Update yesod-persistent to version 1.6.0.9.
+ * Support `yesod-core` 1.7
+
+- Refresh "dont-depend-on-obsolete-persistent-template.patch" to
+ avoid depending on the obsolete persistent-templates package.
+
+-------------------------------------------------------------------
Old:
----
yesod-persistent-1.6.0.8.tar.gz
New:
----
yesod-persistent-1.6.0.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-yesod-persistent.spec ++++++
--- /var/tmp/diff_new_pack.QLdU1I/_old 2026-06-22 17:44:53.666259760 +0200
+++ /var/tmp/diff_new_pack.QLdU1I/_new 2026-06-22 17:44:53.670259900 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-yesod-persistent
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2026 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,13 +20,13 @@
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.6.0.8
+Version: 1.6.0.9
Release: 0
Summary: Some helpers for using Persistent from Yesod
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Patch0:
https://github.com/yesodweb/yesod/pull/1798.patch#/dont-depend-on-obsolete-persistent-template.patch
+Patch0: dont-depend-on-obsolete-persistent-template.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-base-devel
BuildRequires: ghc-base-prof
@@ -89,7 +89,7 @@
This package provides the Haskell %{pkg_name} profiling library.
%prep
-%autosetup -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version} -p1
%build
%ghc_lib_build
++++++ dont-depend-on-obsolete-persistent-template.patch ++++++
--- /var/tmp/diff_new_pack.QLdU1I/_old 2026-06-22 17:44:53.718261583 +0200
+++ /var/tmp/diff_new_pack.QLdU1I/_new 2026-06-22 17:44:53.726261863 +0200
@@ -1,20 +1,6 @@
-From de8c69c9312a6b88cb4c0395cf4c4d663bfaf1d2 Mon Sep 17 00:00:00 2001
-From: Peter Simons <[email protected]>
-Date: Thu, 30 Mar 2023 09:15:55 +0200
-Subject: [PATCH] yesod-persistent: don't depend on persistent-template if we
- don't have to
-
-If our version of 'persistent' is sufficiently new, then we don't need a
-dependency on the empty 'persistent-template' package.
----
- yesod-persistent/yesod-persistent.cabal | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/yesod-persistent/yesod-persistent.cabal
b/yesod-persistent/yesod-persistent.cabal
-index 4416399b2..4071414e7 100644
---- a/yesod-persistent/yesod-persistent.cabal
-+++ b/yesod-persistent/yesod-persistent.cabal
-@@ -13,12 +13,13 @@ homepage: http://www.yesodweb.com/
+--- yesod-persistent-1.6.0.9-old/yesod-persistent.cabal 2026-06-16
19:53:03.000000000 +0000
++++ yesod-persistent-1.6.0.9-new/yesod-persistent.cabal 2026-06-21
19:36:36.419542342 +0000
+@@ -13,12 +13,13 @@
description: API docs and the README are available at
<http://www.stackage.org/package/yesod-persistent>
extra-source-files: README.md ChangeLog.md
@@ -24,13 +10,13 @@
library
default-language: Haskell2010
build-depends: base >= 4.10 && < 5
- , yesod-core >= 1.6 && < 1.7
+ , yesod-core >= 1.6 && < 1.8
- , persistent >= 2.8
- , persistent-template >= 2.1
, transformers >= 0.2.2
, blaze-builder
, conduit
-@@ -28,6 +29,12 @@ library
+@@ -28,6 +29,12 @@
Yesod.Persist.Core
ghc-options: -Wall
++++++ yesod-persistent-1.6.0.8.tar.gz -> yesod-persistent-1.6.0.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-persistent-1.6.0.8/ChangeLog.md
new/yesod-persistent-1.6.0.9/ChangeLog.md
--- old/yesod-persistent-1.6.0.8/ChangeLog.md 2022-04-15 19:21:53.000000000
+0200
+++ new/yesod-persistent-1.6.0.9/ChangeLog.md 2026-06-16 21:53:03.000000000
+0200
@@ -1,5 +1,9 @@
# ChangeLog for yesod-persistent
+## 1.6.0.9
+
+* Support `yesod-core` 1.7
+
## 1.6.0.8
* Add support for `persistent-2.14`
[#1706](https://github.com/yesodweb/yesod/pull/1760)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-persistent-1.6.0.8/Yesod/Persist/Core.hs
new/yesod-persistent-1.6.0.9/Yesod/Persist/Core.hs
--- old/yesod-persistent-1.6.0.8/Yesod/Persist/Core.hs 2022-04-15
19:21:53.000000000 +0200
+++ new/yesod-persistent-1.6.0.9/Yesod/Persist/Core.hs 2025-07-08
15:43:17.000000000 +0200
@@ -1,9 +1,11 @@
{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
+
-- | Defines the core functionality of this package. This package is
-- distinguished from Yesod.Persist in that the latter additionally exports the
-- persistent modules themselves.
@@ -25,7 +27,6 @@
import Database.Persist
import Control.Monad.Trans.Reader (ReaderT, runReaderT)
-import Data.Foldable (toList)
import Yesod.Core
import Data.Conduit
import Blaze.ByteString.Builder (Builder)
@@ -35,11 +36,9 @@
import Yesod.Core.Types (HandlerContents (HCError))
import qualified Database.Persist.Sql as SQL
#if MIN_VERSION_persistent(2,13,0)
+import Data.List.NonEmpty (toList)
import qualified Database.Persist.SqlBackend.Internal as SQL
#endif
-#if MIN_VERSION_persistent(2,14,0)
-import Database.Persist.Class.PersistEntity
-#endif
unSqlPersistT :: a -> a
unSqlPersistT = id
@@ -99,15 +98,9 @@
-- | Helper for implementing 'getDBRunner'.
--
-- Since 1.2.0
-#if MIN_VERSION_persistent(2,5,0)
defaultGetDBRunner :: (SQL.IsSqlBackend backend, YesodPersistBackend site ~
backend)
=> (site -> Pool backend)
-> HandlerFor site (DBRunner site, HandlerFor site ())
-#else
-defaultGetDBRunner :: YesodPersistBackend site ~ SQL.SqlBackend
- => (site -> Pool SQL.SqlBackend)
- -> HandlerFor site (DBRunner site, HandlerFor site ())
-#endif
defaultGetDBRunner getPool = do
pool <- fmap getPool getYesod
let withPrep conn f = f (persistBackend conn) (SQL.getStmtConn $
persistBackend conn)
@@ -153,15 +146,9 @@
respondSourceDB ctype = respondSource ctype . runDBSource
-- | Get the given entity by ID, or return a 404 not found if it doesn't exist.
-#if MIN_VERSION_persistent(2,5,0)
get404 :: (MonadIO m, PersistStoreRead backend, PersistRecordBackend val
backend)
=> Key val
-> ReaderT backend m val
-#else
-get404 :: (MonadIO m, PersistStore (PersistEntityBackend val), PersistEntity
val)
- => Key val
- -> ReaderT (PersistEntityBackend val) m val
-#endif
get404 key = do
mres <- get key
case mres of
@@ -170,15 +157,9 @@
-- | Get the given entity by unique key, or return a 404 not found if it
doesn't
-- exist.
-#if MIN_VERSION_persistent(2,5,0)
getBy404 :: (PersistUniqueRead backend, PersistRecordBackend val backend,
MonadIO m)
=> Unique val
-> ReaderT backend m (Entity val)
-#else
-getBy404 :: (PersistUnique (PersistEntityBackend val), PersistEntity val,
MonadIO m)
- => Unique val
- -> ReaderT (PersistEntityBackend val) m (Entity val)
-#endif
getBy404 key = do
mres <- getBy key
case mres of
@@ -190,54 +171,46 @@
-- is violated.
--
-- @since 1.4.1
-#if MIN_VERSION_persistent(2,14,0)
-insert400
- :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val
backend, SafeToInsert val)
- => val
- -> ReaderT backend m (Key val)
-#elif MIN_VERSION_persistent(2,5,0)
insert400
- :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val
backend)
+ :: ( MonadIO m
+ , PersistUniqueWrite backend
+ , PersistRecordBackend val backend
+#if MIN_VERSION_persistent(2,14,0)
+ , SafeToInsert val
+#endif
+ )
=> val
-> ReaderT backend m (Key val)
-#else
-insert400
- :: (MonadIO m, PersistUnique (PersistEntityBackend val), PersistEntity val)
- => val
- -> ReaderT (PersistEntityBackend val) m (Key val)
-#endif
insert400 datum = do
conflict <- checkUnique datum
case conflict of
Just unique ->
-#if MIN_VERSION_persistent(2, 12, 0)
--- toList is called here because persistent-2.13 changed this
--- to a nonempty list. for versions of persistent prior to 2.13, toList
--- will be a no-op. for persistent-2.13, it'll convert the NonEmptyList to
--- a List.
- badRequest' $ map (unFieldNameHS . fst) $ toList $
persistUniqueToFieldNames unique
+ badRequest' $ map (getName . fst) $ mkList $
persistUniqueToFieldNames unique
+ Nothing -> insert datum
+ where
+#if MIN_VERSION_persistent(2,12,0)
+ getName = unFieldNameHS
#else
- badRequest' $ map (unHaskellName . fst) $
persistUniqueToFieldNames unique
+ getName = unHaskellName
+#endif
+#if MIN_VERSION_persistent(2,13,0)
+ mkList = toList
+#else
+ mkList = id
#endif
- Nothing -> insert datum
-- | Same as 'insert400', but doesn’t return a key.
--
-- @since 1.4.1
+insert400_ :: ( MonadIO m
+ , PersistUniqueWrite backend
+ , PersistRecordBackend val backend
#if MIN_VERSION_persistent(2,14,0)
-insert400_ :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val
backend, SafeToInsert val)
- => val
- -> ReaderT backend m ()
-
-#elif MIN_VERSION_persistent(2,5,0)
-insert400_ :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val
backend)
+ , SafeToInsert val
+#endif
+ )
=> val
-> ReaderT backend m ()
-#else
-insert400_ :: (MonadIO m, PersistUnique (PersistEntityBackend val),
PersistEntity val)
- => val
- -> ReaderT (PersistEntityBackend val) m ()
-#endif
insert400_ datum = insert400 datum >> return ()
-- | Should be equivalent to @lift . notFound@, but there's an apparent bug in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-persistent-1.6.0.8/test/Yesod/PersistSpec.hs
new/yesod-persistent-1.6.0.9/test/Yesod/PersistSpec.hs
--- old/yesod-persistent-1.6.0.8/test/Yesod/PersistSpec.hs 2021-04-13
17:31:55.000000000 +0200
+++ new/yesod-persistent-1.6.0.9/test/Yesod/PersistSpec.hs 2025-07-08
15:43:17.000000000 +0200
@@ -1,13 +1,19 @@
-{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies #-}
-{-# LANGUAGE EmptyDataDecls, FlexibleContexts, GADTs #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE EmptyDataDecls #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE GADTs #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE UndecidableInstances #-}
+
module Yesod.PersistSpec where
import Test.Hspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-persistent-1.6.0.8/yesod-persistent.cabal
new/yesod-persistent-1.6.0.9/yesod-persistent.cabal
--- old/yesod-persistent-1.6.0.8/yesod-persistent.cabal 2022-04-15
19:21:53.000000000 +0200
+++ new/yesod-persistent-1.6.0.9/yesod-persistent.cabal 2026-06-16
21:53:03.000000000 +0200
@@ -1,6 +1,6 @@
cabal-version: >= 1.10
name: yesod-persistent
-version: 1.6.0.8
+version: 1.6.0.9
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
@@ -16,7 +16,7 @@
library
default-language: Haskell2010
build-depends: base >= 4.10 && < 5
- , yesod-core >= 1.6 && < 1.7
+ , yesod-core >= 1.6 && < 1.8
, persistent >= 2.8
, persistent-template >= 2.1
, transformers >= 0.2.2
@@ -34,6 +34,7 @@
main-is: Spec.hs
hs-source-dirs: test
other-modules: Yesod.PersistSpec
+ build-tool-depends: hspec-discover:hspec-discover
build-depends: base
, hspec
, wai-extra
