Hello community, here is the log from the commit of package ghc-th-orphans for openSUSE:Factory checked in at 2017-05-10 20:49:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-th-orphans (Old) and /work/SRC/openSUSE:Factory/.ghc-th-orphans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-th-orphans" Wed May 10 20:49:08 2017 rev:2 rq:489371 version:0.13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-th-orphans/ghc-th-orphans.changes 2017-04-12 17:12:52.307667791 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-th-orphans.new/ghc-th-orphans.changes 2017-05-10 20:49:10.470218061 +0200 @@ -1,0 +2,10 @@ +Mon Nov 14 09:34:49 UTC 2016 - psimons@suse.com + +- Update to version 0.13.3 with cabal2obs. + +------------------------------------------------------------------- +Thu Sep 15 06:32:59 UTC 2016 - psimons@suse.com + +- Update to version 0.13.2 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- th-orphans-0.13.0.tar.gz New: ---- th-orphans-0.13.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-th-orphans.spec ++++++ --- /var/tmp/diff_new_pack.5psneE/_old 2017-05-10 20:49:11.418084311 +0200 +++ /var/tmp/diff_new_pack.5psneE/_new 2017-05-10 20:49:11.422083747 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-th-orphans # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,25 +19,24 @@ %global pkg_name th-orphans %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.0 +Version: 0.13.3 Release: 0 Summary: Orphan instances for TH datatypes License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-mtl-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-th-lift-devel +BuildRequires: ghc-th-lift-instances-devel BuildRequires: ghc-th-reify-many-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-hspec-devel %endif -# End cabal-rpm deps %description Orphan instances for TH datatypes. In particular, instances for Ord and Lift, @@ -58,20 +57,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache @@ -85,5 +78,6 @@ %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%doc CHANGELOG.md README.md %changelog ++++++ th-orphans-0.13.0.tar.gz -> th-orphans-0.13.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.0/CHANGELOG.md new/th-orphans-0.13.3/CHANGELOG.md --- old/th-orphans-0.13.0/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/th-orphans-0.13.3/CHANGELOG.md 2016-11-10 00:22:37.000000000 +0100 @@ -0,0 +1,2 @@ +### 0.13.3 [2016.11.09] +* Backport `Generic NameFlavour` instance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.0/README.md new/th-orphans-0.13.3/README.md --- old/th-orphans-0.13.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/th-orphans-0.13.3/README.md 2016-11-10 00:22:37.000000000 +0100 @@ -0,0 +1,18 @@ +# `th-orphans` +[][Hackage: th-orphans] +[](http://packdeps.haskellers.com/reverse/th-orphans) +[][Haskell.org] +[][tl;dr Legal: BSD3] +[](https://travis-ci.org/mgsloan/th-orphans) + +[Hackage: th-orphans]: + http://hackage.haskell.org/package/th-orphans + "th-orphans package on Hackage" +[Haskell.org]: + http://www.haskell.org + "The Haskell Programming Language" +[tl;dr Legal: BSD3]: + https://tldrlegal.com/license/bsd-3-clause-license-%28revised%29 + "BSD 3-Clause License (Revised)" + +Orphan instances for TH datatypes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.0/src/Language/Haskell/TH/Instances.hs new/th-orphans-0.13.3/src/Language/Haskell/TH/Instances.hs --- old/th-orphans-0.13.0/src/Language/Haskell/TH/Instances.hs 2015-11-05 01:15:22.000000000 +0100 +++ new/th-orphans-0.13.3/src/Language/Haskell/TH/Instances.hs 2016-11-10 00:22:37.000000000 +0100 @@ -1,7 +1,8 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE CPP #-} +{-# LANGUAGE TypeFamilies #-} #if defined(__GLASGOW_HASKELL__) # define LANGUAGE_DeriveDataTypeable @@ -11,15 +12,17 @@ #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 704 # define LANGUAGE_DeriveGeneric {-# LANGUAGE DeriveGeneric #-} -#else -{-# LANGUAGE TypeFamilies #-} +#endif + +#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 706 +{-# LANGUAGE DataKinds #-} #endif {-# OPTIONS_GHC -fno-warn-deprecations #-} {-# OPTIONS_GHC -fno-warn-orphans #-} -- | --- Module : Language.Haskell.TH.Instances.Lift +-- Module : Language.Haskell.TH.Instances -- Copyright : (c) Matt Morrow 2008 -- License : BSD3 -- Maintainer : Michael Sloan <mgsloan at gmail> @@ -47,6 +50,10 @@ -- Note that the 'Ord' instances are not guaranteed to produce -- consistent results across template-haskell / GHC versions, as they -- have different data types, with different constructor orders. +-- +-- This module also implicitly re-exports the instances defined in +-- "Instances.TH.Lift". This is mostly to ensure that there aren't +-- collisions of orphans between @th-orphans@ and @th-lift-instances@. module Language.Haskell.TH.Instances () where import Language.Haskell.TH @@ -60,6 +67,7 @@ import Control.Monad.State (StateT(StateT), runStateT) import Control.Monad.Writer (WriterT(WriterT), runWriterT) import qualified Control.Monad.Trans as MTL (lift) +import Instances.TH.Lift () -- Thanks to Richard Eisenberg, GHC 7.10 adds many of the instances -- from this module. @@ -93,11 +101,18 @@ # if __GLASGOW_HASKELL__ > 702 import GHC.Generics (Generic) -# else +# endif + +# if __GLASGOW_HASKELL__ <= 702 || !(MIN_VERSION_template_haskell(2,10,0)) import qualified Generics.Deriving.TH as Generic (deriveAll) # endif #endif +#if !MIN_VERSION_template_haskell(2,11,0) +deriving instance Show NameFlavour +deriving instance Show NameSpace +#endif + -- Ideally, it'd be possible to use reifyManyWithoutInstances for -- these Ord instances, but TH can't output deriving instances (and -- even if this is added for later versions, we need to support many @@ -110,40 +125,6 @@ instance Ppr Lit where ppr = pprLit noPrec --- This follows the pattern of the Lift instances for Int / Integer. -instance Lift Int8 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Int16 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Int32 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Int64 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Word where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Word8 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Word16 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Word32 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Word64 where - lift x = return (LitE (IntegerL (fromIntegral x))) - -instance Lift Float where - lift x = return (LitE (RationalL (toRational x))) - -instance Lift Double where - lift x = return (LitE (RationalL (toRational x))) - deriving instance Eq Info deriving instance Ord Body @@ -221,6 +202,11 @@ $(Generic.deriveAll ''Type) # endif +-- Unconditionally use Template Haskell to derive this Generic instance, since +-- NameFlavour has fields with unboxed types (for which deriving Generic +-- support wasn't added to GHC until 8.0). +$(Generic.deriveAll ''NameFlavour) + # if MIN_VERSION_template_haskell(2,3,0) instance Ppr Loc where ppr (Loc { loc_module = md @@ -389,6 +375,12 @@ 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 +# endif #elif MIN_VERSION_template_haskell(2,5,0) qClassInstances a b = MTL.lift $ qClassInstances a b #endif @@ -413,6 +405,12 @@ 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 +# endif #elif MIN_VERSION_template_haskell(2,5,0) qClassInstances a b = MTL.lift $ qClassInstances a b #endif @@ -437,6 +435,12 @@ 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 +# endif #elif MIN_VERSION_template_haskell(2,5,0) qClassInstances a b = MTL.lift $ qClassInstances a b #endif @@ -461,6 +465,12 @@ 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 +# endif #elif MIN_VERSION_template_haskell(2,5,0) qClassInstances a b = MTL.lift $ qClassInstances a b #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/th-orphans-0.13.0/th-orphans.cabal new/th-orphans-0.13.3/th-orphans.cabal --- old/th-orphans-0.13.0/th-orphans.cabal 2015-11-05 01:15:25.000000000 +0100 +++ new/th-orphans-0.13.3/th-orphans.cabal 2016-11-10 00:22:37.000000000 +0100 @@ -1,5 +1,5 @@ name: th-orphans -version: 0.13.0 +version: 0.13.3 cabal-version: >= 1.10 build-type: Simple license: BSD3 @@ -10,24 +10,32 @@ maintainer: Michael Sloan <mgsloan at gmail> bug-reports: https://github.com/mgsloan/th-orphans/issues stability: experimental -tested-with: GHC == 7.0.1, GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.3, GHC == 7.10.1 +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.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 instances used to live in haskell-src-meta, and that's where the version number started. +extra-source-files: CHANGELOG.md, README.md library - build-depends: base >= 4.2 && < 5, + build-depends: base >= 4.3 && < 5, template-haskell, -- https://github.com/mboes/th-lift/issues/14 th-lift >= 0.7.1, th-reify-many >= 0.1 && < 0.2, + th-lift-instances, mtl - -- Use TH to derive Generics instances instead of DeriveGeneric, for < 7.4 - if impl(ghc < 7.4) - build-depends: generic-deriving >= 1.8 + -- Use TH to derive Generics instances instead of DeriveGeneric, for < 7.10 + if impl(ghc < 7.10) + build-depends: generic-deriving >= 1.9 -- Prior to GHC 7.6, GHC generics lived in ghc-prim if impl(ghc >= 7.2) && impl(ghc < 7.6) @@ -38,7 +46,6 @@ exposed-modules: Language.Haskell.TH.Instances default-language: Haskell2010 - test-suite test type: exitcode-stdio-1.0 hs-source-dirs: test @@ -51,4 +58,4 @@ source-repository head type: git - location: git://github.com/mgsloan/th-orphans.git + location: https://github.com/mgsloan/th-orphans