git.iko.soy/stackage
on master help sign in
Some GHC 7.8 patches
commit14e6cc712370bb8624944f2a11ab84d2cfb2d895 authorMichael Snoyman <michael@snoyman.com> dateMon 9 Dec 2013, 18:37 (13 years ago) parente46572e
4 files changed+104
compare with master
unifiedsplit
patching/patches/async-2.0.1.4.patch+19 patching/patches/language-javascript-0.5.8.patch+39 patching/patches/monad-peel-0.1.1.patch+34 patching/patches/vault-0.3.0.2.patch+12
patching/patches/async-2.0.1.4.patchnew file+19
@@ -0,0 +1,19 @@
1+diff -ru orig/async.cabal new/async.cabal
2+--- orig/async.cabal 2013-12-09 14:04:55.984162531 +0200
3++++ new/async.cabal 2013-12-09 14:04:55.000000000 +0200
4+@@ -70,13 +70,13 @@
5+
6+ library
7+ exposed-modules: Control.Concurrent.Async
8+- build-depends: base >= 4.3 && < 4.7, stm >= 2.2 && < 2.5
9++ build-depends: base >= 4.3 && < 4.8, stm >= 2.2 && < 2.5
10+
11+ test-suite test-async
12+ type: exitcode-stdio-1.0
13+ hs-source-dirs: test
14+ main-is: test-async.hs
15+- build-depends: base >= 4.3 && < 4.7,
16++ build-depends: base >= 4.3 && < 4.8,
17+ async,
18+ test-framework,
19+ test-framework-hunit,
patching/patches/language-javascript-0.5.8.patchnew file+39
@@ -0,0 +1,39 @@
1+Only in new: dist
2+diff -ru orig/language-javascript.cabal new/language-javascript.cabal
3+--- orig/language-javascript.cabal 2013-12-09 14:11:28.596175378 +0200
4++++ new/language-javascript.cabal 2013-12-09 14:11:28.000000000 +0200
5+@@ -30,7 +30,7 @@
6+
7+ Library
8+ Build-depends: base >= 4 && < 5
9+- , array >= 0.3 && < 0.5
10++ , array >= 0.3 && < 0.6
11+ , mtl >= 1.1 && < 2.9
12+ , containers >= 0.2 && < 0.6
13+ , utf8-light >= 0.4 && < 1.0
14+diff -ru orig/src/Language/JavaScript/Parser/Lexer.hs new/src/Language/JavaScript/Parser/Lexer.hs
15+--- orig/src/Language/JavaScript/Parser/Lexer.hs 2013-12-09 14:11:28.592175378 +0200
16++++ new/src/Language/JavaScript/Parser/Lexer.hs 2013-12-09 14:11:27.000000000 +0200
17+@@ -1,4 +1,4 @@
18+-{-# LANGUAGE CPP,MagicHash #-}
19++{-# LANGUAGE BangPatterns, CPP,MagicHash #-}
20+ {-# LINE 1 "src-dev/Language/JavaScript/Parser/Lexer.x" #-}
21+
22+
23+@@ -708,11 +708,15 @@
24+
25+ let
26+ (base) = alexIndexInt32OffAddr alex_base s
27+- ((I# (ord_c))) = fromIntegral c
28++ !((I# (ord_c))) = fromIntegral c
29+ (offset) = (base +# ord_c)
30+ (check) = alexIndexInt16OffAddr alex_check offset
31+
32++#if MIN_VERSION_base(4, 7, 0)
33++ (new_s) = if (I# (offset >=# 0#) /= 0) && (I# (check ==# ord_c) /= 0)
34++#else
35+ (new_s) = if (offset >=# 0#) && (check ==# ord_c)
36++#endif
37+ then alexIndexInt16OffAddr alex_table offset
38+ else alexIndexInt16OffAddr alex_deflt s
39+ in
patching/patches/monad-peel-0.1.1.patchnew file+34
@@ -0,0 +1,34 @@
1+diff -ru orig/Control/Exception/Peel.hs new/Control/Exception/Peel.hs
2+--- orig/Control/Exception/Peel.hs 2013-12-09 18:35:35.592693947 +0200
3++++ new/Control/Exception/Peel.hs 2013-12-09 18:35:35.000000000 +0200
4+@@ -1,3 +1,4 @@
5++{-# LANGUAGE CPP #-}
6+ {-# LANGUAGE ExistentialQuantification #-}
7+
8+ {- |
9+@@ -20,7 +21,9 @@
10+ handle, handleJust,
11+ try, tryJust,
12+ evaluate,
13++#if !MIN_VERSION_base(4, 7, 0)
14+ block, unblock,
15++#endif
16+ bracket, bracket_, bracketOnError,
17+ finally, onException,
18+ ) where
19+@@ -108,6 +111,7 @@
20+ evaluate :: MonadIO m => a -> m a
21+ evaluate = liftIO . E.evaluate
22+
23++#if !MIN_VERSION_base(4, 7, 0)
24+ -- |Generalized version of 'E.block'.
25+ block :: MonadPeelIO m => m a -> m a
26+ block = liftIOOp_ E.block
27+@@ -115,6 +119,7 @@
28+ -- |Generalized version of 'E.unblock'.
29+ unblock :: MonadPeelIO m => m a -> m a
30+ unblock = liftIOOp_ E.unblock
31++#endif
32+
33+ -- |Generalized version of 'E.bracket'. Note, any monadic side
34+ -- effects in @m@ of the \"release\" computation will be discarded; it
patching/patches/vault-0.3.0.2.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ru orig/vault.cabal new/vault.cabal
2+--- orig/vault.cabal 2013-12-09 14:04:56.244162539 +0200
3++++ new/vault.cabal 2013-12-09 14:04:56.000000000 +0200
4+@@ -47,7 +47,7 @@
5+
6+ Library
7+ hs-source-dirs: src
8+- build-depends: base >= 4.5 && < 4.7,
9++ build-depends: base >= 4.5 && < 4.8,
10+ containers >= 0.4 && < 0.6,
11+ unordered-containers >= 0.2.3.0 && < 0.3,
12+ hashable >= 1.1.2.5 && < 1.3