build fixes for newer ghc8 and newer hscolour

This commit is contained in:
Jens Petersen 2016-06-21 09:59:20 +09:00
parent bf709e7454
commit fdfc500d11
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,35 @@
diff -up hlint-1.9.10/src/HsColour.hs~ hlint-1.9.10/src/HsColour.hs
--- hlint-1.9.10/src/HsColour.hs~ 2014-10-20 06:20:38.000000000 +0900
+++ hlint-1.9.10/src/HsColour.hs 2016-06-21 09:46:30.231542683 +0900
@@ -22,6 +22,6 @@ hsColourConsole = do
return $ TTY.hscolour prefs
hsColourHTML :: String -> String
-hsColourHTML = CSS.hscolour False
+hsColourHTML = CSS.hscolour False 1
#endif
diff -up hlint-1.9.10/src/HSE/FreeVars.hs~ hlint-1.9.10/src/HSE/FreeVars.hs
--- hlint-1.9.10/src/HSE/FreeVars.hs~ 2014-10-20 06:20:38.000000000 +0900
+++ hlint-1.9.10/src/HSE/FreeVars.hs 2016-06-21 09:36:14.757740411 +0900
@@ -3,7 +3,7 @@
module HSE.FreeVars(FreeVars, freeVars, vars, varss, pvars, declBind) where
import HSE.Type
-import Data.Monoid
+import Data.Monoid hiding (Alt)
import qualified Data.Set as Set
import Data.Set(Set)
diff -up hlint-1.9.10/src/Util.hs~ hlint-1.9.10/src/Util.hs
--- hlint-1.9.10/src/Util.hs~ 2014-10-20 06:20:38.000000000 +0900
+++ hlint-1.9.10/src/Util.hs 2016-06-21 09:50:15.080178079 +0900
@@ -61,7 +61,7 @@ listM' x = length x `seq` return x
---------------------------------------------------------------------
-- PRELUDE
-notNull = not . null
+notNull p = not $ null p
headDef :: a -> [a] -> a
headDef x [] = x

View File

@ -4,12 +4,13 @@
Name: %{pkg_name}
Version: 1.9.10
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Haskell source code suggestions
License: BSD
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
Patch0: hlint-1.9.10-build-fixes.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@ -51,6 +52,7 @@ This package provides the Haskell %{name} library development files.
%prep
%setup -q
%patch0 -p1 -b .orig
%build
@ -88,6 +90,9 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man
%changelog
* Tue Jun 21 2016 Jens Petersen <petersen@redhat.com> - 1.9.10-4
- build fixes for newer ghc8 and newer hscolour
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild