Hello community,
here is the log from the commit of package ghc-haskell-src-meta for
openSUSE:Factory checked in at 2018-05-30 12:08:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-haskell-src-meta (Old)
and /work/SRC/openSUSE:Factory/.ghc-haskell-src-meta.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-haskell-src-meta"
Wed May 30 12:08:33 2018 rev:5 rq:607809 version:0.8.0.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-haskell-src-meta/ghc-haskell-src-meta.changes
2017-09-15 21:47:28.670016672 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-haskell-src-meta.new/ghc-haskell-src-meta.changes
2018-05-30 12:25:53.829156902 +0200
@@ -1,0 +2,6 @@
+Mon May 14 17:02:11 UTC 2018 - [email protected]
+
+- Update haskell-src-meta to version 0.8.0.2 revision 1.
+ Upstream does not provide a changelog.
+
+-------------------------------------------------------------------
Old:
----
haskell-src-meta-0.8.0.1.tar.gz
New:
----
haskell-src-meta-0.8.0.2.tar.gz
haskell-src-meta.cabal
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-haskell-src-meta.spec ++++++
--- /var/tmp/diff_new_pack.3zQOlD/_old 2018-05-30 12:25:54.509134221 +0200
+++ /var/tmp/diff_new_pack.3zQOlD/_new 2018-05-30 12:25:54.509134221 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-haskell-src-meta
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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,13 +19,14 @@
%global pkg_name haskell-src-meta
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.8.0.1
+Version: 0.8.0.2
Release: 0
Summary: Parse source to template-haskell abstract syntax
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-haskell-src-exts-devel
BuildRequires: ghc-pretty-devel
@@ -57,6 +58,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
@@ -74,7 +76,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc ChangeLog README.md examples
++++++ haskell-src-meta-0.8.0.1.tar.gz -> haskell-src-meta-0.8.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haskell-src-meta-0.8.0.1/haskell-src-meta.cabal
new/haskell-src-meta-0.8.0.2/haskell-src-meta.cabal
--- old/haskell-src-meta-0.8.0.1/haskell-src-meta.cabal 2017-05-31
20:40:48.000000000 +0200
+++ new/haskell-src-meta-0.8.0.2/haskell-src-meta.cabal 2018-01-10
16:29:46.000000000 +0100
@@ -1,5 +1,5 @@
name: haskell-src-meta
-version: 0.8.0.1
+version: 0.8.0.2
cabal-version: >= 1.8
build-type: Simple
license: BSD3
@@ -18,7 +18,7 @@
library
build-depends: base >= 4.6 && < 4.11,
- haskell-src-exts >= 1.17 && < 1.20,
+ haskell-src-exts >= 1.18 && < 1.21,
pretty >= 1.0 && < 1.2,
syb >= 0.1 && < 0.8,
template-haskell >= 2.8 && < 2.13,
@@ -41,7 +41,7 @@
build-depends:
HUnit >= 1.2 && < 1.7,
base >= 4.5 && < 4.11,
- haskell-src-exts >= 1.17 && < 1.20,
+ haskell-src-exts >= 1.17 && < 1.21,
haskell-src-meta,
pretty >= 1.0 && < 1.2,
template-haskell >= 2.7 && < 2.13,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/haskell-src-meta-0.8.0.1/src/Language/Haskell/Meta/Syntax/Translate.hs
new/haskell-src-meta-0.8.0.2/src/Language/Haskell/Meta/Syntax/Translate.hs
--- old/haskell-src-meta-0.8.0.1/src/Language/Haskell/Meta/Syntax/Translate.hs
2017-05-31 20:40:48.000000000 +0200
+++ new/haskell-src-meta-0.8.0.2/src/Language/Haskell/Meta/Syntax/Translate.hs
2018-01-10 16:29:46.000000000 +0100
@@ -344,7 +344,12 @@
toType (Hs.TyCon _ qn) = ConT (toName qn)
toType (Hs.TyParen _ t) = toType t
-- XXX: need to wrap the name in parens!
- toType (Hs.TyInfix _ a o b) = AppT (AppT (ConT (toName o)) (toType a))
(toType b)
+#if MIN_VERSION_haskell_src_exts(1,20,0)
+ toType (Hs.TyInfix _ a (Hs.UnpromotedName _ o) b) =
+#else
+ toType (Hs.TyInfix _ a o b) =
+#endif
+ AppT (AppT (ConT (toName o)) (toType a)) (toType b)
toType (Hs.TyKind _ t k) = SigT (toType t) (toKind k)
toType [email protected]{} =
nonsense "toType" "type cannot have strictness annotations in this
context" t
@@ -399,19 +404,39 @@
#if MIN_VERSION_template_haskell(2,12,0)
instance ToDerivClauses (Hs.Deriving l) where
+#if MIN_VERSION_haskell_src_exts(1,20,0)
+ toDerivClauses (Hs.Deriving _ strat irules) = [DerivClause (fmap
toDerivStrategy strat) (map toType irules)]
+#else
toDerivClauses (Hs.Deriving _ irules) = [DerivClause Nothing (map toType
irules)]
-#elif MIN_VERSION_template_haskell(2,11,0)
-instance ToDerivClauses (Hs.Deriving l) where
- toDerivClauses (Hs.Deriving _ irules) = map toType irules
+#endif
#else
instance ToDerivClauses (Hs.Deriving l) where
- toDerivClauses (Hs.Deriving _ irules) = concatMap toNames irules
+#if MIN_VERSION_haskell_src_exts(1,20,0)
+ toDerivClauses (Hs.Deriving _ _ irules) =
+#else
+ toDerivClauses (Hs.Deriving _ irules) =
+#endif
+#if MIN_VERSION_template_haskell(2,11,0)
+ map toType irules
+#else
+ concatMap toNames irules
+#endif
#endif
instance ToDerivClauses a => ToDerivClauses (Maybe a) where
toDerivClauses Nothing = []
toDerivClauses (Just a) = toDerivClauses a
+instance ToDerivClauses a => ToDerivClauses [a] where
+ toDerivClauses = concatMap toDerivClauses
+
+#if MIN_VERSION_template_haskell(2,12,0) &&
MIN_VERSION_haskell_src_exts(1,20,0)
+toDerivStrategy :: (Hs.DerivStrategy l) -> DerivStrategy
+toDerivStrategy (Hs.DerivStock _) = StockStrategy
+toDerivStrategy (Hs.DerivAnyclass _) = AnyclassStrategy
+toDerivStrategy (Hs.DerivNewtype _) = NewtypeStrategy
+#endif
+
foldAppT :: Type -> [Type] -> Type
foldAppT t ts = foldl' AppT t ts
@@ -565,7 +590,12 @@
toNames (Just a) = toNames a
instance ToNames (Hs.Deriving l) where
- toNames (Hs.Deriving _ irules) = concatMap toNames irules
+#if MIN_VERSION_haskell_src_exts(1,20,0)
+ toNames (Hs.Deriving _ _ irules) =
+#else
+ toNames (Hs.Deriving _ irules) =
+#endif
+ concatMap toNames irules
instance ToNames (Hs.InstRule l) where
toNames (Hs.IParen _ irule) = toNames irule
toNames (Hs.IRule _ _mtvbs _mcxt mihd) = toNames mihd
@@ -633,6 +663,7 @@
hsMatchesToFunD :: [Hs.Match l] -> Dec
hsMatchesToFunD [] = FunD (mkName []) [] -- errorish
hsMatchesToFunD xs@(Hs.Match _ n _ _ _ : _) = FunD (toName n) (fmap
hsMatchToClause xs)
+hsMatchesToFunD xs@(Hs.InfixMatch _ _ n _ _ _ : _) = FunD (toName n) (fmap
hsMatchToClause xs)
hsMatchToClause :: Hs.Match l -> Clause
@@ -640,6 +671,10 @@
(fmap toPat ps)
(hsRhsToBody rhs)
(toDecs bnds)
+hsMatchToClause (Hs.InfixMatch _ p _ ps rhs bnds) = Clause
+ (fmap toPat (p:ps))
+ (hsRhsToBody rhs)
+ (toDecs bnds)
++++++ haskell-src-meta.cabal ++++++
name: haskell-src-meta
version: 0.8.0.2
x-revision: 1
cabal-version: >= 1.8
build-type: Simple
license: BSD3
license-file: LICENSE
category: Language, Template Haskell
author: Matt Morrow
copyright: (c) Matt Morrow
maintainer: Ben Millwood <[email protected]>
bug-reports: https://github.com/bmillwood/haskell-src-meta/issues
tested-with: GHC == 7.6.3, GHC == 7.8.3, GHC == 7.10.3, GHC == 8.0.2,
GHC == 8.2.1
synopsis: Parse source to template-haskell abstract syntax.
description: The translation from haskell-src-exts abstract syntax
to template-haskell abstract syntax isn't 100% complete yet.
extra-source-files: ChangeLog README.md examples/*.hs
library
build-depends: base >= 4.6 && < 4.12,
haskell-src-exts >= 1.18 && < 1.21,
pretty >= 1.0 && < 1.2,
syb >= 0.1 && < 0.8,
template-haskell >= 2.8 && < 2.14,
th-orphans >= 0.9.1 && < 0.14
if impl(ghc < 7.8)
build-depends: safe <= 0.3.9
hs-source-dirs: src
exposed-modules: Language.Haskell.Meta
Language.Haskell.Meta.Parse
Language.Haskell.Meta.Syntax.Translate
Language.Haskell.Meta.Utils
test-suite unit
type: exitcode-stdio-1.0
hs-source-dirs: tests
main-is: Main.hs
build-depends:
HUnit >= 1.2 && < 1.7,
base >= 4.5 && < 4.12,
haskell-src-exts >= 1.17 && < 1.21,
haskell-src-meta,
pretty >= 1.0 && < 1.2,
template-haskell >= 2.7 && < 2.14,
test-framework >= 0.8 && < 0.9,
test-framework-hunit >= 0.3 && < 0.4
source-repository head
type: git
location: git://github.com/bmillwood/haskell-src-meta.git
