Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-optics-extra for
openSUSE:Factory checked in at 2022-08-01 21:30:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-optics-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-optics-extra.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-optics-extra"
Mon Aug 1 21:30:14 2022 rev:6 rq:987069 version:0.4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-optics-extra/ghc-optics-extra.changes
2022-02-11 23:11:20.131280204 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-optics-extra.new.1533/ghc-optics-extra.changes
2022-08-01 21:30:31.509678190 +0200
@@ -1,0 +2,24 @@
+Fri May 20 11:51:08 UTC 2022 - Peter Simons <[email protected]>
+
+- Update optics-extra to version 0.4.2.1.
+ # optics-extra-0.4.2.1 (2022-05-20)
+ * Fix for previous release when used with `mtl-2.3` and `transformers-0.5`.
+
+ # optics-extra-0.4.2 (2022-05-19)
+ * Allow `transformers-0.6` and `mtl-2.3`
+
+ Note that `optics-extra` no longer defines `Zoom` instances for `ErrorT`
or `ListT` when
+ building with `mtl-2.3` or later. This is because `MonadState` is a
superclass of
+ `Zoom`, and the `MonadState` instances for `ErrorT` and `ListT` were
removed in
+ `mtl-2.3`. Be watchful of this if you build `optics-extra` with `mtl-2.3`
(or
+ later) combined with an older version of `transformers` (pre-0.6) that
defines
+ `ErrorT` or `ListT`. Similarly for `Magnify` and `MagnifyMany`.
+
+-------------------------------------------------------------------
+Tue Mar 22 06:29:33 UTC 2022 - Peter Simons <[email protected]>
+
+- Update optics-extra to version 0.4.1.
+ # optics-extra-0.4.1 (2022-03-22)
+ * Add support for GHC-9.2
+
+-------------------------------------------------------------------
Old:
----
optics-extra-0.4.tar.gz
optics-extra.cabal
New:
----
optics-extra-0.4.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-optics-extra.spec ++++++
--- /var/tmp/diff_new_pack.itppXu/_old 2022-08-01 21:30:32.253680324 +0200
+++ /var/tmp/diff_new_pack.itppXu/_new 2022-08-01 21:30:32.265680358 +0200
@@ -18,13 +18,12 @@
%global pkg_name optics-extra
Name: ghc-%{pkg_name}
-Version: 0.4
+Version: 0.4.2.1
Release: 0
Summary: Extra utilities and instances for optics-core
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/2.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-array-devel
BuildRequires: ghc-bytestring-devel
@@ -60,7 +59,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ optics-extra-0.4.tar.gz -> optics-extra-0.4.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/CHANGELOG.md
new/optics-extra-0.4.2.1/CHANGELOG.md
--- old/optics-extra-0.4/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/CHANGELOG.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,19 @@
+# optics-extra-0.4.2.1 (2022-05-20)
+* Fix for previous release when used with `mtl-2.3` and `transformers-0.5`.
+
+# optics-extra-0.4.2 (2022-05-19)
+* Allow `transformers-0.6` and `mtl-2.3`
+
+ Note that `optics-extra` no longer defines `Zoom` instances for `ErrorT` or
`ListT` when
+ building with `mtl-2.3` or later. This is because `MonadState` is a
superclass of
+ `Zoom`, and the `MonadState` instances for `ErrorT` and `ListT` were removed
in
+ `mtl-2.3`. Be watchful of this if you build `optics-extra` with `mtl-2.3` (or
+ later) combined with an older version of `transformers` (pre-0.6) that
defines
+ `ErrorT` or `ListT`. Similarly for `Magnify` and `MagnifyMany`.
+
+# optics-extra-0.4.1 (2022-03-22)
+* Add support for GHC-9.2
+
# optics-extra-0.4 (2021-02-22)
* Add support for GHC-9.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/optics-extra.cabal
new/optics-extra-0.4.2.1/optics-extra.cabal
--- old/optics-extra-0.4/optics-extra.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/optics-extra-0.4.2.1/optics-extra.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,12 +1,13 @@
+cabal-version: 2.2
name: optics-extra
-version: 0.4
-license: BSD3
+version: 0.4.2.1
+license: BSD-3-Clause
license-file: LICENSE
build-type: Simple
-cabal-version: 1.24
maintainer: [email protected]
author: Andrzej Rybczak
-tested-with: ghc ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.3, GHCJS
==8.4
+tested-with: GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
+ || ==9.0.2 || ==9.2.2, GHCJS ==8.4
synopsis: Extra utilities and instances for optics-core
category: Data, Optics, Lenses
description:
@@ -25,21 +26,51 @@
location: https://github.com/well-typed/optics.git
subdir: optics-extra
+common language
+ ghc-options: -Wall -Wcompat
+
+ default-language: Haskell2010
+
+ default-extensions: BangPatterns
+ ConstraintKinds
+ DefaultSignatures
+ DeriveFoldable
+ DeriveFunctor
+ DeriveGeneric
+ DeriveTraversable
+ EmptyCase
+ FlexibleContexts
+ FlexibleInstances
+ FunctionalDependencies
+ GADTs
+ GeneralizedNewtypeDeriving
+ InstanceSigs
+ KindSignatures
+ LambdaCase
+ OverloadedLabels
+ PatternSynonyms
+ RankNTypes
+ ScopedTypeVariables
+ TupleSections
+ TypeApplications
+ TypeFamilies
+ TypeOperators
+ ViewPatterns
+
library
- default-language: Haskell2010
+ import: language
hs-source-dirs: src
- ghc-options: -Wall
build-depends: base >= 4.10 && <5
, array >= 0.5.2.0 && <0.6
, bytestring >= 0.10.8 && <0.12
, containers >= 0.5.10.2 && <0.7
- , hashable >= 1.1.1 && <1.4
+ , hashable >= 1.1.1 && <1.5
, indexed-profunctors >= 0.1 && <0.2
- , mtl >= 2.2.2 && <2.3
- , optics-core >= 0.4 && <0.4.1
- , text >= 1.2 && <1.3
- , transformers >= 0.5 && <0.6
+ , mtl >= 2.2.2 && <2.4
+ , optics-core >= 0.4.1 && <0.4.2
+ , text >= 1.2 && <1.3 || >=2.0 && <2.1
+ , transformers >= 0.5 && <0.7
, unordered-containers >= 0.2.6 && <0.3
, vector >= 0.11 && <0.13
, indexed-traversable-instances >=0.1 && <0.2
@@ -74,20 +105,3 @@
Optics.Extra.Internal.ByteString
Optics.Extra.Internal.Vector
Optics.Extra.Internal.Zoom
-
- default-extensions: BangPatterns
- DefaultSignatures
- DeriveFunctor
- FlexibleContexts
- FlexibleInstances
- FunctionalDependencies
- GADTs
- InstanceSigs
- LambdaCase
- MultiParamTypeClasses
- RankNTypes
- ScopedTypeVariables
- TupleSections
- TypeApplications
- TypeFamilies
- TypeOperators
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Data/ByteString/Lazy/Optics.hs
new/optics-extra-0.4.2.1/src/Data/ByteString/Lazy/Optics.hs
--- old/optics-extra-0.4/src/Data/ByteString/Lazy/Optics.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/src/Data/ByteString/Lazy/Optics.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE PatternSynonyms #-}
-- | Lazy 'ByteString' lenses.
module Data.ByteString.Lazy.Optics
( packedBytes, unpackedBytes, bytes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Data/ByteString/Optics.hs
new/optics-extra-0.4.2.1/src/Data/ByteString/Optics.hs
--- old/optics-extra-0.4/src/Data/ByteString/Optics.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/src/Data/ByteString/Optics.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE PatternSynonyms #-}
module Data.ByteString.Optics
( IsByteString(..)
, unpackedBytes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/optics-extra-0.4/src/Data/ByteString/Strict/Optics.hs
new/optics-extra-0.4.2.1/src/Data/ByteString/Strict/Optics.hs
--- old/optics-extra-0.4/src/Data/ByteString/Strict/Optics.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/src/Data/ByteString/Strict/Optics.hs
2001-09-09 03:46:40.000000000 +0200
@@ -1,5 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE PatternSynonyms #-}
module Data.ByteString.Strict.Optics
( packedBytes, unpackedBytes, bytes
, packedChars, unpackedChars, chars
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Data/Text/Lazy/Optics.hs
new/optics-extra-0.4.2.1/src/Data/Text/Lazy/Optics.hs
--- old/optics-extra-0.4/src/Data/Text/Lazy/Optics.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/src/Data/Text/Lazy/Optics.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,3 @@
-{-# LANGUAGE PatternSynonyms #-}
-{-# LANGUAGE ViewPatterns #-}
-- |
-- Module: Data.Text.Lazy.Optics
-- Description: Optics for working with lazy 'Text.Text'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Data/Text/Optics.hs
new/optics-extra-0.4.2.1/src/Data/Text/Optics.hs
--- old/optics-extra-0.4/src/Data/Text/Optics.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/src/Data/Text/Optics.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE PatternSynonyms #-}
-- |
-- Module: Data.Text.Optics
-- Description: Optics for working with strict or lazy 'Text'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Data/Text/Strict/Optics.hs
new/optics-extra-0.4.2.1/src/Data/Text/Strict/Optics.hs
--- old/optics-extra-0.4/src/Data/Text/Strict/Optics.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/optics-extra-0.4.2.1/src/Data/Text/Strict/Optics.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE PatternSynonyms #-}
-- |
-- Module: Data.Text.Strict.Optics
-- Description: Optics for working with strict 'Strict.Text'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Optics/Cons.hs
new/optics-extra-0.4.2.1/src/Optics/Cons.hs
--- old/optics-extra-0.4/src/Optics/Cons.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/optics-extra-0.4.2.1/src/Optics/Cons.hs 2001-09-09 03:46:40.000000000
+0200
@@ -5,7 +5,6 @@
-- This module defines the 'Cons' and 'Snoc' classes, which provide 'Prism's
for
-- the leftmost and rightmost elements of a container, respectively.
--
-{-# LANGUAGE PatternSynonyms #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Optics.Cons
(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Optics/Empty.hs
new/optics-extra-0.4.2.1/src/Optics/Empty.hs
--- old/optics-extra-0.4/src/Optics/Empty.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/optics-extra-0.4.2.1/src/Optics/Empty.hs 2001-09-09
03:46:40.000000000 +0200
@@ -11,7 +11,6 @@
-- >>> case Nothing of { Empty -> True; _ -> False }
-- True
--
-{-# LANGUAGE PatternSynonyms #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Optics.Empty
( AsEmpty(..)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optics-extra-0.4/src/Optics/Zoom.hs
new/optics-extra-0.4.2.1/src/Optics/Zoom.hs
--- old/optics-extra-0.4/src/Optics/Zoom.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/optics-extra-0.4.2.1/src/Optics/Zoom.hs 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE UndecidableInstances #-}
{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
module Optics.Zoom
@@ -11,10 +12,8 @@
import Control.Monad.Reader (ReaderT (..), MonadReader)
import Control.Monad.State (MonadState (..))
-import Control.Monad.Trans.Error (Error, ErrorT (..))
import Control.Monad.Trans.Except (ExceptT (..), runExceptT)
import Control.Monad.Trans.Identity (IdentityT (..))
-import Control.Monad.Trans.List (ListT (..))
import Control.Monad.Trans.Maybe (MaybeT (..))
import qualified Control.Monad.Trans.RWS.Lazy as L
import qualified Control.Monad.Trans.RWS.Strict as S
@@ -23,6 +22,11 @@
import qualified Control.Monad.Trans.Writer.Lazy as L
import qualified Control.Monad.Trans.Writer.Strict as S
+#if !MIN_VERSION_transformers(0,6,0) && !MIN_VERSION_mtl(2,3,0)
+import Control.Monad.Trans.Error (Error, ErrorT (..))
+import Control.Monad.Trans.List (ListT (..))
+#endif
+
import Optics.Core
import Optics.Internal.Utils
import Optics.Extra.Internal.Zoom
@@ -158,14 +162,6 @@
{-# INLINE zoomMaybe #-}
{-# INLINE zoomMany #-}
-instance Zoom m n s t => Zoom (ListT m) (ListT n) s t where
- zoom o = ListT #. zoom o .# runListT
- zoomMaybe o = ListT #. fmap sequenceA . zoomMaybe o .# runListT
- zoomMany o = ListT #. zoomMany o .# runListT
- {-# INLINE zoom #-}
- {-# INLINE zoomMaybe #-}
- {-# INLINE zoomMany #-}
-
instance Zoom m n s t => Zoom (MaybeT m) (MaybeT n) s t where
zoom o =
MaybeT #. zoom o .# runMaybeT
@@ -177,6 +173,18 @@
{-# INLINE zoomMaybe #-}
{-# INLINE zoomMany #-}
+instance Zoom m n s t => Zoom (ExceptT e m) (ExceptT e n) s t where
+ zoom o =
+ ExceptT #. zoom o .# runExceptT
+ zoomMaybe o =
+ ExceptT #. fmap (getErr . shuffleErr) . zoomMaybe o . fmap Err .#
runExceptT
+ zoomMany o =
+ ExceptT #. fmap getErr . zoomMany o . fmap Err .# runExceptT
+ {-# INLINE zoom #-}
+ {-# INLINE zoomMaybe #-}
+ {-# INLINE zoomMany #-}
+
+#if !MIN_VERSION_transformers(0,6,0) && !MIN_VERSION_mtl(2,3,0)
instance (Error e, Zoom m n s t) => Zoom (ErrorT e m) (ErrorT e n) s t where
zoom o =
ErrorT #. zoom o .# runErrorT
@@ -188,16 +196,14 @@
{-# INLINE zoomMaybe #-}
{-# INLINE zoomMany #-}
-instance Zoom m n s t => Zoom (ExceptT e m) (ExceptT e n) s t where
- zoom o =
- ExceptT #. zoom o .# runExceptT
- zoomMaybe o =
- ExceptT #. fmap (getErr . shuffleErr) . zoomMaybe o . fmap Err .#
runExceptT
- zoomMany o =
- ExceptT #. fmap getErr . zoomMany o . fmap Err .# runExceptT
+instance Zoom m n s t => Zoom (ListT m) (ListT n) s t where
+ zoom o = ListT #. zoom o .# runListT
+ zoomMaybe o = ListT #. fmap sequenceA . zoomMaybe o .# runListT
+ zoomMany o = ListT #. zoomMany o .# runListT
{-# INLINE zoom #-}
{-# INLINE zoomMaybe #-}
{-# INLINE zoomMany #-}
+#endif
------------------------------------------------------------------------------
-- Magnify
@@ -367,16 +373,6 @@
magnifyMany o = L.WriterT #. magnifyMany o .# L.runWriterT
{-# INLINE magnifyMany #-}
-instance Magnify m n b a => Magnify (ListT m) (ListT n) b a where
- magnify o = ListT #. magnify o .# runListT
- magnifyMaybe o = ListT #. fmap sequenceA . magnifyMaybe o .# runListT
- {-# INLINE magnify #-}
- {-# INLINE magnifyMaybe #-}
-
-instance MagnifyMany m n b a => MagnifyMany (ListT m) (ListT n) b a where
- magnifyMany o = ListT #. magnifyMany o .# runListT
- {-# INLINE magnifyMany #-}
-
instance Magnify m n b a => Magnify (MaybeT m) (MaybeT n) b a where
magnify o = MaybeT #. magnify o .# runMaybeT
magnifyMaybe o =
@@ -388,6 +384,18 @@
magnifyMany o = MaybeT #. fmap getMay . magnifyMany o . fmap May .# runMaybeT
{-# INLINE magnifyMany #-}
+instance Magnify m n b a => Magnify (ExceptT e m) (ExceptT e n) b a where
+ magnify o = ExceptT #. magnify o .# runExceptT
+ magnifyMaybe o =
+ ExceptT #. fmap (getErr . shuffleErr) . magnifyMaybe o . fmap Err .#
runExceptT
+ {-# INLINE magnify #-}
+ {-# INLINE magnifyMaybe #-}
+
+instance MagnifyMany m n b a => MagnifyMany (ExceptT e m) (ExceptT e n) b a
where
+ magnifyMany o = ExceptT #. fmap getErr . magnifyMany o . fmap Err .#
runExceptT
+ {-# INLINE magnifyMany #-}
+
+#if !MIN_VERSION_transformers(0,6,0) && !MIN_VERSION_mtl(2,3,0)
instance (Error e, Magnify m n b a) => Magnify (ErrorT e m) (ErrorT e n) b a
where
magnify o = ErrorT #. magnify o .# runErrorT
magnifyMaybe o =
@@ -401,13 +409,13 @@
magnifyMany o = ErrorT #. fmap getErr . magnifyMany o . fmap Err .# runErrorT
{-# INLINE magnifyMany #-}
-instance Magnify m n b a => Magnify (ExceptT e m) (ExceptT e n) b a where
- magnify o = ExceptT #. magnify o .# runExceptT
- magnifyMaybe o =
- ExceptT #. fmap (getErr . shuffleErr) . magnifyMaybe o . fmap Err .#
runExceptT
+instance Magnify m n b a => Magnify (ListT m) (ListT n) b a where
+ magnify o = ListT #. magnify o .# runListT
+ magnifyMaybe o = ListT #. fmap sequenceA . magnifyMaybe o .# runListT
{-# INLINE magnify #-}
{-# INLINE magnifyMaybe #-}
-instance MagnifyMany m n b a => MagnifyMany (ExceptT e m) (ExceptT e n) b a
where
- magnifyMany o = ExceptT #. fmap getErr . magnifyMany o . fmap Err .#
runExceptT
+instance MagnifyMany m n b a => MagnifyMany (ListT m) (ListT n) b a where
+ magnifyMany o = ListT #. magnifyMany o .# runListT
{-# INLINE magnifyMany #-}
+#endif
