Hello community, here is the log from the commit of package pointful for openSUSE:Factory checked in at 2016-01-09 23:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pointful (Old) and /work/SRC/openSUSE:Factory/.pointful.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pointful" Changes: -------- --- /work/SRC/openSUSE:Factory/pointful/pointful.changes 2015-06-24 20:48:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pointful.new/pointful.changes 2016-01-09 23:13:44.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 15 21:59:52 UTC 2015 - mimi...@gmail.com + +- add fix-haskell-src-exts.patch -- Sergei Trofimovich <siarh...@google.com> + +------------------------------------------------------------------- New: ---- fix-haskell-src-exts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pointful.spec ++++++ --- /var/tmp/diff_new_pack.n2PBM0/_old 2016-01-09 23:13:45.000000000 +0100 +++ /var/tmp/diff_new_pack.n2PBM0/_new 2016-01-09 23:13:45.000000000 +0100 @@ -26,6 +26,8 @@ License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix-haskell-src-exts.patch -- Sergei Trofimovich <siarh...@google.com> +Patch0: fix-haskell-src-exts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel @@ -64,7 +66,7 @@ %prep %setup -q - +%patch0 -p1 %build %ghc_lib_build ++++++ fix-haskell-src-exts.patch ++++++ >From 10c9a991031ae8a120faf40b409b7c288415ec34 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich <siarh...@google.com> Date: Sat, 21 Nov 2015 13:59:34 +0000 Subject: [PATCH] pointful: update to haskell-src-exts Signed-off-by: Sergei Trofimovich <siarh...@google.com> --- Lambdabot/Pointful.hs | 10 +++++----- pointful.cabal | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lambdabot/Pointful.hs b/Lambdabot/Pointful.hs index 8c3e67e..7811332 100644 --- a/Lambdabot/Pointful.hs +++ b/Lambdabot/Pointful.hs @@ -42,11 +42,11 @@ succAlpha [] = "a" -- move lambda patterns into LHS optimizeD :: Decl -> Decl -optimizeD (PatBind locat (PVar fname) (UnGuardedRhs (Lambda _ pats rhs)) (BDecls [])) - = FunBind [Match locat fname pats Nothing (UnGuardedRhs rhs) (BDecls [])] +optimizeD (PatBind locat (PVar fname) (UnGuardedRhs (Lambda _ pats rhs)) Nothing) + = FunBind [Match locat fname pats Nothing (UnGuardedRhs rhs) Nothing] ---- combine function binding and lambda -optimizeD (FunBind [Match locat fname pats1 Nothing (UnGuardedRhs (Lambda _ pats2 rhs)) (BDecls [])]) - = FunBind [Match locat fname (pats1 ++ pats2) Nothing (UnGuardedRhs rhs) (BDecls [])] +optimizeD (FunBind [Match locat fname pats1 Nothing (UnGuardedRhs (Lambda _ pats2 rhs)) Nothing]) + = FunBind [Match locat fname (pats1 ++ pats2) Nothing (UnGuardedRhs rhs) Nothing] optimizeD x = x -- remove parens @@ -162,7 +162,7 @@ combinators = M.fromList $ map declToTuple defs where defs = case parseModule combinatorModule of ParseOk (Hs.Module _ _ _ _ _ _ d) -> d f@(ParseFailed _ _) -> error ("Combinator loading: " ++ show f) - declToTuple (PatBind _ (PVar fname) (UnGuardedRhs body) (BDecls [])) + declToTuple (PatBind _ (PVar fname) (UnGuardedRhs body) Nothing) = (UnQual fname, Paren body) declToTuple _ = error "Pointful Plugin error: can't convert declaration to tuple" diff --git a/pointful.cabal b/pointful.cabal index 2ace007..e041b93 100644 --- a/pointful.cabal +++ b/pointful.cabal @@ -21,7 +21,7 @@ Library other-modules: Lambdabot.Parser build-depends: base >= 4.4 && < 5, containers >= 0.4, - haskell-src-exts >= 1.16.0, + haskell-src-exts >= 1.17.0, mtl >= 2, syb >= 0.3, transformers >= 0.2 @@ -30,7 +30,7 @@ Executable pointful main-is: Pointful.hs build-depends: base >= 4.4 && < 5, containers >= 0.4, - haskell-src-exts >= 1.16.0, + haskell-src-exts >= 1.17.0, mtl >= 2, syb >= 0.3, transformers >= 0.2
