Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-persistent for openSUSE:Factory checked in at 2023-07-11 15:57:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-persistent (Old) and /work/SRC/openSUSE:Factory/.ghc-persistent.new.8922 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-persistent" Tue Jul 11 15:57:06 2023 rev:38 rq:1098028 version:2.14.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-persistent/ghc-persistent.changes 2023-04-04 21:22:31.433911688 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-persistent.new.8922/ghc-persistent.changes 2023-07-11 15:57:25.537214064 +0200 @@ -1,0 +2,17 @@ +Mon Jul 3 11:31:10 UTC 2023 - Peter Simons <[email protected]> + +- Update persistent to version 2.14.5.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Wed Jun 28 18:54:31 UTC 2023 - Peter Simons <[email protected]> + +- Update persistent to version 2.14.5.1. + ## 2.14.5.1 + + * [#1496](https://github.com/yesodweb/persistent/pull/1496) + * Fixes name shadowing error at the generated `keyFromRecordM` function. + * [#1505](https://github.com/yesodweb/persistent/pull/1505) + * Fixes the comment line parsing rule so that accommodates paragraph breaks. + +------------------------------------------------------------------- Old: ---- persistent-2.14.5.0.tar.gz New: ---- persistent-2.14.5.1.tar.gz persistent.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-persistent.spec ++++++ --- /var/tmp/diff_new_pack.FXmV5r/_old 2023-07-11 15:57:26.653220557 +0200 +++ /var/tmp/diff_new_pack.FXmV5r/_new 2023-07-11 15:57:26.661220603 +0200 @@ -20,12 +20,13 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.14.5.0 +Version: 2.14.5.1 Release: 0 Summary: Type-safe, multi-backend data serialization 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-aeson-prof @@ -130,6 +131,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ persistent-2.14.5.0.tar.gz -> persistent-2.14.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/ChangeLog.md new/persistent-2.14.5.1/ChangeLog.md --- old/persistent-2.14.5.0/ChangeLog.md 2023-03-04 20:05:05.000000000 +0100 +++ new/persistent-2.14.5.1/ChangeLog.md 2023-06-28 20:54:04.000000000 +0200 @@ -1,5 +1,12 @@ # Changelog for persistent +## 2.14.5.1 + +* [#1496](https://github.com/yesodweb/persistent/pull/1496) + * Fixes name shadowing error at the generated `keyFromRecordM` function. +* [#1505](https://github.com/yesodweb/persistent/pull/1505) + * Fixes the comment line parsing rule so that accommodates paragraph breaks. + ## 2.14.5.0 * [#1469](https://github.com/yesodweb/persistent/pull/1469) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/Database/Persist/PersistValue.hs new/persistent-2.14.5.1/Database/Persist/PersistValue.hs --- old/persistent-2.14.5.0/Database/Persist/PersistValue.hs 2022-12-03 01:54:05.000000000 +0100 +++ new/persistent-2.14.5.1/Database/Persist/PersistValue.hs 2023-06-28 20:53:50.000000000 +0200 @@ -23,7 +23,7 @@ import Numeric (readHex, showHex) import qualified Data.Text as Text import Data.Text (Text) -import Data.ByteString (ByteString, foldl') +import Data.ByteString as BS (ByteString, foldl') import Data.Time (Day, TimeOfDay, UTCTime) import Web.PathPieces (PathPiece(..)) import qualified Data.Aeson as A @@ -235,7 +235,7 @@ -- taken from crypto-api bs2i :: ByteString -> Integer - bs2i bs = foldl' (\i b -> (i `shiftL` 8) + fromIntegral b) 0 bs + bs2i bs = BS.foldl' (\i b -> (i `shiftL` 8) + fromIntegral b) 0 bs {-# INLINE bs2i #-} -- showHex of n padded with leading zeros if necessary to fill d digits diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/Database/Persist/Quasi/Internal.hs new/persistent-2.14.5.1/Database/Persist/Quasi/Internal.hs --- old/persistent-2.14.5.0/Database/Persist/Quasi/Internal.hs 2022-10-17 21:15:14.000000000 +0200 +++ new/persistent-2.14.5.1/Database/Persist/Quasi/Internal.hs 2023-06-28 20:53:50.000000000 +0200 @@ -53,8 +53,8 @@ import Prelude hiding (lines) import Control.Applicative (Alternative((<|>))) -import Data.Char (isDigit, isLower, isSpace, isUpper, toLower) import Control.Monad +import Data.Char (isDigit, isLower, isSpace, isUpper, toLower) import Data.List (find, foldl') import Data.List.NonEmpty (NonEmpty(..)) import qualified Data.List.NonEmpty as NEL @@ -238,7 +238,7 @@ tokenize :: Text -> [Token] tokenize t | T.null t = [] - | Just txt <- T.stripPrefix "-- | " t = [DocComment txt] + | Just txt <- T.stripPrefix "-- |" t = [DocComment (T.stripStart txt)] | "--" `T.isPrefixOf` t = [] -- Comment until the end of the line. | "#" `T.isPrefixOf` t = [] -- Also comment to the end of the line, needed for a CPP bug (#110) | T.head t == '"' = quotes (T.tail t) id diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/Database/Persist/TH.hs new/persistent-2.14.5.1/Database/Persist/TH.hs --- old/persistent-2.14.5.0/Database/Persist/TH.hs 2023-03-03 17:55:42.000000000 +0100 +++ new/persistent-2.14.5.1/Database/Persist/TH.hs 2023-06-28 20:53:50.000000000 +0200 @@ -141,6 +141,7 @@ conp :: Name -> [Pat] -> Pat conp name pats = ConP name [] pats #else +conp :: Name -> [Pat] -> Pat conp = ConP #endif @@ -1994,18 +1995,20 @@ [keyFromRecordM'] <- case unboundPrimarySpec entDef of NaturalKey ucd -> do - let - keyCon = - keyConName entDef - keyFields' = - fieldNameToRecordName mps entDef <$> unboundCompositeCols ucd + let keyFields' = fieldNameToRecordName mps entDef <$> unboundCompositeCols ucd + keyFieldNames' <- forM keyFields' $ \fieldName -> do + fieldVarName <- newName (nameBase fieldName) + return (fieldName, fieldVarName) + + let keyCon = keyConName entDef constr = foldl' AppE (ConE keyCon) - (VarE <$> keyFields') + (VarE . snd <$> keyFieldNames') keyFromRec = varP 'keyFromRecordM - lam = LamE [RecP name [(n, VarP n) | n <- toList keyFields']] constr + fieldPat = [(fieldName, VarP fieldVarName) | (fieldName, fieldVarName) <- toList keyFieldNames'] + lam = LamE [RecP name fieldPat ] constr [d| $(keyFromRec) = Just $(pure lam) |] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/persistent.cabal new/persistent-2.14.5.1/persistent.cabal --- old/persistent-2.14.5.0/persistent.cabal 2023-03-04 20:04:44.000000000 +0100 +++ new/persistent-2.14.5.1/persistent.cabal 2023-06-28 20:54:08.000000000 +0200 @@ -1,5 +1,5 @@ name: persistent -version: 2.14.5.0 +version: 2.14.5.1 license: MIT license-file: LICENSE author: Michael Snoyman <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/test/Database/Persist/QuasiSpec.hs new/persistent-2.14.5.1/test/Database/Persist/QuasiSpec.hs --- old/persistent-2.14.5.0/test/Database/Persist/QuasiSpec.hs 2022-12-05 19:00:17.000000000 +0100 +++ new/persistent-2.14.5.1/test/Database/Persist/QuasiSpec.hs 2023-06-28 20:53:50.000000000 +0200 @@ -236,6 +236,13 @@ [ DocComment "this is a comment" ] ) + it "recognizes empty line" $ do + parseLine "-- |" `shouldBe` + Just + ( Line 0 + [ DocComment "" + ] + ) it "works if comment is indented" $ do parseLine " -- | comment" `shouldBe` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-2.14.5.0/test/Database/Persist/TH/CompositeKeyStyleSpec.hs new/persistent-2.14.5.1/test/Database/Persist/TH/CompositeKeyStyleSpec.hs --- old/persistent-2.14.5.0/test/Database/Persist/TH/CompositeKeyStyleSpec.hs 2022-10-19 22:24:56.000000000 +0200 +++ new/persistent-2.14.5.1/test/Database/Persist/TH/CompositeKeyStyleSpec.hs 2023-06-28 20:53:50.000000000 +0200 @@ -10,6 +10,8 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE UndecidableInstances #-} +{-# OPTIONS_GHC -Wname-shadowing -Werror=name-shadowing #-} + module Database.Persist.TH.CompositeKeyStyleSpec where import Data.Data (Data, constrFields, toConstr) ++++++ persistent.cabal ++++++ name: persistent version: 2.14.5.1 x-revision: 1 license: MIT license-file: LICENSE author: Michael Snoyman <[email protected]> maintainer: Michael Snoyman <[email protected]>, Greg Weber <[email protected]> synopsis: Type-safe, multi-backend data serialization. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/persistent>. category: Database, Yesod stability: Stable cabal-version: >= 1.10 build-type: Simple homepage: http://www.yesodweb.com/book/persistent bug-reports: https://github.com/yesodweb/persistent/issues extra-source-files: ChangeLog.md README.md library build-depends: base >= 4.11.1.0 && < 5 , aeson >= 1.0 && < 2.2 , attoparsec , base64-bytestring , blaze-html >= 0.9 , bytestring >= 0.10 , conduit >= 1.3 , containers >= 0.5 , deepseq , fast-logger >= 2.4 , http-api-data >= 0.3 , lift-type >= 0.1.0.0 && < 0.2.0.0 , monad-logger >= 0.3.28 , mtl , path-pieces >= 0.2 , resource-pool >= 0.2.3 , resourcet >= 1.1.10 , scientific , silently , template-haskell >= 2.13 && < 2.21 , text >= 1.2 , th-lift-instances >= 0.1.14 && < 0.2 , time >= 1.6 , transformers >= 0.5 , unliftio , unliftio-core , unordered-containers , vault , vector default-extensions: FlexibleContexts , MultiParamTypeClasses , OverloadedStrings , TypeFamilies exposed-modules: Database.Persist Database.Persist.Types Database.Persist.Names Database.Persist.PersistValue Database.Persist.EntityDef Database.Persist.EntityDef.Internal Database.Persist.FieldDef Database.Persist.FieldDef.Internal Database.Persist.ImplicitIdDef Database.Persist.ImplicitIdDef.Internal Database.Persist.TH Database.Persist.Quasi Database.Persist.Quasi.Internal Database.Persist.Sql Database.Persist.Sql.Migration Database.Persist.Sql.Types.Internal Database.Persist.Sql.Util Database.Persist.SqlBackend Database.Persist.SqlBackend.StatementCache Database.Persist.SqlBackend.SqlPoolHooks Database.Persist.SqlBackend.Internal Database.Persist.SqlBackend.Internal.InsertSqlResult Database.Persist.SqlBackend.Internal.IsolationLevel Database.Persist.SqlBackend.Internal.SqlPoolHooks Database.Persist.SqlBackend.Internal.Statement Database.Persist.SqlBackend.Internal.StatementCache Database.Persist.SqlBackend.Internal.MkSqlBackend Database.Persist.Class Database.Persist.Class.PersistEntity Database.Persist.Class.PersistQuery Database.Persist.Class.PersistUnique Database.Persist.Class.PersistConfig Database.Persist.Class.PersistField Database.Persist.Class.PersistStore other-modules: Database.Persist.Types.Base Database.Persist.Sql.Internal Database.Persist.Sql.Types Database.Persist.Sql.Raw Database.Persist.Sql.Run Database.Persist.Sql.Class Database.Persist.Sql.Orphan.PersistQuery Database.Persist.Sql.Orphan.PersistStore Database.Persist.Sql.Orphan.PersistUnique -- These modules only make sense for compilers with access to DerivingVia if impl(ghc >= 8.6.1) exposed-modules: Database.Persist.Compatible other-modules: Database.Persist.Compatible.Types Database.Persist.Compatible.TH ghc-options: -Wall -Werror=incomplete-patterns default-language: Haskell2010 test-suite test type: exitcode-stdio-1.0 main-is: main.hs build-depends: base >= 4.9 && < 5 , aeson , attoparsec , base64-bytestring , blaze-html , bytestring , conduit , containers , deepseq , fast-logger , hspec >= 2.4 , http-api-data , monad-logger , mtl , path-pieces , persistent , QuickCheck , quickcheck-instances >= 0.3 , resource-pool , resourcet , scientific , shakespeare , silently , template-haskell >= 2.4 , text , th-lift-instances , time , transformers , unliftio , unliftio-core , unordered-containers , vector hs-source-dirs: test/ ghc-options: -Wall default-extensions: FlexibleContexts , MultiParamTypeClasses , OverloadedStrings , TypeFamilies , TypeOperators other-modules: Database.Persist.ClassSpec Database.Persist.PersistValueSpec Database.Persist.QuasiSpec Database.Persist.TH.CommentSpec Database.Persist.TH.CompositeKeyStyleSpec Database.Persist.TH.DiscoverEntitiesSpec Database.Persist.TH.EmbedSpec Database.Persist.TH.ForeignRefSpec Database.Persist.TH.ImplicitIdColSpec Database.Persist.TH.JsonEncodingSpec Database.Persist.TH.KindEntitiesSpec Database.Persist.TH.KindEntitiesSpecImports Database.Persist.TH.MaybeFieldDefsSpec Database.Persist.TH.MigrationOnlySpec Database.Persist.TH.MultiBlockSpec Database.Persist.TH.MultiBlockSpec.Model Database.Persist.TH.NestedSymbolsInTypeSpec Database.Persist.TH.NestedSymbolsInTypeSpecImports Database.Persist.TH.NoFieldSelectorsSpec Database.Persist.TH.OverloadedLabelSpec Database.Persist.TH.PersistWith.Model Database.Persist.TH.PersistWith.Model2 Database.Persist.TH.PersistWithSpec Database.Persist.TH.RequireOnlyPersistImportSpec Database.Persist.TH.SharedPrimaryKeyImportedSpec Database.Persist.TH.SharedPrimaryKeySpec Database.Persist.TH.SumSpec Database.Persist.TH.ToFromPersistValuesSpec Database.Persist.TH.TypeLitFieldDefsSpec Database.Persist.THSpec TemplateTestImports default-language: Haskell2010 source-repository head type: git location: git://github.com/yesodweb/persistent.git benchmark persistent-th-bench ghc-options: -O2 type: exitcode-stdio-1.0 main-is: Main.hs hs-source-dirs: bench build-depends: base , persistent , criterion , deepseq >= 1.4 , file-embed , text , template-haskell other-modules: Models default-language: Haskell2010
