From 8aa21e92336579ce8cb4c09bff0cdaabdeed5c1c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Nov 2014 14:00:53 +0900 Subject: [PATCH] further remove "hiding (runTests)" since they break on ghc-7.4 this should fix the f19 build --- ...eck-disable-TemplateHaskell-runTests.patch | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/ShellCheck-disable-TemplateHaskell-runTests.patch b/ShellCheck-disable-TemplateHaskell-runTests.patch index c1a95c9..a753d01 100644 --- a/ShellCheck-disable-TemplateHaskell-runTests.patch +++ b/ShellCheck-disable-TemplateHaskell-runTests.patch @@ -1,6 +1,6 @@ diff -up ShellCheck-0.3.4/ShellCheck.cabal.orig ShellCheck-0.3.4/ShellCheck.cabal --- ShellCheck-0.3.4/ShellCheck.cabal.orig 2014-07-09 10:52:01.000000000 +0900 -+++ ShellCheck-0.3.4/ShellCheck.cabal 2014-11-06 19:34:50.761660370 +0900 ++++ ShellCheck-0.3.4/ShellCheck.cabal 2014-11-06 19:44:37.829332580 +0900 @@ -41,8 +41,7 @@ library json, mtl, @@ -23,7 +23,7 @@ diff -up ShellCheck-0.3.4/ShellCheck.cabal.orig ShellCheck-0.3.4/ShellCheck.caba test-suite test-shellcheck diff -up ShellCheck-0.3.4/ShellCheck/Analytics.hs.orig ShellCheck-0.3.4/ShellCheck/Analytics.hs --- ShellCheck-0.3.4/ShellCheck/Analytics.hs.orig 2014-07-09 10:52:01.000000000 +0900 -+++ ShellCheck-0.3.4/ShellCheck/Analytics.hs 2014-11-06 19:30:25.675907927 +0900 ++++ ShellCheck-0.3.4/ShellCheck/Analytics.hs 2014-11-07 13:56:50.249086778 +0900 @@ -15,8 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -34,8 +34,12 @@ diff -up ShellCheck-0.3.4/ShellCheck/Analytics.hs.orig ShellCheck-0.3.4/ShellChe import Control.Arrow (first) import Control.Monad -@@ -33,7 +32,6 @@ import ShellCheck.Data - import ShellCheck.Parser hiding (runTests) +@@ -30,10 +29,9 @@ import Data.Maybe + import Debug.Trace + import ShellCheck.AST + import ShellCheck.Data +-import ShellCheck.Parser hiding (runTests) ++import ShellCheck.Parser import Text.Regex import qualified Data.Map as Map -import Test.QuickCheck.All (quickCheckAll) @@ -52,7 +56,7 @@ diff -up ShellCheck-0.3.4/ShellCheck/Analytics.hs.orig ShellCheck-0.3.4/ShellChe - diff -up ShellCheck-0.3.4/ShellCheck/Parser.hs.orig ShellCheck-0.3.4/ShellCheck/Parser.hs --- ShellCheck-0.3.4/ShellCheck/Parser.hs.orig 2014-07-09 10:52:01.000000000 +0900 -+++ ShellCheck-0.3.4/ShellCheck/Parser.hs 2014-11-06 19:30:34.103931850 +0900 ++++ ShellCheck-0.3.4/ShellCheck/Parser.hs 2014-11-06 19:44:37.830332583 +0900 @@ -15,8 +15,8 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -82,7 +86,7 @@ diff -up ShellCheck-0.3.4/ShellCheck/Parser.hs.orig ShellCheck-0.3.4/ShellCheck/ - diff -up ShellCheck-0.3.4/ShellCheck/Simple.hs.orig ShellCheck-0.3.4/ShellCheck/Simple.hs --- ShellCheck-0.3.4/ShellCheck/Simple.hs.orig 2014-07-09 10:52:01.000000000 +0900 -+++ ShellCheck-0.3.4/ShellCheck/Simple.hs 2014-11-06 19:30:46.321966530 +0900 ++++ ShellCheck-0.3.4/ShellCheck/Simple.hs 2014-11-07 13:57:03.711115912 +0900 @@ -15,15 +15,13 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -91,8 +95,10 @@ diff -up ShellCheck-0.3.4/ShellCheck/Simple.hs.orig ShellCheck-0.3.4/ShellCheck/ -module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage, runTests) where +module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage) where - import ShellCheck.Parser hiding (runTests) - import ShellCheck.Analytics hiding (runTests) +-import ShellCheck.Parser hiding (runTests) +-import ShellCheck.Analytics hiding (runTests) ++import ShellCheck.Parser ++import ShellCheck.Analytics import Data.Maybe import Text.Parsec.Pos import Data.List