diff --git a/_service b/_service deleted file mode 100644 index f4620cc..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/alex-3.1.4-ghc-7.10.patch b/alex-3.1.4-ghc-7.10.patch new file mode 100644 index 0000000..cb422b6 --- /dev/null +++ b/alex-3.1.4-ghc-7.10.patch @@ -0,0 +1,24 @@ +diff --git a/templates/wrappers.hs b/templates/wrappers.hs +index a1a1a6d..c020cc7 100644 +--- a/templates/wrappers.hs ++++ b/templates/wrappers.hs +@@ -284,6 +284,19 @@ runAlex input (Alex f) + + newtype Alex a = Alex { unAlex :: AlexState -> Either String (AlexState, a) } + ++instance Functor Alex where ++ fmap f a = Alex $ \s -> case unAlex a s of ++ Left msg -> Left msg ++ Right (s', a') -> Right (s', f a') ++ ++instance Applicative Alex where ++ pure a = Alex $ \s -> Right (s, a) ++ fa <*> a = Alex $ \s -> case unAlex fa s of ++ Left msg -> Left msg ++ Right (s', f) -> case unAlex a s' of ++ Left msg -> Left msg ++ Right (s'', b) -> Right (s'', f b) ++ + instance Monad Alex where + m >>= k = Alex $ \s -> case unAlex m s of + Left msg -> Left msg diff --git a/alex.changes b/alex.changes index 29c191f..7bd3966 100644 --- a/alex.changes +++ b/alex.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 13 09:19:35 UTC 2015 - mimi.vx@gmail.com + +- add alex-3.1.4-ghc-7.10.patch +* temporary disable tests + ------------------------------------------------------------------- Fri Apr 10 13:35:55 UTC 2015 - mimi.vx@gmail.com diff --git a/alex.spec b/alex.spec index 32f30d4..01dc1b7 100644 --- a/alex.spec +++ b/alex.spec @@ -29,6 +29,9 @@ Group: Development/Languages/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM alex-3.1.4-ghc-7.10.patch -- fix for new prelude in ghc-7.10 -- Sergei Trofimovich +Patch0: alex-3.1.4-ghc-7.10.patch + BuildRequires: autoconf BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel @@ -36,9 +39,6 @@ BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros -%if %{with tests} -BuildRequires: ghc-process-devel -%endif %description Alex is a tool for generating lexical analysers in Haskell. It takes a @@ -48,6 +48,7 @@ lex or flex for C/C++. %prep %setup -q +%patch0 -p1 %build %ghc_bin_build @@ -60,11 +61,6 @@ test -f configure || autoreconf mkdir -p %{buildroot}/%{_mandir}/man1 cp doc/alex.1 %{buildroot}/%{_mandir}/man1 -%check -%if %{with tests} -%cabal test -%endif - %files %defattr(-,root,root,-) %doc LICENSE ANNOUNCE README TODO