git.iko.soy/stackage
on master help sign in
Removed some outdated patches
ea2e4fbMichael Snoyman
patching/patches/async-2.0.1.4.patchdeleted−19
compare with master
unifiedsplit
@@ -1,19 +0,0 @@
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/aws-0.8.3.patchdeleted−143
@@ -1,143 +0,0 @@
1−diff -ru orig/Aws/Core.hs new/Aws/Core.hs
2−--- orig/Aws/Core.hs 2013-12-04 07:33:52.794606590 +0200
3−+++ new/Aws/Core.hs 2013-12-04 07:33:51.000000000 +0200
4−@@ -104,6 +104,8 @@
5− import Data.Char
6− import Data.Conduit (ResourceT, ($$+-))
7− import qualified Data.Conduit as C
8−+import qualified Data.Conduit.List as CL
9−+import Data.Default (def)
10− import Data.IORef
11− import Data.List
12− import Data.Maybe
13−@@ -186,7 +188,11 @@
14− -- | Does not parse response. For debugging.
15− instance ResponseConsumer r (HTTP.Response L.ByteString) where
16− type ResponseMetadata (HTTP.Response L.ByteString) = ()
17−- responseConsumer _ _ resp = HTTP.lbsResponse resp
18−+ responseConsumer _ _ resp = do
19−+ bss <- HTTP.responseBody resp $$+- CL.consume
20−+ return resp
21−+ { HTTP.responseBody = L.fromChunks bss
22−+ }
23−
24− -- | Class for responses that are fully loaded into memory
25− class AsMemoryResponse resp where
26−@@ -340,16 +346,24 @@
27− -- | Additional non-"amz" headers.
28− , sqOtherHeaders :: HTTP.RequestHeaders
29− -- | Request body (used with 'Post' and 'Put').
30−+#if MIN_VERSION_http_conduit(2, 0, 0)
31−+ , sqBody :: Maybe HTTP.RequestBody
32−+#else
33− , sqBody :: Maybe (HTTP.RequestBody (C.ResourceT IO))
34−+#endif
35− -- | String to sign. Note that the string is already signed, this is passed mostly for debugging purposes.
36− , sqStringToSign :: B.ByteString
37− }
38− --deriving (Show)
39−
40− -- | Create a HTTP request from a 'SignedQuery' object.
41−+#if MIN_VERSION_http_conduit(2, 0, 0)
42−+queryToHttpRequest :: SignedQuery -> HTTP.Request
43−+#else
44− queryToHttpRequest :: SignedQuery -> HTTP.Request (C.ResourceT IO)
45−+#endif
46− queryToHttpRequest SignedQuery{..}
47−- = HTTP.def {
48−+ = def {
49− HTTP.method = httpMethod sqMethod
50− , HTTP.secure = case sqProtocol of
51− HTTP -> False
52−diff -ru orig/Aws/S3/Commands/GetObject.hs new/Aws/S3/Commands/GetObject.hs
53−--- orig/Aws/S3/Commands/GetObject.hs 2013-12-04 07:33:52.794606590 +0200
54−+++ new/Aws/S3/Commands/GetObject.hs 2013-12-04 07:33:51.000000000 +0200
55−@@ -9,6 +9,7 @@
56− import qualified Data.ByteString.Char8 as B8
57− import qualified Data.ByteString.Lazy as L
58− import qualified Data.Conduit as C
59−+import qualified Data.Conduit.List as CL
60− import Data.Maybe
61− import qualified Data.Text as T
62− import qualified Data.Text.Encoding as T
63−@@ -81,4 +82,8 @@
64−
65− instance AsMemoryResponse GetObjectResponse where
66− type MemoryResponse GetObjectResponse = GetObjectMemoryResponse
67−- loadToMemory (GetObjectResponse om x) = GetObjectMemoryResponse om <$> HTTP.lbsResponse x
68−+ loadToMemory (GetObjectResponse om x) = do
69−+ bss <- HTTP.responseBody x C.$$+- CL.consume
70−+ return $ GetObjectMemoryResponse om x
71−+ { HTTP.responseBody = L.fromChunks bss
72−+ }
73−diff -ru orig/Aws/S3/Commands/PutObject.hs new/Aws/S3/Commands/PutObject.hs
74−--- orig/Aws/S3/Commands/PutObject.hs 2013-12-04 07:33:52.794606590 +0200
75−+++ new/Aws/S3/Commands/PutObject.hs 2013-12-04 07:33:51.000000000 +0200
76−@@ -1,3 +1,4 @@
77−+{-# LANGUAGE CPP #-}
78− module Aws.S3.Commands.PutObject
79− where
80−
81−@@ -27,11 +28,19 @@
82− poAcl :: Maybe CannedAcl,
83− poStorageClass :: Maybe StorageClass,
84− poWebsiteRedirectLocation :: Maybe T.Text,
85−+#if MIN_VERSION_http_conduit(2, 0, 0)
86−+ poRequestBody :: HTTP.RequestBody,
87−+#else
88− poRequestBody :: HTTP.RequestBody (C.ResourceT IO),
89−+#endif
90− poMetadata :: [(T.Text,T.Text)]
91− }
92−
93−+#if MIN_VERSION_http_conduit(2, 0, 0)
94−+putObject :: Bucket -> T.Text -> HTTP.RequestBody -> PutObject
95−+#else
96− putObject :: Bucket -> T.Text -> HTTP.RequestBody (C.ResourceT IO) -> PutObject
97−+#endif
98− putObject bucket obj body = PutObject obj bucket Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing body []
99−
100− data PutObjectResponse
101−@@ -75,4 +84,4 @@
102−
103− instance AsMemoryResponse PutObjectResponse where
104− type MemoryResponse PutObjectResponse = PutObjectResponse
105−- loadToMemory = return
106−\ No newline at end of file
107−+ loadToMemory = return
108−diff -ru orig/Aws/S3/Core.hs new/Aws/S3/Core.hs
109−--- orig/Aws/S3/Core.hs 2013-12-04 07:33:52.794606590 +0200
110−+++ new/Aws/S3/Core.hs 2013-12-04 07:33:51.000000000 +0200
111−@@ -1,3 +1,4 @@
112−+{-# LANGUAGE CPP #-}
113− module Aws.S3.Core where
114−
115− import Aws.Core
116−@@ -137,7 +138,11 @@
117− , s3QContentMd5 :: Maybe MD5
118− , s3QAmzHeaders :: HTTP.RequestHeaders
119− , s3QOtherHeaders :: HTTP.RequestHeaders
120−+#if MIN_VERSION_http_conduit(2, 0, 0)
121−+ , s3QRequestBody :: Maybe HTTP.RequestBody
122−+#else
123− , s3QRequestBody :: Maybe (HTTP.RequestBody (C.ResourceT IO))
124−+#endif
125− }
126−
127− instance Show S3Query where
128−diff -ru orig/aws.cabal new/aws.cabal
129−--- orig/aws.cabal 2013-12-04 07:33:52.802606590 +0200
130−+++ new/aws.cabal 2013-12-04 07:33:51.000000000 +0200
131−@@ -107,10 +107,11 @@
132− crypto-api >= 0.9,
133− cryptohash >= 0.8 && < 0.12,
134− cryptohash-cryptoapi == 0.1.*,
135−+ data-default == 0.5.*,
136− directory >= 1.0 && < 1.3,
137− failure >= 0.2.0.1 && < 0.3,
138− filepath >= 1.1 && < 1.4,
139−- http-conduit >= 1.9 && < 1.10,
140−+ http-conduit >= 1.9 && < 2.1,
141− http-types >= 0.7 && < 0.9,
142− lifted-base >= 0.1 && < 0.3,
143− monad-control >= 0.3,
patching/patches/cairo-0.12.4.patchdeleted−150
@@ -1,150 +0,0 @@
1−diff -ru orig/Gtk2HsSetup.hs new/Gtk2HsSetup.hs
2−--- orig/Gtk2HsSetup.hs 2013-10-28 08:36:50.283581635 +0100
3−+++ new/Gtk2HsSetup.hs 2013-10-28 08:36:50.000000000 +0100
4−@@ -1,4 +1,4 @@
5−-{-# LANGUAGE CPP #-}
6−+{-# LANGUAGE CPP, ViewPatterns #-}
7−
8− #ifndef CABAL_VERSION_CHECK
9− #error This module has to be compiled via the Setup.hs program which generates the gtk2hs-macros.h file
10−@@ -29,7 +29,7 @@
11− emptyBuildInfo, allBuildInfo,
12− Library(..),
13− libModules, hasLibs)
14−-import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
15−+import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),
16− InstallDirs(..),
17− componentPackageDeps,
18− absoluteInstallDirs)
19−@@ -56,14 +56,26 @@
20− import Distribution.Verbosity
21− import Control.Monad (when, unless, filterM, liftM, forM, forM_)
22− import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList )
23−-import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy)
24−+import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy, stripPrefix)
25− import Data.Ord as Ord (comparing)
26−-import Data.Char (isAlpha)
27−+import Data.Char (isAlpha, isNumber)
28− import qualified Data.Map as M
29− import qualified Data.Set as S
30−+import qualified Distribution.Simple.LocalBuildInfo as LBI
31−
32− import Control.Applicative ((<$>))
33−
34−+#if CABAL_VERSION_CHECK(1,17,0)
35−+import Distribution.Simple.Program.Find ( defaultProgramSearchPath )
36−+onDefaultSearchPath f a b = f a b defaultProgramSearchPath
37−+libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of
38−+ [clbi] -> Just clbi
39−+ _ -> Nothing
40−+#else
41−+onDefaultSearchPath = id
42−+libraryConfig = LBI.libraryConfig
43−+#endif
44−+
45− -- the name of the c2hs pre-compiled header file
46− precompFile = "precompchs.bin"
47−
48−@@ -100,7 +112,7 @@
49−
50− fixLibs :: [FilePath] -> [String] -> [String]
51− fixLibs dlls = concatMap $ \ lib ->
52−- case filter (("lib" ++ lib) `isPrefixOf`) dlls of
53−+ case filter (isLib lib) dlls of
54− dlls@(_:_) -> [dropExtension (pickDll dlls)]
55− _ -> if lib == "z" then [] else [lib]
56− where
57−@@ -111,7 +123,12 @@
58− -- Yes this is a hack but the proper solution is hard: we would need to
59− -- parse the .a file and see which .dll file(s) it needed to link to.
60− pickDll = minimumBy (Ord.comparing length)
61−-
62−+ isLib lib dll =
63−+ case stripPrefix ("lib"++lib) dll of
64−+ Just ('.':_) -> True
65−+ Just ('-':n:_) | isNumber n -> True
66−+ _ -> False
67−+
68− -- The following code is a big copy-and-paste job from the sources of
69− -- Cabal 1.8 just to be able to fix a field in the package file. Yuck.
70−
71−@@ -144,8 +161,8 @@
72− register :: PackageDescription -> LocalBuildInfo
73− -> RegisterFlags -- ^Install in the user's database?; verbose
74− -> IO ()
75−-register pkg@PackageDescription { library = Just lib }
76−- lbi@LocalBuildInfo { libraryConfig = Just clbi } regFlags
77−+register pkg@(library -> Just lib )
78−+ lbi@(libraryConfig -> Just clbi) regFlags
79− = do
80−
81− installedPkgInfoRaw <- generateRegistrationInfo
82−@@ -237,6 +254,7 @@
83− = nub $
84− ["-I" ++ dir | dir <- PD.includeDirs bi]
85− ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
86−+ ++ ["-D__GLASGOW_HASKELL__="++show __GLASGOW_HASKELL__]
87−
88− installCHI :: PackageDescription -- ^information from the .cabal file
89− -> LocalBuildInfo -- ^information from the configure step
90−@@ -426,7 +444,7 @@
91− checkGtk2hsBuildtools :: [Program] -> IO ()
92− checkGtk2hsBuildtools programs = do
93− programInfos <- mapM (\ prog -> do
94−- location <- programFindLocation prog normal
95−+ location <- onDefaultSearchPath programFindLocation prog normal
96− return (programName prog, location)
97− ) programs
98− let printError name = do
99−diff -ru orig/SetupWrapper.hs new/SetupWrapper.hs
100−--- orig/SetupWrapper.hs 2013-10-28 08:36:50.283581635 +0100
101−+++ new/SetupWrapper.hs 2013-10-28 08:36:50.000000000 +0100
102−@@ -29,6 +29,24 @@
103− import Control.Monad
104−
105−
106−+-- moreRecentFile is implemented in Distribution.Simple.Utils, but only in
107−+-- Cabal >= 1.18. For backwards-compatibility, we implement a copy with a new
108−+-- name here. Some desirable alternate strategies don't work:
109−+-- * We can't use CPP to check which version of Cabal we're up against because
110−+-- this is the file that's generating the macros for doing that.
111−+-- * We can't use the name moreRecentFiles and use
112−+-- import D.S.U hiding (moreRecentFiles)
113−+-- because on old GHC's (and according to the Report) hiding a name that
114−+-- doesn't exist is an error.
115−+moreRecentFile' :: FilePath -> FilePath -> IO Bool
116−+moreRecentFile' a b = do
117−+ exists <- doesFileExist b
118−+ if not exists
119−+ then return True
120−+ else do tb <- getModificationTime b
121−+ ta <- getModificationTime a
122−+ return (ta > tb)
123−+
124− setupWrapper :: FilePath -> IO ()
125− setupWrapper setupHsFile = do
126− args <- getArgs
127−@@ -91,8 +109,8 @@
128− -- Currently this is GHC only. It should really be generalised.
129− --
130− compileSetupExecutable = do
131−- setupHsNewer <- setupHsFile `moreRecentFile` setupProgFile
132−- cabalVersionNewer <- setupVersionFile `moreRecentFile` setupProgFile
133−+ setupHsNewer <- setupHsFile `moreRecentFile'` setupProgFile
134−+ cabalVersionNewer <- setupVersionFile `moreRecentFile'` setupProgFile
135− let outOfDate = setupHsNewer || cabalVersionNewer
136− when outOfDate $ do
137− debug verbosity "Setup script is out of date, compiling..."
138−@@ -144,12 +162,3 @@
139− Nothing Nothing Nothing
140− exitCode <- waitForProcess process
141− unless (exitCode == ExitSuccess) $ exitWith exitCode
142−-
143−-moreRecentFile :: FilePath -> FilePath -> IO Bool
144−-moreRecentFile a b = do
145−- exists <- doesFileExist b
146−- if not exists
147−- then return True
148−- else do tb <- getModificationTime b
149−- ta <- getModificationTime a
150−- return (ta > tb)
patching/patches/esqueleto-1.3.4.2.patchdeleted−23
@@ -1,23 +0,0 @@
1−diff -ru orig/esqueleto.cabal new/esqueleto.cabal
2−--- orig/esqueleto.cabal 2013-12-26 14:17:58.627602427 +0200
3−+++ new/esqueleto.cabal 2013-12-26 14:17:58.000000000 +0200
4−@@ -57,7 +57,7 @@
5− build-depends:
6− base >= 4.5 && < 4.7
7− , text == 0.11.*
8−- , persistent == 1.2.*
9−+ , persistent >= 1.2 && < 1.4
10− , transformers >= 0.2
11− , unordered-containers >= 0.2
12− , tagged >= 0.2
13−@@ -83,8 +83,8 @@
14− , HUnit
15− , QuickCheck
16− , hspec >= 1.3 && < 1.8
17−- , persistent-sqlite == 1.2.*
18−- , persistent-template == 1.2.*
19−+ , persistent-sqlite >= 1.2 && < 1.4
20−+ , persistent-template >= 1.2 && < 1.4
21− , monad-control
22− , monad-logger >= 0.3
23−
patching/patches/fast-logger-2.0.1.patchdeleted−19
@@ -1,19 +0,0 @@
1−diff -ru orig/System/Log/FastLogger/Logger.hs new/System/Log/FastLogger/Logger.hs
2−--- orig/System/Log/FastLogger/Logger.hs 2013-12-24 08:14:25.325658733 +0200
3−+++ new/System/Log/FastLogger/Logger.hs 2013-12-24 08:14:24.000000000 +0200
4−@@ -19,6 +19,15 @@
5−
6− data Logger = Logger (MVar Buffer) !BufSize (IORef LogStr)
7−
8−+#if !MIN_VERSION_base(4, 6, 0)
9−+atomicModifyIORef' :: IORef a -> (a -> (a,b)) -> IO b
10−+atomicModifyIORef' ref f = do
11−+ b <- atomicModifyIORef ref
12−+ (\x -> let (a, b) = f x
13−+ in (a, a `seq` b))
14−+ b `seq` return b
15−+#endif
16−+
17− newLogger :: BufSize -> IO Logger
18− newLogger size = do
19− buf <- getBuffer size
patching/patches/fast-logger-2.0.2.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ru orig/System/Log/FastLogger.hs new/System/Log/FastLogger.hs
2−--- orig/System/Log/FastLogger.hs 2013-12-24 10:23:27.725895194 +0200
3−+++ new/System/Log/FastLogger.hs 2013-12-24 10:23:27.000000000 +0200
4−@@ -13,6 +13,8 @@
5− -- * Log messages
6− , LogStr
7− , ToLogStr(..)
8−+ , logStrLength
9−+ , logStrBuilder
10− -- * Writing a log message
11− , pushLogStr
12− -- * Flushing buffered log messages
patching/patches/fay-0.18.0.0.patchdeleted−32
@@ -1,32 +0,0 @@
1−diff -ru orig/src/main/Main.hs new/src/main/Main.hs
2−--- orig/src/main/Main.hs 2013-10-14 09:10:24.895239824 +0300
3−+++ new/src/main/Main.hs 2013-10-14 09:10:24.000000000 +0300
4−@@ -1,3 +1,4 @@
5−+{-# LANGUAGE CPP #-}
6− {-# LANGUAGE FlexibleContexts #-}
7− {-# LANGUAGE RecordWildCards #-}
8− -- | Main compiler executable.
9−@@ -15,6 +16,9 @@
10− import Data.Maybe
11− import Data.Version (showVersion)
12− import Options.Applicative
13−+#if MIN_VERSION_optparse_applicative(0,6,0)
14−+import Options.Applicative.Types
15−+#endif
16− import System.Environment
17−
18− -- | Options and help.
19−@@ -119,8 +123,13 @@
20− <*> switch (long "typecheck-only" <> help "Only invoke GHC for typechecking, don't produce any output")
21− <*> optional (strOption $ long "runtime-path" <> help "Custom path to the runtime so you don't have to reinstall fay when modifying it")
22−
23−+
24− where strsOption m =
25−+#if MIN_VERSION_optparse_applicative(0,6,0)
26−+ nullOption (m <> reader (ReadM . Right . wordsBy (== ',')) <> value [])
27−+#else
28− nullOption (m <> reader (Right . wordsBy (== ',')) <> value [])
29−+#endif
30−
31−
32− -- | Make incompatible options.
patching/patches/hoogle-4.2.23.patchdeleted−72
@@ -1,72 +0,0 @@
1−diff -ru orig/src/General/Web.hs new/src/General/Web.hs
2−--- orig/src/General/Web.hs 2013-12-04 19:36:25.387122831 +0200
3−+++ new/src/General/Web.hs 2013-12-04 19:36:25.000000000 +0200
4−@@ -1,3 +1,4 @@
5−+{-# LANGUAGE CPP #-}
6− {-# LANGUAGE PatternGuards #-}
7−
8− {- |
9−@@ -15,6 +16,9 @@
10− import General.System
11− import General.Base
12− import Network.Wai
13−+#if MIN_VERSION_wai(2, 0, 0)
14−+import Network.Wai.Internal
15−+#endif
16− import Network.HTTP.Types
17− import Data.CaseInsensitive(original)
18− import qualified Data.ByteString.Lazy.Char8 as LBS
19−@@ -34,10 +38,17 @@
20−
21− responseFlatten :: Response -> IO (Status, ResponseHeaders, LBString)
22− responseFlatten r = do
23−+#if MIN_VERSION_wai(2, 0, 0)
24−+ let (s,hs,withSrc) = responseToSource r
25−+ chunks <- withSrc $ \src -> src $$ consume
26−+ let res = toLazyByteString $ mconcat [x | Chunk x <- chunks]
27−+ return (s,hs,res)
28−+#else
29− let (s,hs,rest) = responseSource r
30− chunks <- runResourceT $ rest $$ consume
31− let res = toLazyByteString $ mconcat [x | Chunk x <- chunks]
32− return (s,hs,res)
33−+#endif
34−
35−
36− responseEvaluate :: Response -> IO ()
37−diff -ru orig/src/Web/Server.hs new/src/Web/Server.hs
38−--- orig/src/Web/Server.hs 2013-12-04 19:36:25.379122832 +0200
39−+++ new/src/Web/Server.hs 2013-12-04 19:36:25.000000000 +0200
40−@@ -1,4 +1,4 @@
41−-{-# LANGUAGE RecordWildCards, ScopedTypeVariables, PatternGuards #-}
42−+{-# LANGUAGE RecordWildCards, ScopedTypeVariables, PatternGuards, CPP #-}
43−
44− module Web.Server(server) where
45−
46−@@ -16,6 +16,9 @@
47− import Data.Time.Clock
48−
49− import Network.Wai
50−+#if MIN_VERSION_wai(2, 0, 0)
51−+import Network.Wai.Internal
52−+#endif
53− import Network.Wai.Handler.Warp
54−
55−
56−@@ -34,9 +37,15 @@
57− return res
58−
59−
60−+#if MIN_VERSION_wai(2, 0, 0)
61−+exception :: Maybe Request -> SomeException -> IO ()
62−+exception _ e | Just (_ :: InvalidRequest) <- fromException e = return ()
63−+ | otherwise = putStrLn $ "Error: " ++ show e
64−+#else
65− exception :: SomeException -> IO ()
66− exception e | Just (_ :: InvalidRequest) <- fromException e = return ()
67− | otherwise = putStrLn $ "Error: " ++ show e
68−+#endif
69−
70−
71− respArgs :: CmdLine -> IO (IO ResponseArgs)
72−Only in orig: test
patching/patches/httpd-shed-0.4.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ru orig/Network/Shed/Httpd.hs new/Network/Shed/Httpd.hs
2−--- orig/Network/Shed/Httpd.hs 2013-10-10 10:19:03.153688450 +0300
3−+++ new/Network/Shed/Httpd.hs 2013-10-10 10:19:02.000000000 +0300
4−@@ -139,7 +139,7 @@
5− hClose h
6− _ -> hClose h
7− return ()
8−- ) `finally` sClose sock
9−+ ) `finally` Network.Socket.sClose sock
10− where
11− loopIO m = do m
12− loopIO m
patching/patches/io-streams-1.1.2.2.patchdeleted−47
@@ -1,47 +0,0 @@
1−diff -ru orig/io-streams.cabal new/io-streams.cabal
2−--- orig/io-streams.cabal 2013-12-24 06:42:56.449491097 +0200
3−+++ new/io-streams.cabal 2013-12-24 06:42:56.000000000 +0200
4−@@ -162,7 +162,7 @@
5− attoparsec >= 0.10 && <0.11,
6− blaze-builder >= 0.3.1 && <0.4,
7− bytestring >= 0.9 && <0.11,
8−- network >= 2.4 && <2.5,
9−+ network >= 2.3 && <2.5,
10− primitive >= 0.2 && <0.6,
11− process >= 1 && <1.3,
12− text >= 0.10 && <1.1,
13−@@ -246,7 +246,7 @@
14− directory >= 1.1 && <2,
15− filepath >= 1.2 && <2,
16− mtl >= 2 && <3,
17−- network >= 2.4 && <2.5,
18−+ network >= 2.3 && <2.5,
19− primitive >= 0.2 && <0.6,
20− process >= 1 && <1.3,
21− text >= 0.10 && <1.1,
22−diff -ru orig/test/System/IO/Streams/Tests/Network.hs new/test/System/IO/Streams/Tests/Network.hs
23−--- orig/test/System/IO/Streams/Tests/Network.hs 2013-12-24 06:42:56.441491095 +0200
24−+++ new/test/System/IO/Streams/Tests/Network.hs 2013-12-24 06:42:56.000000000 +0200
25−@@ -44,18 +44,18 @@
26− Streams.fromList ["", "ok"] >>= Streams.connectTo os
27− N.shutdown sock N.ShutdownSend
28− Streams.toList is >>= putMVar resultMVar
29−- N.close sock
30−+ N.sClose sock
31−
32− server mvar = do
33− sock <- N.socket N.AF_INET N.Stream N.defaultProtocol
34− addr <- N.inet_addr "127.0.0.1"
35− let saddr = N.SockAddrInet N.aNY_PORT addr
36−- N.bind sock saddr
37−+ N.bindSocket sock saddr
38− N.listen sock 5
39− port <- N.socketPort sock
40− putMVar mvar port
41− (csock, _) <- N.accept sock
42− (is, os) <- Streams.socketToStreams csock
43− Streams.toList is >>= flip Streams.writeList os
44−- N.close csock
45−- N.close sock
46−+ N.sClose csock
47−+ N.sClose sock
patching/patches/language-javascript-0.5.8.patchdeleted−39
@@ -1,39 +0,0 @@
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.patchdeleted−34
@@ -1,34 +0,0 @@
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/mysql-0.1.1.4.patchdeleted−32
@@ -1,32 +0,0 @@
1−diff -ru orig/Setup.lhs new/Setup.lhs
2−--- orig/Setup.lhs 2013-10-10 10:21:21.877692795 +0300
3−+++ new/Setup.lhs 2013-10-10 10:21:21.000000000 +0300
4−@@ -2,6 +2,7 @@
5−
6− \begin{code}
7− {- OPTIONS_GHC -Wall #-}
8−+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
9−
10− import Control.Monad (liftM2, mplus)
11− import Data.List (isPrefixOf)
12−@@ -22,8 +23,19 @@
13− }
14− }
15−
16−+-- 'ConstOrId' is a Cabal compatibility hack.
17−+-- see: https://github.com/scrive/hdbc-postgresql/commit/e9b2fbab07b8f55ae6a9e120ab0b98c433842a8b
18−+class ConstOrId a b where
19−+ constOrId :: a -> b
20−+
21−+instance ConstOrId a a where
22−+ constOrId = id
23−+
24−+instance ConstOrId a (b -> a) where
25−+ constOrId = const
26−+
27− mysqlConfigProgram = (simpleProgram "mysql_config") {
28−- programFindLocation = \verbosity -> liftM2 mplus
29−+ programFindLocation = \verbosity -> constOrId $ liftM2 mplus
30− (findProgramLocation verbosity "mysql_config")
31− (findProgramLocation verbosity "mysql_config5")
32− }
patching/patches/pwstore-fast-2.4.patchdeleted−47
@@ -1,47 +0,0 @@
1−diff -ru orig/Crypto/PasswordStore.hs new/Crypto/PasswordStore.hs
2−--- orig/Crypto/PasswordStore.hs 2013-09-17 11:48:49.178111970 +0300
3−+++ new/Crypto/PasswordStore.hs 2013-09-17 11:48:49.000000000 +0300
4−@@ -1,4 +1,5 @@
5− {-# LANGUAGE OverloadedStrings, BangPatterns #-}
6−+{-# LANGUAGE CPP #-}
7− -- |
8− -- Module : Crypto.PasswordStore
9− -- Copyright : (c) Peter Scott, 2011
10−@@ -149,8 +150,8 @@
11− -> ByteString
12− -- ^ The encoded message
13− hmacSHA256 secret msg =
14−- let digest = SHA.hmacSha256 (BL.fromStrict secret) (BL.fromStrict msg)
15−- in BL.toStrict . SHA.bytestringDigest $ digest
16−+ let digest = SHA.hmacSha256 (fromStrict secret) (fromStrict msg)
17−+ in toStrict . SHA.bytestringDigest $ digest
18−
19− -- | PBKDF2 key-derivation function.
20− -- For details see @http://tools.ietf.org/html/rfc2898@.
21−@@ -403,3 +404,26 @@
22− where (a, g') = randomR ('\NUL', '\255') g
23− salt = makeSalt $ B.pack $ map fst (rands gen 16)
24− newgen = snd $ last (rands gen 16)
25−+
26−+#if !MIN_VERSION_base(4, 6, 0)
27−+-- | Strict version of 'modifySTRef'
28−+modifySTRef' :: STRef s a -> (a -> a) -> ST s ()
29−+modifySTRef' ref f = do
30−+ x <- readSTRef ref
31−+ let x' = f x
32−+ x' `seq` writeSTRef ref x'
33−+#endif
34−+
35−+#if MIN_VERSION_bytestring(0, 10, 0)
36−+toStrict :: BL.ByteString -> BS.ByteString
37−+toStrict = BL.toStrict
38−+
39−+fromStrict :: BS.ByteString -> BL.ByteString
40−+fromStrict = BL.fromStrict
41−+#else
42−+toStrict :: BL.ByteString -> BS.ByteString
43−+toStrict = BS.concat . BL.toChunks
44−+
45−+fromStrict :: BS.ByteString -> BL.ByteString
46−+fromStrict = BL.fromChunks . return
47−+#endif
patching/patches/tasty-0.3.patchdeleted−43
@@ -1,43 +0,0 @@
1−diff -ru orig/Test/Tasty/Options.hs new/Test/Tasty/Options.hs
2−--- orig/Test/Tasty/Options.hs 2013-10-14 09:05:01.591238893 +0300
3−+++ new/Test/Tasty/Options.hs 2013-10-14 09:05:01.000000000 +0300
4−@@ -1,3 +1,4 @@
5−+{-# LANGUAGE CPP #-}
6− {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable,
7− ExistentialQuantification, GADTs,
8− OverlappingInstances, FlexibleInstances, UndecidableInstances,
9−@@ -27,6 +28,9 @@
10− import Data.Monoid
11−
12− import Options.Applicative
13−+#if MIN_VERSION_optparse_applicative(0,6,0)
14−+import Options.Applicative.Types
15−+#endif
16−
17− -- | An option is a data type that inhabits the `IsOption` type class.
18− class Typeable v => IsOption v where
19−@@ -60,7 +64,11 @@
20− name = untag (optionName :: Tagged v String)
21− helpString = untag (optionHelp :: Tagged v String)
22− parse =
23−+#if MIN_VERSION_optparse_applicative(0,6,0)
24−+ ReadM . maybe (Left (ErrorMsg $ "Could not parse " ++ name)) Right .
25−+#else
26− maybe (Left (ErrorMsg $ "Could not parse " ++ name)) Right .
27−+#endif
28− parseValue
29−
30−
31−diff -ru orig/Test/Tasty/UI.hs new/Test/Tasty/UI.hs
32−--- orig/Test/Tasty/UI.hs 2013-10-14 09:05:01.591238893 +0300
33−+++ new/Test/Tasty/UI.hs 2013-10-14 09:05:01.000000000 +0300
34−@@ -98,6 +98,9 @@
35−
36− hSetBuffering stdout NoBuffering
37−
38−+ -- Do not retain the reference to the tree more than necessary
39−+ _ <- evaluate alignment
40−+
41− st <-
42− flip execStateT initialState $ getApp $ fst $
43− foldTestTree
patching/patches/tasty-0.7.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ru orig/tasty.cabal new/tasty.cabal
2−--- orig/tasty.cabal 2013-12-29 08:32:27.917648136 +0200
3−+++ new/tasty.cabal 2013-12-29 08:32:27.000000000 +0200
4−@@ -49,7 +49,7 @@
5− regex-tdfa >= 1.1.8,
6− optparse-applicative >= 0.6,
7− deepseq >= 1.3,
8−- either >= 4.0
9−+ either >= 3.4.2
10−
11− if flag(colors)
12− build-depends: ansi-terminal >= 0.6.1
patching/patches/threepenny-gui-0.4.0.1.patchdeleted−18
@@ -1,18 +0,0 @@
1−diff -ru orig/src/Graphics/UI/Threepenny/Internal/Types.hs new/src/Graphics/UI/Threepenny/Internal/Types.hs
2−--- orig/src/Graphics/UI/Threepenny/Internal/Types.hs 2013-12-24 06:45:49.129496370 +0200
3−+++ new/src/Graphics/UI/Threepenny/Internal/Types.hs 2013-12-24 06:45:48.000000000 +0200
4−@@ -37,7 +37,13 @@
5− newtype ElementId = ElementId BS.ByteString
6− deriving (Data,Typeable,Show,Eq,Ord)
7−
8−-instance NFData ElementId where rnf (ElementId x) = rnf x
9−+instance NFData ElementId where
10−+ rnf (ElementId x) =
11−+#if MIN_VERSION_bytestring(0, 10, 0)
12−+ rnf x
13−+#else
14−+ BS.length x `seq` ()
15−+#endif
16−
17− type EventId = String
18− type Handlers = Map EventId (E.Handler EventData)
patching/patches/utf8-light-0.4.0.1.patchdeleted−43
@@ -1,43 +0,0 @@
1−diff -ru orig/src/Codec/Binary/UTF8/Light.hs new/src/Codec/Binary/UTF8/Light.hs
2−--- orig/src/Codec/Binary/UTF8/Light.hs 2013-10-15 09:40:45.447493856 +0300
3−+++ new/src/Codec/Binary/UTF8/Light.hs 2013-10-15 09:40:45.000000000 +0300
4−@@ -251,15 +251,27 @@
5− -- can use Word# literalls
6− -- ==> 0xff00ff00##
7− encodeUTF8' ((W32# w):xs)
8−+#if MIN_VERSION_base(4,7,0)
9−+ | I# (w`ltWord#`(int2Word# 0x80#)) /= 0 =
10−+#else
11− | w`ltWord#`(int2Word# 0x80#) =
12−+#endif
13− [W8# w] : encodeUTF8' xs
14−+#if MIN_VERSION_base(4,7,0)
15−+ | I# (w`ltWord#`(int2Word# 0x800#)) /= 0 =
16−+#else
17− | w`ltWord#`(int2Word# 0x800#) =
18−+#endif
19− [ W8#(w`uncheckedShiftRL#`6#
20− `or#`(int2Word# 0xc0#))
21− , W8#(w`and#`(int2Word# 0x3f#)
22− `or#`(int2Word# 0x80#))
23− ] : encodeUTF8' xs
24−+#if MIN_VERSION_base(4,7,0)
25−+ | I# (w`ltWord#`(int2Word# 0xf0000#)) /= 0 =
26−+#else
27− | w`ltWord#`(int2Word# 0xf0000#) =
28−+#endif
29− [ W8#(w`uncheckedShiftRL#`12#
30− `or#`(int2Word# 0xe0#))
31− , W8#(w`uncheckedShiftRL#`6#
32−@@ -268,7 +280,11 @@
33− , W8#(w`and#`(int2Word# 0x3f#)
34− `or#`(int2Word# 0x80#))
35− ] : encodeUTF8' xs
36−+#if MIN_VERSION_base(4,7,0)
37−+ | I# (w`ltWord#`(int2Word# 0xe00000#)) /= 0 =
38−+#else
39− | w`ltWord#`(int2Word# 0xe00000#) =
40−+#endif
41− [ W8#(w`uncheckedShiftRL#`18#
42− `or#`(int2Word# 0xf0#))
43− , W8#(w`uncheckedShiftRL#`12#
patching/patches/uuid-1.3.1.patchdeleted−30
@@ -1,30 +0,0 @@
1−diff -ru orig/Data/UUID/Internal.hs new/Data/UUID/Internal.hs
2−--- orig/Data/UUID/Internal.hs 2013-10-22 19:00:23.458184957 +0300
3−+++ new/Data/UUID/Internal.hs 2013-10-22 19:00:23.000000000 +0300
4−@@ -391,12 +391,24 @@
5−
6− -- | Similar to `toASCIIBytes` except we produce a lazy `BL.ByteString`.
7− toLazyASCIIBytes :: UUID -> BL.ByteString
8−-toLazyASCIIBytes = BL.fromStrict . toASCIIBytes
9−+toLazyASCIIBytes =
10−+#if MIN_VERSION_bytestring(0,10,0)
11−+ BL.fromStrict
12−+#else
13−+ BL.fromChunks . return
14−+#endif
15−+ . toASCIIBytes
16−
17− -- | Similar to `fromASCIIBytes` except parses from a lazy `BL.ByteString`.
18− fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID
19− fromLazyASCIIBytes bs =
20−- if BL.length bs == 36 then fromASCIIBytes (BL.toStrict bs) else Nothing
21−+ if BL.length bs == 36 then fromASCIIBytes (
22−+#if MIN_VERSION_bytestring(0,10,0)
23−+ BL.toStrict bs
24−+#else
25−+ B.concat $ BL.toChunks bs
26−+#endif
27−+ ) else Nothing
28−
29− --
30− -- Class Instances
patching/patches/vault-0.3.0.0.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff -ru orig/vault.cabal new/vault.cabal
2−--- orig/vault.cabal 2013-09-01 18:35:14.861603037 +0300
3−+++ new/vault.cabal 2013-09-01 18:35:14.000000000 +0300
4−@@ -36,7 +36,8 @@
5−
6− Library
7− hs-source-dirs: src
8−- build-depends: base == 4.6.*, containers == 0.5.*,
9−+ build-depends: base >= 4.5 && < 4.7,
10−+ containers >= 0.4 && < 0.6,
11− unordered-containers >= 0.2.3.0 && < 0.3,
12− hashable >= 1.1.2.5 && < 1.3
13−
patching/patches/vault-0.3.0.2.patchdeleted−12
@@ -1,12 +0,0 @@
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
patching/patches/websockets-0.7.4.0.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff -ru orig/websockets.cabal new/websockets.cabal
2−--- orig/websockets.cabal 2013-09-12 10:30:46.697755480 +0300
3−+++ new/websockets.cabal 2013-09-12 10:30:46.000000000 +0300
4−@@ -73,7 +73,7 @@
5− blaze-builder >= 0.3 && < 0.4,
6− blaze-builder-enumerator >= 0.2 && < 0.3,
7− bytestring >= 0.9 && < 0.11,
8−- case-insensitive >= 0.3 && < 1.1,
9−+ case-insensitive >= 0.3 && < 1.2,
10− containers >= 0.3 && < 0.6,
11− enumerator >= 0.4.13 && < 0.5,
12− mtl >= 2.0 && < 2.2,
13−@@ -106,7 +106,7 @@
14− blaze-builder >= 0.3 && < 0.4,
15− blaze-builder-enumerator >= 0.2 && < 0.3,
16− bytestring >= 0.9 && < 0.11,
17−- case-insensitive >= 0.3 && < 1.1,
18−+ case-insensitive >= 0.3 && < 1.2,
19− containers >= 0.3 && < 0.6,
20− enumerator >= 0.4.13 && < 0.5,
21− mtl >= 2.0 && < 2.2,