commit pointfree for openSUSE:Factory
Hello community, here is the log from the commit of package pointfree for openSUSE:Factory checked in at 2017-09-15 22:29:55 Comparing /work/SRC/openSUSE:Factory/pointfree (Old) and /work/SRC/openSUSE:Factory/.pointfree.new (New) Package is "pointfree" Fri Sep 15 22:29:55 2017 rev:7 rq:525794 version:1.1.1.3 Changes: --- /work/SRC/openSUSE:Factory/pointfree/pointfree.changes 2017-04-13 10:45:18.323430649 +0200 +++ /work/SRC/openSUSE:Factory/.pointfree.new/pointfree.changes 2017-09-15 22:29:56.886987251 +0200 @@ -1,0 +2,5 @@ +Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +--- Other differences: -- ++ pointfree.spec ++ --- /var/tmp/diff_new_pack.ghHFVk/_old 2017-09-15 22:29:57.578889785 +0200 +++ /var/tmp/diff_new_pack.ghHFVk/_new 2017-09-15 22:29:57.582889222 +0200 @@ -23,8 +23,8 @@ Release:0 Summary:Tool for refactoring expressions into pointfree form License:MIT -Group: Development/Languages/Other -Url:https://hackage.haskell.org/package/%{name} +Group: Development/Libraries/Haskell +URL:https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel @@ -32,7 +32,6 @@ BuildRequires: ghc-haskell-src-exts-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -51,7 +50,7 @@ %package -n ghc-%{name}-devel Summary:Haskell %{name} library development files -Group: Development/Libraries/Other +Group: Development/Libraries/Haskell Requires: ghc-%{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} @@ -79,17 +78,14 @@ %ghc_pkg_recache %files -%defattr(-,root,root,-) %doc LICENSE %doc ChangeLog README %{_bindir}/%{name} %files -n ghc-%{name} -f ghc-%{name}.files -%defattr(-,root,root,-) %doc LICENSE %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%defattr(-,root,root,-) %doc ChangeLog README %changelog
commit pointfree for openSUSE:Factory
Hello community, here is the log from the commit of package pointfree for openSUSE:Factory checked in at 2017-04-13 10:45:16 Comparing /work/SRC/openSUSE:Factory/pointfree (Old) and /work/SRC/openSUSE:Factory/.pointfree.new (New) Package is "pointfree" Thu Apr 13 10:45:16 2017 rev:6 rq:485183 version:1.1.1.3 Changes: --- /work/SRC/openSUSE:Factory/pointfree/pointfree.changes 2016-10-19 13:05:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.pointfree.new/pointfree.changes 2017-04-13 10:45:18.323430649 +0200 @@ -1,0 +2,12 @@ +Tue Mar 14 09:25:08 UTC 2017 - psim...@suse.com + +- Update to version 1.1.1.3 with cabal2obs. + +--- +Wed Feb 22 14:56:11 UTC 2017 - psim...@suse.com + +- Apply "update-dependencies-for-lts-8.patch" downloaded from + https://github.com/bmillwood/pointfree/pull/22.patch to fix + broken dependencies in LTS 8.x. + +--- Old: pointfree-1.1.1.2.tar.gz New: pointfree-1.1.1.3.tar.gz Other differences: -- ++ pointfree.spec ++ --- /var/tmp/diff_new_pack.MTqeAE/_old 2017-04-13 10:45:19.031330540 +0200 +++ /var/tmp/diff_new_pack.MTqeAE/_new 2017-04-13 10:45:19.035329975 +0200 @@ -1,7 +1,7 @@ # # spec file for package pointfree # -# 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,7 +19,7 @@ %global pkg_name pointfree %bcond_with tests Name: %{pkg_name} -Version:1.1.1.2 +Version:1.1.1.3 Release:0 Summary:Tool for refactoring expressions into pointfree form License:MIT ++ pointfree-1.1.1.2.tar.gz -> pointfree-1.1.1.3.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1.1.2/ChangeLog new/pointfree-1.1.1.3/ChangeLog --- old/pointfree-1.1.1.2/ChangeLog 2016-08-31 18:54:54.0 +0200 +++ new/pointfree-1.1.1.3/ChangeLog 2017-03-11 18:07:19.0 +0100 @@ -1,3 +1,7 @@ +v1.1.1.3: +* Dependency update for HSE 1.19, HUnit 1.5 (thanks Nikolay Amiantov) +* Fix bug due to incautious naming of temporary variables (thanks Jack Fransham) + v1.1.1.2: * Dependency update for base 4.9, QuickCheck 2.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1.1.2/Plugin/Pl/Common.hs new/pointfree-1.1.1.3/Plugin/Pl/Common.hs --- old/pointfree-1.1.1.2/Plugin/Pl/Common.hs 2016-08-31 18:54:54.0 +0200 +++ new/pointfree-1.1.1.3/Plugin/Pl/Common.hs 2017-03-11 18:07:19.0 +0100 @@ -105,35 +105,35 @@ minPrec = 0 -- operator precedences are needed both for parsing and prettyprinting -operators :: [[(String, (Assoc, Int))]] +operators :: [[(String, (Assoc (), Int))]] operators = (map . map . second . second $ (+shift)) - [[inf "." AssocRight 9, inf "!!" AssocLeft 9], - [inf name AssocRight 8 | name <- ["^", "^^", "**"]], - [inf name AssocLeft 7 + [[inf "." (AssocRight ()) 9, inf "!!" (AssocLeft ()) 9], + [inf name (AssocRight ()) 8 | name <- ["^", "^^", "**"]], + [inf name (AssocLeft ()) 7 | name <- ["*", "/", "`quot`", "`rem`", "`div`", "`mod`", ":%", "%"]], - [inf name AssocLeft 6 | name <- ["+", "-"]], - [inf name AssocRight 5 | name <- [":", "++"]], - [inf name AssocNone 4 + [inf name (AssocLeft ()) 6 | name <- ["+", "-"]], + [inf name (AssocRight ()) 5 | name <- [":", "++"]], + [inf name (AssocNone ()) 4 | name <- ["==", "/=", "<", "<=", ">=", ">", "`elem`", "`notElem`"]], - [inf "&&" AssocRight 3], - [inf "||" AssocRight 2], - [inf ">>" AssocLeft 1, inf ">>=" AssocLeft 1, inf "=<<" AssocRight 1], - [inf name AssocRight 0 | name <- ["$", "$!", "`seq`"]] + [inf "&&" (AssocRight ()) 3], + [inf "||" (AssocRight ()) 2], + [inf ">>" (AssocLeft ()) 1, inf ">>=" (AssocLeft ()) 1, inf "=<<" (AssocRight ()) 1], + [inf name (AssocRight ()) 0 | name <- ["$", "$!", "`seq`"]] ] where inf name assoc fx = (name, (assoc, fx)) reservedOps :: [String] reservedOps = ["->", "..", "="] -opFM :: M.Map String (Assoc, Int) +opFM :: M.Map String (Assoc (), Int) opFM = (M.fromList $ concat operators) -lookupOp :: String -> Maybe (Assoc, Int) +lookupOp :: String -> Maybe (Assoc (), Int) lookupOp k = M.lookup k opFM -lookupFix :: String -> (Assoc, Int) +lookupFix :: String -> (Assoc (), Int) lookupFix str = case lookupOp $ str of - Nothing -> (AssocLeft, 9 + shift) + Nothing -> ((AssocLeft ()), 9 + shift) Just x
commit pointfree for openSUSE:Factory
Hello community, here is the log from the commit of package pointfree for openSUSE:Factory checked in at 2016-10-19 13:05:04 Comparing /work/SRC/openSUSE:Factory/pointfree (Old) and /work/SRC/openSUSE:Factory/.pointfree.new (New) Package is "pointfree" Changes: --- /work/SRC/openSUSE:Factory/pointfree/pointfree.changes 2016-07-21 08:01:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.pointfree.new/pointfree.changes 2016-10-19 13:05:06.0 +0200 @@ -1,0 +2,5 @@ +Fri Sep 16 21:23:36 UTC 2016 - psim...@suse.com + +- Update to version 1.1.1.2 with cabal2obs. + +--- Old: pointfree-1.1.1.1.tar.gz New: pointfree-1.1.1.2.tar.gz Other differences: -- ++ pointfree.spec ++ --- /var/tmp/diff_new_pack.J9uphA/_old 2016-10-19 13:05:08.0 +0200 +++ /var/tmp/diff_new_pack.J9uphA/_new 2016-10-19 13:05:08.0 +0200 @@ -19,7 +19,7 @@ %global pkg_name pointfree %bcond_with tests Name: %{pkg_name} -Version:1.1.1.1 +Version:1.1.1.2 Release:0 Summary:Tool for refactoring expressions into pointfree form License:MIT @@ -27,7 +27,6 @@ Url:https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-haskell-src-exts-devel @@ -38,7 +37,6 @@ BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel %endif -# End cabal-rpm deps %description The pointfree tool is a standalone command-line version of the pl plugin for @@ -65,20 +63,14 @@ %prep %setup -q - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post -n ghc-%{name}-devel %ghc_pkg_recache ++ pointfree-1.1.1.1.tar.gz -> pointfree-1.1.1.2.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1.1.1/ChangeLog new/pointfree-1.1.1.2/ChangeLog --- old/pointfree-1.1.1.1/ChangeLog 2015-12-26 17:23:10.0 +0100 +++ new/pointfree-1.1.1.2/ChangeLog 2016-08-31 18:54:54.0 +0200 @@ -1,3 +1,6 @@ +v1.1.1.2: +* Dependency update for base 4.9, QuickCheck 2.9 + v1.1.1.1: * Dependency update for HSE 1.17, transformers 0.5 * Trim tested-with, I no longer have a working copy of old GHCs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1.1.1/pointfree.cabal new/pointfree-1.1.1.2/pointfree.cabal --- old/pointfree-1.1.1.1/pointfree.cabal 2015-12-26 17:23:10.0 +0100 +++ new/pointfree-1.1.1.2/pointfree.cabal 2016-08-31 18:54:54.0 +0200 @@ -1,7 +1,7 @@ Cabal-Version: >= 1.8 Name: pointfree -Version: 1.1.1.1 +Version: 1.1.1.2 Category: Tool Synopsis: Tool for refactoring expressions into pointfree form @@ -17,7 +17,7 @@ Extra-source-files: ChangeLog README test/Test.hs Build-type: Simple -Tested-with: GHC == 7.10.2 +Tested-with: GHC == 8.0.1 Source-repository head type: git @@ -26,7 +26,7 @@ Library Exposed-modules: Pointfree - Build-depends: base >= 4.5 && < 4.9, + Build-depends: base >= 4.5 && < 4.10, array >= 0.3 && < 0.6, containers >= 0.4 && < 0.6, haskell-src-exts == 1.17.*, @@ -42,7 +42,7 @@ Executable pointfree Main-is: Main.hs GHC-options: -W - Build-depends: base >= 4.3 && < 4.9, + Build-depends: base >= 4.3 && < 4.10, array >= 0.3 && < 0.6, containers >= 0.4 && < 0.6, haskell-src-exts == 1.17.*, @@ -66,7 +66,7 @@ containers >= 0.3 && < 0.6, haskell-src-exts == 1.17.*, HUnit >= 1.1 && < 1.4, -QuickCheck >= 2.1 && < 2.9, +QuickCheck >= 2.1 && < 2.10, transformers < 0.6 GHC-Options:-W
commit pointfree for openSUSE:Factory
Hello community, here is the log from the commit of package pointfree for openSUSE:Factory checked in at 2016-07-21 08:01:48 Comparing /work/SRC/openSUSE:Factory/pointfree (Old) and /work/SRC/openSUSE:Factory/.pointfree.new (New) Package is "pointfree" Changes: --- /work/SRC/openSUSE:Factory/pointfree/pointfree.changes 2016-06-02 09:39:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.pointfree.new/pointfree.changes 2016-07-21 08:01:52.0 +0200 @@ -1,0 +2,5 @@ +Sun Jul 10 17:27:26 UTC 2016 - psim...@suse.com + +- Update to version 1.1.1.1 revision 0 with cabal2obs. + +--- Other differences: -- ++ pointfree.spec ++ --- /var/tmp/diff_new_pack.s7G5fQ/_old 2016-07-21 08:01:53.0 +0200 +++ /var/tmp/diff_new_pack.s7G5fQ/_new 2016-07-21 08:01:53.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package pointfree # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,27 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global pkg_name pointfree +%global pkg_name pointfree %bcond_with tests - -Name: pointfree +Name: %{pkg_name} Version:1.1.1.1 Release:0 Summary:Tool for refactoring expressions into pointfree form -Group: Development/Languages/Other - License:MIT +Group: Development/Languages/Other Url:https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-haskell-src-exts-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -46,7 +44,6 @@ The pointfree tool is a standalone command-line version of the pl plugin for lambdabot. - %package -n ghc-%{name} Summary:Haskell %{name} library Group: System/Libraries @@ -54,22 +51,20 @@ %description -n ghc-%{name} This package provides the Haskell %{name} shared library. - %package -n ghc-%{name}-devel Summary:Haskell %{name} library development files Group: Development/Libraries/Other +Requires: ghc-%{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: ghc-%{name} = %{version}-%{release} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library development files. - %prep %setup -q -cabal-tweak-dep-ver base '< 4.9' '< 4.10' + %build %ghc_lib_build @@ -81,33 +76,28 @@ %check %if %{with tests} -%cabal test +%{cabal} test %endif %post -n ghc-%{name}-devel %ghc_pkg_recache - %postun -n ghc-%{name}-devel %ghc_pkg_recache - %files %defattr(-,root,root,-) %doc LICENSE -%doc README +%doc ChangeLog README %{_bindir}/%{name} - %files -n ghc-%{name} -f ghc-%{name}.files %defattr(-,root,root,-) %doc LICENSE - %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) -%doc README - +%doc ChangeLog README %changelog
commit pointfree for openSUSE:Factory
Hello community, here is the log from the commit of package pointfree for openSUSE:Factory checked in at 2016-06-02 09:39:42 Comparing /work/SRC/openSUSE:Factory/pointfree (Old) and /work/SRC/openSUSE:Factory/.pointfree.new (New) Package is "pointfree" Changes: --- /work/SRC/openSUSE:Factory/pointfree/pointfree.changes 2016-01-09 23:13:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.pointfree.new/pointfree.changes 2016-06-02 09:39:44.0 +0200 @@ -1,0 +2,8 @@ +Wed Jun 1 10:51:40 UTC 2016 - mimi...@gmail.com + +- update to 1.1.1.1 +- drop fix-haskell-src-exts.patch , upstreamed +* Fix some bugs in qualified operator handling +* Dependency update for HSE 1.17, transformers 0.5 + +--- Old: fix-haskell-src-exts.patch pointfree-1.1.tar.gz New: pointfree-1.1.1.1.tar.gz Other differences: -- ++ pointfree.spec ++ --- /var/tmp/diff_new_pack.IKqpOB/_old 2016-06-02 09:39:44.0 +0200 +++ /var/tmp/diff_new_pack.IKqpOB/_new 2016-06-02 09:39:44.0 +0200 @@ -20,7 +20,7 @@ %bcond_with tests Name: pointfree -Version:1.1 +Version:1.1.1.1 Release:0 Summary:Tool for refactoring expressions into pointfree form Group: Development/Languages/Other @@ -28,10 +28,7 @@ License:MIT 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 fix build with LTS4 -Patch0: fix-haskell-src-exts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: @@ -72,7 +69,7 @@ %prep %setup -q -%patch0 -p1 +cabal-tweak-dep-ver base '< 4.9' '< 4.10' %build %ghc_lib_build ++ pointfree-1.1.tar.gz -> pointfree-1.1.1.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1/ChangeLog new/pointfree-1.1.1.1/ChangeLog --- old/pointfree-1.1/ChangeLog 2015-04-11 02:55:14.0 +0200 +++ new/pointfree-1.1.1.1/ChangeLog 2015-12-26 17:23:10.0 +0100 @@ -1,3 +1,10 @@ +v1.1.1.1: +* Dependency update for HSE 1.17, transformers 0.5 +* Trim tested-with, I no longer have a working copy of old GHCs + +v1.1.1: +* Fix some bugs in qualified operator handling + v1.1: * Drop support for GHC 7.0 and 7.2 (actually already lost with HSE 1.16) * Add support for GHC 7.10.1 @@ -7,7 +14,8 @@ * Dependency update for QuickCheck 2.9 v1.0.4.8: -* Dependency update for HSE 1.16 and transformers 0.5 +* Dependency update for HSE 1.16 +* Fixing support for transformers 0.4 v1.0.4.7: * Dependency update for HSE 1.15 and transformers 0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1/Plugin/Pl/Parser.hs new/pointfree-1.1.1.1/Plugin/Pl/Parser.hs --- old/pointfree-1.1/Plugin/Pl/Parser.hs 2015-04-11 02:55:14.0 +0200 +++ new/pointfree-1.1.1.1/Plugin/Pl/Parser.hs 2015-12-26 17:23:10.0 +0100 @@ -12,7 +12,7 @@ nameString (HSE.Symbol s) = (Inf, s) qnameString :: HSE.QName -> (Fixity, String) -qnameString (HSE.Qual m n) = fmap (HSE.prettyPrint m ++) (nameString n) +qnameString (HSE.Qual m n) = fmap ((HSE.prettyPrint m ++ ".") ++) (nameString n) qnameString (HSE.UnQual n) = nameString n qnameString (HSE.Special sc) = case sc of HSE.UnitCon -> (Pref, "()") @@ -68,9 +68,9 @@ hseToDecl :: HSE.Decl -> Decl hseToDecl dec = case dec of - HSE.PatBind _ (HSE.PVar n) (HSE.UnGuardedRhs e) (HSE.BDecls []) -> + HSE.PatBind _ (HSE.PVar n) (HSE.UnGuardedRhs e) Nothing -> Define (snd (nameString n)) (hseToExpr e) - HSE.FunBind [HSE.Match _ n ps Nothing (HSE.UnGuardedRhs e) (HSE.BDecls [])] -> + HSE.FunBind [HSE.Match _ n ps Nothing (HSE.UnGuardedRhs e) Nothing] -> Define (snd (nameString n)) (foldr (\p x -> Lambda (hseToPattern p) x) (hseToExpr e) ps) _ -> todo dec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pointfree-1.1/Plugin/Pl/PrettyPrinter.hs new/pointfree-1.1.1.1/Plugin/Pl/PrettyPrinter.hs --- old/pointfree-1.1/Plugin/Pl/PrettyPrinter.hs2015-04-11 02:55:14.0 +0200 +++ new/pointfree-1.1.1.1/Plugin/Pl/PrettyPrinter.hs2015-12-26 17:23:10.0 +0100 @@ -127,7 +127,17 @@ prettyPrecPattern 6 p1 . (':':) . prettyPrecPattern 5 p2 isOperator :: String -> Bool -isOperator s = s /= "()" && all (\c -> isSymbol c || isPunctuation c) s +isOperator s = + case break (== '.') s of +(_, "") -> isUnqualOp
commit pointfree for openSUSE:Factory
Hello community, here is the log from the commit of package pointfree for openSUSE:Factory checked in at 2016-01-09 23:13:31 Comparing /work/SRC/openSUSE:Factory/pointfree (Old) and /work/SRC/openSUSE:Factory/.pointfree.new (New) Package is "pointfree" Changes: --- /work/SRC/openSUSE:Factory/pointfree/pointfree.changes 2015-06-30 10:15:39.0 +0200 +++ /work/SRC/openSUSE:Factory/.pointfree.new/pointfree.changes 2016-01-09 23:13:45.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 15 21:54:50 UTC 2015 - mimi...@gmail.com + +- add fix-haskell-src-exts.patch Sergei Trofimovich + +--- New: fix-haskell-src-exts.patch Other differences: -- ++ pointfree.spec ++ --- /var/tmp/diff_new_pack.BQGm54/_old 2016-01-09 23:13:46.0 +0100 +++ /var/tmp/diff_new_pack.BQGm54/_new 2016-01-09 23:13:46.0 +0100 @@ -28,6 +28,8 @@ License:MIT 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 fix build with LTS4 +Patch0: fix-haskell-src-exts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel @@ -70,7 +72,7 @@ %prep %setup -q - +%patch0 -p1 %build %ghc_lib_build ++ fix-haskell-src-exts.patch ++ 7776a6c52c095f4ed4372a368a549398 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 21 Nov 2015 12:19:24 + Subject: [PATCH 1/2] pointfree.cabal: allow HUnit-1.3 Signed-off-by: Sergei Trofimovich --- pointfree.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pointfree.cabal b/pointfree.cabal index d79966b..a60ad1c 100644 --- a/pointfree.cabal +++ b/pointfree.cabal @@ -69,7 +69,7 @@ Test-suite tests base < 5, containers >= 0.3 && < 0.6, haskell-src-exts == 1.16.*, -HUnit >= 1.1 && < 1.3, +HUnit >= 1.1 && < 1.4, QuickCheck >= 2.1 && < 2.9, transformers < 0.5 >From 9b18b83a9a0d1fa5136f1ec8b255293bf65892f5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 21 Nov 2015 12:25:58 + Subject: [PATCH 2/2] pointfree.cabal: tweak for haskell-src-exts-1.17 Signed-off-by: Sergei Trofimovich --- Plugin/Pl/Parser.hs | 4 ++-- pointfree.cabal | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugin/Pl/Parser.hs b/Plugin/Pl/Parser.hs index 8d95b86..6309b08 100644 --- a/Plugin/Pl/Parser.hs +++ b/Plugin/Pl/Parser.hs @@ -68,9 +68,9 @@ apps f xs = foldl (\a x -> a `App` hseToExpr x) f xs hseToDecl :: HSE.Decl -> Decl hseToDecl dec = case dec of - HSE.PatBind _ (HSE.PVar n) (HSE.UnGuardedRhs e) (HSE.BDecls []) -> + HSE.PatBind _ (HSE.PVar n) (HSE.UnGuardedRhs e) Nothing -> Define (snd (nameString n)) (hseToExpr e) - HSE.FunBind [HSE.Match _ n ps Nothing (HSE.UnGuardedRhs e) (HSE.BDecls [])] -> + HSE.FunBind [HSE.Match _ n ps Nothing (HSE.UnGuardedRhs e) Nothing] -> Define (snd (nameString n)) (foldr (\p x -> Lambda (hseToPattern p) x) (hseToExpr e) ps) _ -> todo dec diff --git a/pointfree.cabal b/pointfree.cabal index a60ad1c..323ade9 100644 --- a/pointfree.cabal +++ b/pointfree.cabal @@ -28,7 +28,7 @@ library Build-depends: base >= 4.5 && < 4.9, array >= 0.3 && < 0.6, containers >= 0.4 && < 0.6, - haskell-src-exts == 1.16.*, + haskell-src-exts == 1.17.*, transformers < 0.5 Other-modules: Plugin.Pl.Common Plugin.Pl.Parser @@ -49,7 +49,7 @@ Executable pointfree Build-depends: base >= 4.3 && < 4.9, array >= 0.3 && < 0.6, containers >= 0.4 && < 0.6, - haskell-src-exts == 1.16.*, + haskell-src-exts == 1.17.*, transformers < 0.5 Other-modules: Plugin.Pl.Common Plugin.Pl.Parser @@ -68,7 +68,7 @@ Test-suite tests array >= 0.3 && < 0.6, base < 5, containers >= 0.3 && < 0.6, -haskell-src-exts == 1.16.*, +haskell-src-exts == 1.17.*, HUnit >= 1.1 && < 1.4, QuickCheck >= 2.1 && < 2.9, transformers < 0.5