Hello community, here is the log from the commit of package ghc-th-orphans for openSUSE:Factory checked in at 2018-07-24 17:23:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-th-orphans (Old) and /work/SRC/openSUSE:Factory/.ghc-th-orphans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-th-orphans" Tue Jul 24 17:23:07 2018 rev:4 rq:623875 version:0.13.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-th-orphans/ghc-th-orphans.changes 2018-05-30 12:27:36.225657049 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-th-orphans.new/ghc-th-orphans.changes 2018-07-24 17:23:10.731360843 +0200 @@ -1,0 +2,14 @@ +Wed Jul 18 14:26:44 UTC 2018 - [email protected] + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +------------------------------------------------------------------- +Fri Jul 13 14:31:57 UTC 2018 - [email protected] + +- Update th-orphans to version 0.13.6. + ### 0.13.6 [2018.07.01] + * Allow building with `template-haskell-2.14`. + * Implement `qAddForeignFilePath` and `qAddTempFile` for `Quasi` instances + +------------------------------------------------------------------- @@ -22 +35,0 @@ - Old: ---- th-orphans-0.13.5.tar.gz th-orphans.cabal New: ---- th-orphans-0.13.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-th-orphans.spec ++++++ --- /var/tmp/diff_new_pack.5WKohX/_old 2018-07-24 17:23:11.815362228 +0200 +++ /var/tmp/diff_new_pack.5WKohX/_new 2018-07-24 17:23:11.815362228 +0200 @@ -19,14 +19,13 @@ %global pkg_name th-orphans %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.5 +Version: 0.13.6 Release: 0 Summary: Orphan instances for TH datatypes License: BSD-3-Clause Group: Development/Libraries/Haskell 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-mtl-devel BuildRequires: ghc-rpm-macros @@ -56,7 +55,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ th-orphans-0.13.5.tar.gz -> th-orphans-0.13.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.5/CHANGELOG.md new/th-orphans-0.13.6/CHANGELOG.md --- old/th-orphans-0.13.5/CHANGELOG.md 2018-01-18 19:05:27.000000000 +0100 +++ new/th-orphans-0.13.6/CHANGELOG.md 2018-07-01 13:48:49.000000000 +0200 @@ -1,3 +1,7 @@ +### 0.13.6 [2018.07.01] +* Allow building with `template-haskell-2.14`. +* Implement `qAddForeignFilePath` and `qAddTempFile` for `Quasi` instances + ### 0.13.5 [2018.01.18] * Implement `qAddCorePlugin` for `Quasi` instances diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.5/src/Language/Haskell/TH/Instances.hs new/th-orphans-0.13.6/src/Language/Haskell/TH/Instances.hs --- old/th-orphans-0.13.5/src/Language/Haskell/TH/Instances.hs 2018-01-18 19:05:27.000000000 +0100 +++ new/th-orphans-0.13.6/src/Language/Haskell/TH/Instances.hs 2018-07-01 13:48:49.000000000 +0200 @@ -356,147 +356,159 @@ #endif instance Quasi m => Quasi (ReaderT r m) where - qNewName = MTL.lift . qNewName - qReport a b = MTL.lift $ qReport a b - qRecover m1 m2 = ReaderT $ \ r -> runReaderT m1 r `qRecover` runReaderT m2 r - qReify = MTL.lift . qReify - qLocation = MTL.lift qLocation - qRunIO = MTL.lift . qRunIO + qNewName = MTL.lift . qNewName + qReport a b = MTL.lift $ qReport a b + qRecover m1 m2 = ReaderT $ \ r -> runReaderT m1 r `qRecover` runReaderT m2 r + qReify = MTL.lift . qReify + qLocation = MTL.lift qLocation + qRunIO = MTL.lift . qRunIO #if MIN_VERSION_template_haskell(2,7,0) - qReifyInstances a b = MTL.lift $ qReifyInstances a b - qLookupName a b = MTL.lift $ qLookupName a b - qAddDependentFile = MTL.lift . qAddDependentFile + qReifyInstances a b = MTL.lift $ qReifyInstances a b + qLookupName a b = MTL.lift $ qLookupName a b + qAddDependentFile = MTL.lift . qAddDependentFile # if MIN_VERSION_template_haskell(2,9,0) - qReifyRoles = MTL.lift . qReifyRoles - qReifyAnnotations = MTL.lift . qReifyAnnotations - qReifyModule = MTL.lift . qReifyModule - qAddTopDecls = MTL.lift . qAddTopDecls - qAddModFinalizer = MTL.lift . qAddModFinalizer - qGetQ = MTL.lift qGetQ - qPutQ = MTL.lift . qPutQ + qReifyRoles = MTL.lift . qReifyRoles + qReifyAnnotations = MTL.lift . qReifyAnnotations + qReifyModule = MTL.lift . qReifyModule + qAddTopDecls = MTL.lift . qAddTopDecls + qAddModFinalizer = MTL.lift . qAddModFinalizer + qGetQ = MTL.lift qGetQ + qPutQ = MTL.lift . qPutQ # endif # if MIN_VERSION_template_haskell(2,11,0) - qReifyFixity = MTL.lift . qReifyFixity - qReifyConStrictness = MTL.lift . qReifyConStrictness - qIsExtEnabled = MTL.lift . qIsExtEnabled - qExtsEnabled = MTL.lift qExtsEnabled + qReifyFixity = MTL.lift . qReifyFixity + qReifyConStrictness = MTL.lift . qReifyConStrictness + qIsExtEnabled = MTL.lift . qIsExtEnabled + qExtsEnabled = MTL.lift qExtsEnabled # endif #elif MIN_VERSION_template_haskell(2,5,0) - qClassInstances a b = MTL.lift $ qClassInstances a b + qClassInstances a b = MTL.lift $ qClassInstances a b #endif -#if MIN_VERSION_template_haskell(2,12,0) - qAddForeignFile a b = MTL.lift $ qAddForeignFile a b +#if MIN_VERSION_template_haskell(2,14,0) + qAddForeignFilePath a b = MTL.lift $ qAddForeignFilePath a b + qAddTempFile = MTL.lift . qAddTempFile +#elif MIN_VERSION_template_haskell(2,12,0) + qAddForeignFile a b = MTL.lift $ qAddForeignFile a b #endif #if MIN_VERSION_template_haskell(2,13,0) - qAddCorePlugin = MTL.lift . qAddCorePlugin + qAddCorePlugin = MTL.lift . qAddCorePlugin #endif instance (Quasi m, Monoid w) => Quasi (WriterT w m) where - qNewName = MTL.lift . qNewName - qReport a b = MTL.lift $ qReport a b - qRecover m1 m2 = WriterT $ runWriterT m1 `qRecover` runWriterT m2 - qReify = MTL.lift . qReify - qLocation = MTL.lift qLocation - qRunIO = MTL.lift . qRunIO + qNewName = MTL.lift . qNewName + qReport a b = MTL.lift $ qReport a b + qRecover m1 m2 = WriterT $ runWriterT m1 `qRecover` runWriterT m2 + qReify = MTL.lift . qReify + qLocation = MTL.lift qLocation + qRunIO = MTL.lift . qRunIO #if MIN_VERSION_template_haskell(2,7,0) - qReifyInstances a b = MTL.lift $ qReifyInstances a b - qLookupName a b = MTL.lift $ qLookupName a b - qAddDependentFile = MTL.lift . qAddDependentFile + qReifyInstances a b = MTL.lift $ qReifyInstances a b + qLookupName a b = MTL.lift $ qLookupName a b + qAddDependentFile = MTL.lift . qAddDependentFile # if MIN_VERSION_template_haskell(2,9,0) - qReifyRoles = MTL.lift . qReifyRoles - qReifyAnnotations = MTL.lift . qReifyAnnotations - qReifyModule = MTL.lift . qReifyModule - qAddTopDecls = MTL.lift . qAddTopDecls - qAddModFinalizer = MTL.lift . qAddModFinalizer - qGetQ = MTL.lift qGetQ - qPutQ = MTL.lift . qPutQ + qReifyRoles = MTL.lift . qReifyRoles + qReifyAnnotations = MTL.lift . qReifyAnnotations + qReifyModule = MTL.lift . qReifyModule + qAddTopDecls = MTL.lift . qAddTopDecls + qAddModFinalizer = MTL.lift . qAddModFinalizer + qGetQ = MTL.lift qGetQ + qPutQ = MTL.lift . qPutQ # endif # if MIN_VERSION_template_haskell(2,11,0) - qReifyFixity = MTL.lift . qReifyFixity - qReifyConStrictness = MTL.lift . qReifyConStrictness - qIsExtEnabled = MTL.lift . qIsExtEnabled - qExtsEnabled = MTL.lift qExtsEnabled + qReifyFixity = MTL.lift . qReifyFixity + qReifyConStrictness = MTL.lift . qReifyConStrictness + qIsExtEnabled = MTL.lift . qIsExtEnabled + qExtsEnabled = MTL.lift qExtsEnabled # endif #elif MIN_VERSION_template_haskell(2,5,0) - qClassInstances a b = MTL.lift $ qClassInstances a b + qClassInstances a b = MTL.lift $ qClassInstances a b #endif -#if MIN_VERSION_template_haskell(2,12,0) - qAddForeignFile a b = MTL.lift $ qAddForeignFile a b +#if MIN_VERSION_template_haskell(2,14,0) + qAddForeignFilePath a b = MTL.lift $ qAddForeignFilePath a b + qAddTempFile = MTL.lift . qAddTempFile +#elif MIN_VERSION_template_haskell(2,12,0) + qAddForeignFile a b = MTL.lift $ qAddForeignFile a b #endif #if MIN_VERSION_template_haskell(2,13,0) - qAddCorePlugin = MTL.lift . qAddCorePlugin + qAddCorePlugin = MTL.lift . qAddCorePlugin #endif instance Quasi m => Quasi (StateT s m) where - qNewName = MTL.lift . qNewName - qReport a b = MTL.lift $ qReport a b - qRecover m1 m2 = StateT $ \ s -> runStateT m1 s `qRecover` runStateT m2 s - qReify = MTL.lift . qReify - qLocation = MTL.lift qLocation - qRunIO = MTL.lift . qRunIO + qNewName = MTL.lift . qNewName + qReport a b = MTL.lift $ qReport a b + qRecover m1 m2 = StateT $ \ s -> runStateT m1 s `qRecover` runStateT m2 s + qReify = MTL.lift . qReify + qLocation = MTL.lift qLocation + qRunIO = MTL.lift . qRunIO #if MIN_VERSION_template_haskell(2,7,0) - qReifyInstances a b = MTL.lift $ qReifyInstances a b - qLookupName a b = MTL.lift $ qLookupName a b - qAddDependentFile = MTL.lift . qAddDependentFile + qReifyInstances a b = MTL.lift $ qReifyInstances a b + qLookupName a b = MTL.lift $ qLookupName a b + qAddDependentFile = MTL.lift . qAddDependentFile # if MIN_VERSION_template_haskell(2,9,0) - qReifyRoles = MTL.lift . qReifyRoles - qReifyAnnotations = MTL.lift . qReifyAnnotations - qReifyModule = MTL.lift . qReifyModule - qAddTopDecls = MTL.lift . qAddTopDecls - qAddModFinalizer = MTL.lift . qAddModFinalizer - qGetQ = MTL.lift qGetQ - qPutQ = MTL.lift . qPutQ + qReifyRoles = MTL.lift . qReifyRoles + qReifyAnnotations = MTL.lift . qReifyAnnotations + qReifyModule = MTL.lift . qReifyModule + qAddTopDecls = MTL.lift . qAddTopDecls + qAddModFinalizer = MTL.lift . qAddModFinalizer + qGetQ = MTL.lift qGetQ + qPutQ = MTL.lift . qPutQ # endif # if MIN_VERSION_template_haskell(2,11,0) - qReifyFixity = MTL.lift . qReifyFixity - qReifyConStrictness = MTL.lift . qReifyConStrictness - qIsExtEnabled = MTL.lift . qIsExtEnabled - qExtsEnabled = MTL.lift qExtsEnabled + qReifyFixity = MTL.lift . qReifyFixity + qReifyConStrictness = MTL.lift . qReifyConStrictness + qIsExtEnabled = MTL.lift . qIsExtEnabled + qExtsEnabled = MTL.lift qExtsEnabled # endif #elif MIN_VERSION_template_haskell(2,5,0) - qClassInstances a b = MTL.lift $ qClassInstances a b + qClassInstances a b = MTL.lift $ qClassInstances a b #endif -#if MIN_VERSION_template_haskell(2,12,0) - qAddForeignFile a b = MTL.lift $ qAddForeignFile a b +#if MIN_VERSION_template_haskell(2,14,0) + qAddForeignFilePath a b = MTL.lift $ qAddForeignFilePath a b + qAddTempFile = MTL.lift . qAddTempFile +#elif MIN_VERSION_template_haskell(2,12,0) + qAddForeignFile a b = MTL.lift $ qAddForeignFile a b #endif #if MIN_VERSION_template_haskell(2,13,0) - qAddCorePlugin = MTL.lift . qAddCorePlugin + qAddCorePlugin = MTL.lift . qAddCorePlugin #endif instance (Quasi m, Monoid w) => Quasi (RWST r w s m) where - qNewName = MTL.lift . qNewName - qReport a b = MTL.lift $ qReport a b - qRecover m1 m2 = RWST $ \ r s -> runRWST m1 r s `qRecover` runRWST m2 r s - qReify = MTL.lift . qReify - qLocation = MTL.lift qLocation - qRunIO = MTL.lift . qRunIO + qNewName = MTL.lift . qNewName + qReport a b = MTL.lift $ qReport a b + qRecover m1 m2 = RWST $ \ r s -> runRWST m1 r s `qRecover` runRWST m2 r s + qReify = MTL.lift . qReify + qLocation = MTL.lift qLocation + qRunIO = MTL.lift . qRunIO #if MIN_VERSION_template_haskell(2,7,0) - qReifyInstances a b = MTL.lift $ qReifyInstances a b - qLookupName a b = MTL.lift $ qLookupName a b - qAddDependentFile = MTL.lift . qAddDependentFile + qReifyInstances a b = MTL.lift $ qReifyInstances a b + qLookupName a b = MTL.lift $ qLookupName a b + qAddDependentFile = MTL.lift . qAddDependentFile # if MIN_VERSION_template_haskell(2,9,0) - qReifyRoles = MTL.lift . qReifyRoles - qReifyAnnotations = MTL.lift . qReifyAnnotations - qReifyModule = MTL.lift . qReifyModule - qAddTopDecls = MTL.lift . qAddTopDecls - qAddModFinalizer = MTL.lift . qAddModFinalizer - qGetQ = MTL.lift qGetQ - qPutQ = MTL.lift . qPutQ + qReifyRoles = MTL.lift . qReifyRoles + qReifyAnnotations = MTL.lift . qReifyAnnotations + qReifyModule = MTL.lift . qReifyModule + qAddTopDecls = MTL.lift . qAddTopDecls + qAddModFinalizer = MTL.lift . qAddModFinalizer + qGetQ = MTL.lift qGetQ + qPutQ = MTL.lift . qPutQ # endif # if MIN_VERSION_template_haskell(2,11,0) - qReifyFixity = MTL.lift . qReifyFixity - qReifyConStrictness = MTL.lift . qReifyConStrictness - qIsExtEnabled = MTL.lift . qIsExtEnabled - qExtsEnabled = MTL.lift qExtsEnabled + qReifyFixity = MTL.lift . qReifyFixity + qReifyConStrictness = MTL.lift . qReifyConStrictness + qIsExtEnabled = MTL.lift . qIsExtEnabled + qExtsEnabled = MTL.lift qExtsEnabled # endif #elif MIN_VERSION_template_haskell(2,5,0) - qClassInstances a b = MTL.lift $ qClassInstances a b + qClassInstances a b = MTL.lift $ qClassInstances a b #endif -#if MIN_VERSION_template_haskell(2,12,0) - qAddForeignFile a b = MTL.lift $ qAddForeignFile a b +#if MIN_VERSION_template_haskell(2,14,0) + qAddForeignFilePath a b = MTL.lift $ qAddForeignFilePath a b + qAddTempFile = MTL.lift . qAddTempFile +#elif MIN_VERSION_template_haskell(2,12,0) + qAddForeignFile a b = MTL.lift $ qAddForeignFile a b #endif #if MIN_VERSION_template_haskell(2,13,0) - qAddCorePlugin = MTL.lift . qAddCorePlugin + qAddCorePlugin = MTL.lift . qAddCorePlugin #endif #if MIN_VERSION_base(4,7,0) && defined(LANGUAGE_DeriveDataTypeable) && __GLASGOW_HASKELL__ < 710 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.5/th-orphans.cabal new/th-orphans-0.13.6/th-orphans.cabal --- old/th-orphans-0.13.5/th-orphans.cabal 2018-01-18 19:05:27.000000000 +0100 +++ new/th-orphans-0.13.6/th-orphans.cabal 2018-07-01 13:48:49.000000000 +0200 @@ -1,5 +1,5 @@ name: th-orphans -version: 0.13.5 +version: 0.13.6 cabal-version: >= 1.10 build-type: Simple license: BSD3 @@ -18,7 +18,8 @@ , GHC == 7.10.3 , GHC == 8.0.2 , GHC == 8.2.2 - , GHC == 8.4.1 + , GHC == 8.4.3 + , GHC == 8.6.1 synopsis: Orphan instances for TH datatypes description: Orphan instances for TH datatypes. In particular, instances for Ord and Lift, as well as a few missing Show / Eq. These @@ -28,7 +29,7 @@ library build-depends: base >= 4.3 && < 5, - template-haskell, + template-haskell < 2.15, -- https://github.com/mboes/th-lift/issues/14 th-lift >= 0.7.1, th-reify-many >= 0.1 && < 0.2,
