Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-postgresql-simple for
openSUSE:Factory checked in at 2023-07-18 21:54:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-postgresql-simple (Old)
and /work/SRC/openSUSE:Factory/.ghc-postgresql-simple.new.3193 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-postgresql-simple"
Tue Jul 18 21:54:25 2023 rev:16 rq:1098955 version:0.6.5.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-postgresql-simple/ghc-postgresql-simple.changes
2023-04-14 13:12:58.847530459 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-postgresql-simple.new.3193/ghc-postgresql-simple.changes
2023-07-18 21:54:39.250470718 +0200
@@ -1,0 +2,8 @@
+Sun Jul 9 20:01:35 UTC 2023 - Peter Simons <[email protected]>
+
+- Update postgresql-simple to version 0.6.5.1.
+ ### Version 0.6.5.1 (2023-07-09)
+
+ * Support `aeson-2.2.0.0`
+
+-------------------------------------------------------------------
Old:
----
postgresql-simple-0.6.5.tar.gz
postgresql-simple.cabal
New:
----
postgresql-simple-0.6.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-postgresql-simple.spec ++++++
--- /var/tmp/diff_new_pack.DzgeOE/_old 2023-07-18 21:54:39.958474676 +0200
+++ /var/tmp/diff_new_pack.DzgeOE/_new 2023-07-18 21:54:39.966474721 +0200
@@ -20,13 +20,12 @@
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.6.5
+Version: 0.6.5.1
Release: 0
Summary: Mid-Level PostgreSQL client library
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/1.cabal#/%{pkg_name}.cabal
Patch0:
https://github.com/haskellari/postgresql-simple/pull/110.patch#/dont-depend-on-obsolete-bytestring-builder.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-Only-devel
@@ -114,7 +113,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%patch0 -p1
%build
++++++ dont-depend-on-obsolete-bytestring-builder.patch ++++++
--- /var/tmp/diff_new_pack.DzgeOE/_old 2023-07-18 21:54:39.998474900 +0200
+++ /var/tmp/diff_new_pack.DzgeOE/_new 2023-07-18 21:54:39.998474900 +0200
@@ -1,57 +1,34 @@
-From 3af9e50bfbd4ab69b1b99ad7128cc063a508db10 Mon Sep 17 00:00:00 2001
+From 60fc0fd9b08e3a5d9889cd43b6fe39593f0c54d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <[email protected]>
Date: Wed, 12 Apr 2023 22:31:08 +0200
-Subject: [PATCH] postgresql-simple.cabal: add conditional logic for obsolete
+Subject: [PATCH] postgresql-simple.cabal: drop dependency on obsolete
bytestring-builder
-bytestring-builder is required only when building with versions of bytestring
-older than 0.10.4. This commit adds conditional logic to avoid the dependency
-on the obsolete package in that case.
+We no longer support versions of 'bytestring' prior to version 0.10.4, because
+these libraries lack the modules that provide bytestring-builder.
---
- postgresql-simple.cabal | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
+ postgresql-simple.cabal | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/postgresql-simple.cabal b/postgresql-simple.cabal
-index 203b9c4..c66fcb8 100644
+index 99b7b59..4677e54 100644
--- a/postgresql-simple.cabal
+++ b/postgresql-simple.cabal
-@@ -38,6 +38,9 @@ tested-with:
- || ==9.4.4
- || ==9.6.1
-
-+Flag bytestring_has_builder
-+ default: True
-+
- library
- default-language: Haskell2010
- hs-source-dirs: src
-@@ -83,7 +86,6 @@ library
+@@ -82,7 +82,7 @@ library
-- GHC bundled libs
build-depends:
base >=4.6.0.0 && <4.19
- , bytestring >=0.10.0.0 && <0.12
++ , bytestring >=0.10.4 && <0.12
, containers >=0.5.0.0 && <0.7
, template-haskell >=2.8.0.0 && <2.21
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
-@@ -94,7 +96,6 @@ library
+@@ -93,7 +93,6 @@ library
build-depends:
- aeson >=1.4.1.0 && <1.6 || >=2.0.0.0 && <2.2
+ aeson >=1.4.1.0 && <1.6 || >=2.0.0.0 && <2.3
, attoparsec >=0.13.2.2 && <0.15
- , bytestring-builder >=0.10.8.1.0 && <0.11
, case-insensitive >=1.2.0.11 && <1.3
, hashable >=1.2.7.0 && <1.5
, Only >=0.1 && <0.1.1
-@@ -111,6 +112,12 @@ library
- if !impl(ghc >=7.6)
- build-depends: ghc-prim
-
-+ if flag(bytestring_has_builder)
-+ build-depends: bytestring >=0.10.4 && <0.12
-+ else
-+ build-depends: bytestring >=0.10 && <0.10.4
-+ , bytestring-builder >=0.10.8.1.0 && <0.11
-+
- default-extensions:
- BangPatterns
- DoAndIfThenElse
++++++ postgresql-simple-0.6.5.tar.gz -> postgresql-simple-0.6.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postgresql-simple-0.6.5/CHANGES.md
new/postgresql-simple-0.6.5.1/CHANGES.md
--- old/postgresql-simple-0.6.5/CHANGES.md 2001-09-09 03:46:40.000000000
+0200
+++ new/postgresql-simple-0.6.5.1/CHANGES.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,7 @@
+### Version 0.6.5.1 (2023-07-09)
+
+ * Support `aeson-2.2.0.0`
+
### Version 0.6.5 (2022-10-30)
* Add `withConnect`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postgresql-simple-0.6.5/postgresql-simple.cabal
new/postgresql-simple-0.6.5.1/postgresql-simple.cabal
--- old/postgresql-simple-0.6.5/postgresql-simple.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/postgresql-simple-0.6.5.1/postgresql-simple.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: postgresql-simple
-version: 0.6.5
+version: 0.6.5.1
synopsis: Mid-Level PostgreSQL client library
description:
Mid-Level PostgreSQL client library, forked from mysql-simple.
@@ -33,8 +33,9 @@
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
- || ==9.2.4
- || ==9.4.2
+ || ==9.2.8
+ || ==9.4.5
+ || ==9.6.2
library
default-language: Haskell2010
@@ -80,17 +81,17 @@
-- GHC bundled libs
build-depends:
- base >=4.6.0.0 && <4.18
+ base >=4.6.0.0 && <4.19
, bytestring >=0.10.0.0 && <0.12
, containers >=0.5.0.0 && <0.7
- , template-haskell >=2.8.0.0 && <2.20
+ , template-haskell >=2.8.0.0 && <2.21
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
, time-compat >=1.9.5 && <1.12
, transformers >=0.3.0.0 && <0.7
-- Other dependencies
build-depends:
- aeson >=1.4.1.0 && <1.6 || >=2.0.0.0 && <2.2
+ aeson >=1.4.1.0 && <1.6 || >=2.0.0.0 && <2.3
, attoparsec >=0.13.2.2 && <0.15
, bytestring-builder >=0.10.8.1.0 && <0.11
, case-insensitive >=1.2.0.11 && <1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/postgresql-simple-0.6.5/src/Database/PostgreSQL/Simple/FromField.hs
new/postgresql-simple-0.6.5.1/src/Database/PostgreSQL/Simple/FromField.hs
--- old/postgresql-simple-0.6.5/src/Database/PostgreSQL/Simple/FromField.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/postgresql-simple-0.6.5.1/src/Database/PostgreSQL/Simple/FromField.hs
2001-09-09 03:46:40.000000000 +0200
@@ -120,8 +120,6 @@
import Control.Concurrent.MVar (MVar, newMVar)
import Control.Exception (Exception)
import qualified Data.Aeson as JSON
-import qualified Data.Aeson.Internal as JSON
-import qualified Data.Aeson.Parser as JSON (value')
import Data.Attoparsec.ByteString.Char8 hiding (Result)
import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as B
@@ -156,6 +154,12 @@
import Data.Scientific (Scientific)
import GHC.Real (infinity, notANumber)
+#if MIN_VERSION_aeson(2,1,2)
+import qualified Data.Aeson.Types as JSON
+#else
+import qualified Data.Aeson.Internal as JSON
+#endif
+
-- | Exception thrown if conversion from a SQL value to a Haskell
-- value fails.
data ResultError = Incompatible { errSQLType :: String
@@ -574,7 +578,7 @@
-- | json, jsonb
instance FromField JSON.Value where
fromField f mbs = parseBS =<< fromFieldJSONByteString f mbs
- where parseBS bs = case parseOnly (JSON.value' <* endOfInput) bs of
+ where parseBS bs = case JSON.eitherDecodeStrict' bs of
Left err -> returnError ConversionFailed f err
Right val -> pure val
