Hello community,
here is the log from the commit of package ghc-haskell-src-meta for
openSUSE:Factory checked in at 2018-07-24 17:19:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Tue Jul 24 17:19:20 2018 rev:6 rq:623783 version:0.8.0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-haskell-src-meta/ghc-haskell-src-meta.changes
2018-05-30 12:25:53.829156902 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-haskell-src-meta.new/ghc-haskell-src-meta.changes
2018-07-24 17:19:22.823068758 +0200
@@ -1,0 +2,13 @@
+Wed Jul 18 14:26:26 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:44 UTC 2018 - [email protected]
+
+- Update haskell-src-meta to version 0.8.0.3.
+ Upstream has not updated the file "ChangeLog" since the last
+ release.
+
+-------------------------------------------------------------------
@@ -31 +43,0 @@
-
Old:
----
haskell-src-meta-0.8.0.2.tar.gz
haskell-src-meta.cabal
New:
----
haskell-src-meta-0.8.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-haskell-src-meta.spec ++++++
--- /var/tmp/diff_new_pack.43q4vT/_old 2018-07-24 17:19:23.319069396 +0200
+++ /var/tmp/diff_new_pack.43q4vT/_new 2018-07-24 17:19:23.323069401 +0200
@@ -19,14 +19,13 @@
%global pkg_name haskell-src-meta
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.8.0.2
+Version: 0.8.0.3
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
@@ -58,7 +57,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ haskell-src-meta-0.8.0.2.tar.gz -> haskell-src-meta-0.8.0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haskell-src-meta-0.8.0.2/haskell-src-meta.cabal
new/haskell-src-meta-0.8.0.3/haskell-src-meta.cabal
--- old/haskell-src-meta-0.8.0.2/haskell-src-meta.cabal 2018-01-10
16:29:46.000000000 +0100
+++ new/haskell-src-meta-0.8.0.3/haskell-src-meta.cabal 2018-06-19
12:23:31.000000000 +0200
@@ -1,5 +1,5 @@
name: haskell-src-meta
-version: 0.8.0.2
+version: 0.8.0.3
cabal-version: >= 1.8
build-type: Simple
license: BSD3
@@ -17,11 +17,11 @@
extra-source-files: ChangeLog README.md examples/*.hs
library
- build-depends: base >= 4.6 && < 4.11,
+ 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.13,
+ template-haskell >= 2.8 && < 2.14,
th-orphans >= 0.9.1 && < 0.14
if impl(ghc < 7.8)
@@ -40,14 +40,23 @@
build-depends:
HUnit >= 1.2 && < 1.7,
- base >= 4.5 && < 4.11,
+ 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.13,
+ template-haskell >= 2.7 && < 2.14,
test-framework >= 0.8 && < 0.9,
test-framework-hunit >= 0.3 && < 0.4
+test-suite splices
+ type: exitcode-stdio-1.0
+ hs-source-dirs: tests
+ main-is: Splices.hs
+
+ build-depends:
+ base,
+ haskell-src-meta
+
source-repository head
type: git
location: git://github.com/bmillwood/haskell-src-meta.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/haskell-src-meta-0.8.0.2/src/Language/Haskell/Meta/Syntax/Translate.hs
new/haskell-src-meta-0.8.0.3/src/Language/Haskell/Meta/Syntax/Translate.hs
--- old/haskell-src-meta-0.8.0.2/src/Language/Haskell/Meta/Syntax/Translate.hs
2018-01-10 16:29:46.000000000 +0100
+++ new/haskell-src-meta-0.8.0.3/src/Language/Haskell/Meta/Syntax/Translate.hs
2018-06-19 12:23:31.000000000 +0200
@@ -132,14 +132,11 @@
toName (Hs.Symbol _ s) = toName s
instance ToName (Hs.SpecialCon l) where
- toName (Hs.UnitCon _) = '()
- toName (Hs.ListCon _) = '[]
+ toName (Hs.UnitCon _) = mkName "()"
+ toName (Hs.ListCon _) = ''[] -- Parser only uses this in types
toName (Hs.FunCon _) = ''(->)
- toName (Hs.TupleCon _ _ n)
- | n<2 = '()
- | otherwise =
- let x = maybe [] (++".") (nameModule '(,))
- in mkName . concat $ x : ["(",replicate (n-1) ',',")"]
+ toName (Hs.TupleCon _ _ n) =
+ mkName $ concat ["(",replicate (n-1) ',',")"]
toName (Hs.Cons _) = '(:)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haskell-src-meta-0.8.0.2/tests/Splices.hs
new/haskell-src-meta-0.8.0.3/tests/Splices.hs
--- old/haskell-src-meta-0.8.0.2/tests/Splices.hs 1970-01-01
01:00:00.000000000 +0100
+++ new/haskell-src-meta-0.8.0.3/tests/Splices.hs 2018-06-19
12:23:31.000000000 +0200
@@ -0,0 +1,26 @@
+{-#LANGUAGE TemplateHaskell#-}
+-- | Tests stuff mostly by just compiling correctly
+import Language.Haskell.Meta
+
+
+----- Testing names:
+
+-- Test that the unit constructor works
+$(either error return $ parseDecs
+ "unit :: IO ()\nunit = return ()")
+
+-- Testing that the [] constructor works in types,
+$(either error return $ parseDecs
+ "nilp :: [a] -> ([] a)\nnilp [] = []")
+
+$(either error return $ parseDecs
+ "pair :: (,) Int Int\npair = (,) 1 2")
+
+
+
+-- Just to check that it works as intended
+main = do
+ () <- unit
+ [] <- return (nilp [])
+ (1,2) <- return pair
+ return ()
\ No newline at end of file
