rpms
/
ShellCheck
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further remove "hiding (runTests)" since they break on ghc-7.4

Browse Source 
this should fix the f19 build
epel9
Jens Petersen 10 years ago
parent ba15a85ee6
commit 8aa21e9233
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File

22
ShellCheck-disable-TemplateHaskell-runTests.patch
Unescape View File

@ -1,6 +1,6 @@
diff -up ShellCheck-0.3.4/ShellCheck.cabal.orig ShellCheck-0.3.4/ShellCheck.cabal 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.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 @@ -41,8 +41,7 @@ library
json, json,
mtl, mtl,
@ -23,7 +23,7 @@ diff -up ShellCheck-0.3.4/ShellCheck.cabal.orig ShellCheck-0.3.4/ShellCheck.caba
test-suite test-shellcheck test-suite test-shellcheck
diff -up ShellCheck-0.3.4/ShellCheck/Analytics.hs.orig ShellCheck-0.3.4/ShellCheck/Analytics.hs 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.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 @@ @@ -15,8 +15,7 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -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.Arrow (first)
import Control.Monad import Control.Monad
@@ -33,7 +32,6 @@ import ShellCheck.Data @@ -30,10 +29,9 @@ import Data.Maybe
import ShellCheck.Parser hiding (runTests) import Debug.Trace
import ShellCheck.AST
import ShellCheck.Data
-import ShellCheck.Parser hiding (runTests)
+import ShellCheck.Parser
import Text.Regex import Text.Regex
import qualified Data.Map as Map import qualified Data.Map as Map
-import Test.QuickCheck.All (quickCheckAll) -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 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.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 @@ @@ -15,8 +15,8 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -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 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.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 @@ @@ -15,15 +15,13 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -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, runTests) where
+module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage) where +module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage) where
import ShellCheck.Parser hiding (runTests) -import ShellCheck.Parser hiding (runTests)
import ShellCheck.Analytics hiding (runTests) -import ShellCheck.Analytics hiding (runTests)
+import ShellCheck.Parser
+import ShellCheck.Analytics
import Data.Maybe import Data.Maybe
import Text.Parsec.Pos import Text.Parsec.Pos
import Data.List import Data.List

Write Preview
Loading…
Cancel
Save