Commit 111b9172 authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Ben Gamari

Fold cabal file patches into diffs

parent c16d4478
Pipeline #11506 passed with stages
in 71 minutes and 8 seconds
This diff is collapsed.
diff -ru Cabal-2.4.1.0.orig/Distribution/Compat/ReadP.hs Cabal-2.4.1.0/Distribution/Compat/ReadP.hs
--- Cabal-2.4.1.0.orig/Distribution/Compat/ReadP.hs 1969-12-31 19:00:00.000000000 -0500
+++ Cabal-2.4.1.0/Distribution/Compat/ReadP.hs 2019-09-08 08:28:12.262274000 -0400
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE GADTs #-}
-----------------------------------------------------------------------------
-- |
@@ -113,7 +114,9 @@
(Result x p) >>= k = k x `mplus` (p >>= k)
(Final r) >>= k = final [ys' | (x,s) <- r, ys' <- run (k x) s]
+#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
+#endif
instance Fail.MonadFail (P s) where
fail _ = Fail
@@ -172,7 +175,9 @@
instance Monad (Parser r s) where
return = pure
+#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
+#endif
R m >>= f = R (\k -> m (\a -> let R m' = f a in m' k))
instance Fail.MonadFail (Parser r s) where
diff -ru Cabal-2.4.1.0.orig/Distribution/Parsec/Class.hs Cabal-2.4.1.0/Distribution/Parsec/Class.hs
--- Cabal-2.4.1.0.orig/Distribution/Parsec/Class.hs 1969-12-31 19:00:00.000000000 -0500
+++ Cabal-2.4.1.0/Distribution/Parsec/Class.hs 2019-09-08 08:31:12.836405979 -0400
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE RankNTypes #-}
@@ -55,7 +56,7 @@
--
-- * knows @cabal-version@ we work with
--
-class (P.CharParsing m, MonadPlus m) => CabalParsing m where
+class (P.CharParsing m, MonadPlus m, Fail.MonadFail m) => CabalParsing m where
parsecWarning :: PWarnType -> String -> m ()
parsecHaskellString :: m String
@@ -116,7 +117,9 @@
(>>) = (*>)
{-# INLINE (>>) #-}
+#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
+#endif
instance MonadPlus ParsecParser where
mzero = empty
diff -ru Cabal-2.4.1.0.orig/Distribution/ParseUtils.hs Cabal-2.4.1.0/Distribution/ParseUtils.hs
--- Cabal-2.4.1.0.orig/Distribution/ParseUtils.hs 1969-12-31 19:00:00.000000000 -0500
+++ Cabal-2.4.1.0/Distribution/ParseUtils.hs 2019-09-08 08:31:47.628803805 -0400
@@ -19,6 +19,7 @@
-- This module is meant to be local-only to Distribution...
{-# OPTIONS_HADDOCK hide #-}
+{-# LANGUAGE CPP #-}
{-# LANGUAGE Rank2Types #-}
module Distribution.ParseUtils (
LineNo, PError(..), PWarning(..), locatedErrorMsg, syntaxError, warning,
@@ -107,7 +108,9 @@
ParseOk ws x >>= f = case f x of
ParseFailed err -> ParseFailed err
ParseOk ws' x' -> ParseOk (ws'++ws) x'
+#if !(MIN_VERSION_base(4,13,0))
fail = Fail.fail
+#endif
instance Fail.MonadFail ParseResult where
fail s = ParseFailed (FromString s Nothing)
diff -ru Cabal-2.4.1.0.orig/Distribution/Simple/PreProcess.hs Cabal-2.4.1.0/Distribution/Simple/PreProcess.hs
--- Cabal-2.4.1.0.orig/Distribution/Simple/PreProcess.hs 1969-12-31 19:00:00.000000000 -0500
+++ Cabal-2.4.1.0/Distribution/Simple/PreProcess.hs 2019-09-08 08:26:37.233096478 -0400
@@ -122,6 +122,12 @@
-- preprocessor's output name format.
type PreProcessorExtras = FilePath -> IO [FilePath]
+-- | A newtype around 'PreProcessorExtras', useful for storing
+-- 'PreProcessorExtras' inside of another type constructor (e.g., a list)
+-- without impredicativity (recall that the 'IO' type, which is contained in
+-- 'PreProcessorExtras', is a synonym for @'HasCallStack' => Prelude.IO@, which
+-- is a polymorphic type).
+newtype WrappedPreProcessorExtras = WrapPPE { unWrapPPE :: PreProcessorExtras }
mkSimplePreProcessor :: (FilePath -> FilePath -> Verbosity -> IO ())
-> (FilePath, FilePath)
@@ -694,8 +700,8 @@
]
-- |Standard preprocessors with possible extra C sources: c2hs, hsc2hs.
-knownExtrasHandlers :: [ PreProcessorExtras ]
-knownExtrasHandlers = [ ppC2hsExtras, ppHsc2hsExtras ]
+knownExtrasHandlers :: [ WrappedPreProcessorExtras ]
+knownExtrasHandlers = [ WrapPPE ppC2hsExtras, WrapPPE ppHsc2hsExtras ]
-- | Find any extra C sources generated by preprocessing that need to
-- be added to the component (addresses issue #238).
@@ -732,7 +738,7 @@
pp :: FilePath -> IO [FilePath]
pp dir = (map (dir </>) . filter not_sub . concat)
<$> for knownExtrasHandlers
- (withLexicalCallStack (\f -> f dir))
+ (withLexicalCallStack (\f -> f dir) . unWrapPPE)
-- TODO: This is a terrible hack to work around #3545 while we don't
-- reorganize the directory layout. Basically, for the main
-- library, we might accidentally pick up autogenerated sources for
diff --git a/Cabal.cabal b/Cabal.cabal
index b97d346..bbe236e 100644
--- a/Cabal.cabal
+++ b/Cabal.cabal
@@ -1,5 +1,6 @@
name: Cabal
version: 2.4.1.0
+x-revision: 2
copyright: 2003-2018, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
@@ -183,7 +184,7 @@ flag bundled-binary-generic
library
build-depends:
array >= 0.4.0.1 && < 0.6,
- base >= 4.6 && < 5,
+ base >= 4.8 && < 4.13,
bytestring >= 0.10.0.0 && < 0.11,
containers >= 0.5.0.0 && < 0.7,
deepseq >= 1.3.0.1 && < 1.5,
diff -ru EdisonAPI-1.3.1.orig/src/Data/Edison/Seq/ListSeq.hs EdisonAPI-1.3.1/src/Data/Edison/Seq/ListSeq.hs
--- EdisonAPI-1.3.1.orig/src/Data/Edison/Seq/ListSeq.hs 2016-06-03 00:49:51.000000000 -0400
+++ EdisonAPI-1.3.1/src/Data/Edison/Seq/ListSeq.hs 2019-04-19 13:54:07.461113622 -0400
@@ -131,25 +131,25 @@
diff --git a/src/Data/Edison/Seq/ListSeq.hs b/src/Data/Edison/Seq/ListSeq.hs
index 1ad677f..f782022 100644
--- a/src/Data/Edison/Seq/ListSeq.hs
+++ b/src/Data/Edison/Seq/ListSeq.hs
@@ -131,25 +131,25 @@ lcons = (:)
rcons x s = s ++ [x]
append = (++)
......@@ -32,7 +33,7 @@ diff -ru EdisonAPI-1.3.1.orig/src/Data/Edison/Seq/ListSeq.hs EdisonAPI-1.3.1/src
rheadM (x:xs) = rh x xs
where rh y [] = return y
rh y (x:xs) = rh x xs
@@ -159,7 +159,7 @@
@@ -159,7 +159,7 @@ rhead (x:xs) = rh x xs
where rh y [] = y
rh y (x:xs) = rh x xs
......@@ -41,7 +42,7 @@ diff -ru EdisonAPI-1.3.1.orig/src/Data/Edison/Seq/ListSeq.hs EdisonAPI-1.3.1/src
rtailM (x:xs) = return (rt x xs)
where rt y [] = []
rt y (x:xs) = y : rt x xs
@@ -255,9 +255,9 @@
@@ -255,9 +255,9 @@ inBounds i xs
lookup i xs = ID.runIdentity (lookupM i xs)
lookupM i xs
......
This diff is collapsed.
diff -ru FPretty-1.1.orig/Text/PrettyPrint/FPretty.hs FPretty-1.1/Text/PrettyPrint/FPretty.hs
--- FPretty-1.1.orig/Text/PrettyPrint/FPretty.hs 2015-11-16 08:34:29.000000000 -0500
+++ FPretty-1.1/Text/PrettyPrint/FPretty.hs 2018-01-16 18:12:17.694618006 -0500
@@ -112,7 +112,11 @@
diff --git a/Text/PrettyPrint/FPretty.hs b/Text/PrettyPrint/FPretty.hs
index f2c0001..6138d3f 100644
--- a/Text/PrettyPrint/FPretty.hs
+++ b/Text/PrettyPrint/FPretty.hs
@@ -112,7 +112,11 @@ module Text.PrettyPrint.FPretty
#if __GLASGOW_HASKELL__ >= 710
-- The base libraries from GHC 7.10 onwards export <$> as synonym for fmap.
......
diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/CharacterMap.hs
--- FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs 2015-04-25 05:01:06.000000000 -0400
+++ FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/CharacterMap.hs 2019-03-16 06:48:06.693682922 -0400
@@ -102,7 +102,7 @@
diff --git a/src/Graphics/Text/TrueType/CharacterMap.hs b/src/Graphics/Text/TrueType/CharacterMap.hs
index 2663806..75d2655 100644
--- a/src/Graphics/Text/TrueType/CharacterMap.hs
+++ b/src/Graphics/Text/TrueType/CharacterMap.hs
@@ -102,7 +102,7 @@ instance NFData CharacterMaps where
rnf (CharacterMaps maps) = rnf maps `seq` ()
instance Binary CharacterMaps where
......@@ -10,7 +11,7 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs Fon
get = do
startIndex <- bytesRead
versionNumber <- getWord16be
@@ -192,7 +192,7 @@
@@ -192,7 +192,7 @@ instance Ord CharacterTable where
compare _ _ = GT
instance Binary CharacterTable where
......@@ -19,7 +20,7 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs Fon
get = do
format <- getWord16be
case format of
@@ -305,7 +305,7 @@
@@ -305,7 +305,7 @@ instance CharMappeable Format0 where
langIdOfCharMap = _format0Language
instance Binary Format0 where
......@@ -28,7 +29,7 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs Fon
get = do
tableSize <- getWord16be
when (tableSize /= 262) $
@@ -347,7 +347,7 @@
@@ -347,7 +347,7 @@ instance Binary Format2SubHeader where
instance Binary Format2 where
......@@ -37,7 +38,7 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs Fon
get = do
_tableSize <- getWord16be
lang <- getWord16be
@@ -376,7 +376,7 @@
@@ -376,7 +376,7 @@ instance CharMappeable Format6 where
langIdOfCharMap = _format6Language
instance Binary Format6 where
......@@ -46,10 +47,11 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/CharacterMap.hs Fon
get = do
_length <- getWord16be
language <- getWord16be
diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Glyph.hs FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/Glyph.hs
--- FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Glyph.hs 2017-06-29 17:15:33.000000000 -0400
+++ FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/Glyph.hs 2019-03-16 06:47:22.845370697 -0400
@@ -313,7 +313,7 @@
diff --git a/src/Graphics/Text/TrueType/Glyph.hs b/src/Graphics/Text/TrueType/Glyph.hs
index 5209222..aa0c500 100644
--- a/src/Graphics/Text/TrueType/Glyph.hs
+++ b/src/Graphics/Text/TrueType/Glyph.hs
@@ -313,7 +313,7 @@ getSimpleOutline counterCount = do
where breaker array ix = VU.splitAt (fromIntegral ix + 1) array
instance Binary Glyph where
......@@ -58,10 +60,11 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Glyph.hs FontyFruit
get = do
hdr <- get
case _glfNumberOfContours hdr of
diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Header.hs FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/Header.hs
--- FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Header.hs 2016-01-05 16:09:02.000000000 -0500
+++ FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/Header.hs 2019-03-16 06:48:33.605875180 -0400
@@ -100,7 +100,7 @@
diff --git a/src/Graphics/Text/TrueType/Header.hs b/src/Graphics/Text/TrueType/Header.hs
index 2c425e5..abd6589 100644
--- a/src/Graphics/Text/TrueType/Header.hs
+++ b/src/Graphics/Text/TrueType/Header.hs
@@ -100,7 +100,7 @@ instance NFData FontHeader where
rnf (FontHeader {}) = ()
instance Binary FontHeader where
......@@ -70,10 +73,11 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Header.hs FontyFrui
get =
FontHeader <$> get <*> get <*> g32 <*> g32 <*> get
<*> g16 <*> g64 <*> g64 <*> get <*> get
diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/MaxpTable.hs FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/MaxpTable.hs
--- FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/MaxpTable.hs 2015-04-25 05:01:06.000000000 -0400
+++ FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/MaxpTable.hs 2019-03-16 06:48:26.633825328 -0400
@@ -50,7 +50,7 @@
diff --git a/src/Graphics/Text/TrueType/MaxpTable.hs b/src/Graphics/Text/TrueType/MaxpTable.hs
index a0508c6..29c773c 100644
--- a/src/Graphics/Text/TrueType/MaxpTable.hs
+++ b/src/Graphics/Text/TrueType/MaxpTable.hs
@@ -50,7 +50,7 @@ instance NFData MaxpTable where
rnf (MaxpTable {}) = ()
instance Binary MaxpTable where
......@@ -82,10 +86,11 @@ diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/MaxpTable.hs FontyF
get = MaxpTable
<$> get <*> g16 <*> g16 <*> g16 <*> g16 <*> g16
<*> g16 <*> g16 <*> g16 <*> g16 <*> g16 <*> g16
diff -ru FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Name.hs FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/Name.hs
--- FontyFruity-0.5.3.4.orig/src/Graphics/Text/TrueType/Name.hs 2015-04-25 05:01:06.000000000 -0400
+++ FontyFruity-0.5.3.4/src/Graphics/Text/TrueType/Name.hs 2019-03-16 06:48:14.853741168 -0400
@@ -35,7 +35,7 @@
diff --git a/src/Graphics/Text/TrueType/Name.hs b/src/Graphics/Text/TrueType/Name.hs
index 8c23605..c05a55f 100644
--- a/src/Graphics/Text/TrueType/Name.hs
+++ b/src/Graphics/Text/TrueType/Name.hs
@@ -35,7 +35,7 @@ instance NFData NameTable where
rnf (NameTable {}) = ()
instance Binary NameTable where
......
diff -ru Unixutils-1.54.1.orig/System/Unix/Chroot.hs Unixutils-1.54.1/System/Unix/Chroot.hs
--- Unixutils-1.54.1.orig/System/Unix/Chroot.hs 2015-08-11 16:02:44.000000000 -0400
+++ Unixutils-1.54.1/System/Unix/Chroot.hs 2018-07-04 21:18:53.544302297 -0400
diff --git a/System/Unix/Chroot.hs b/System/Unix/Chroot.hs
index 06bf3dd..12de580 100644
--- a/System/Unix/Chroot.hs
+++ b/System/Unix/Chroot.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
-- | This module, except for useEnv, is copied from the build-env package.
module System.Unix.Chroot
( fchroot
@@ -45,7 +45,11 @@
@@ -45,7 +45,11 @@ chroot fp = withCString fp $ \cfp -> throwErrnoIfMinus1_ "chroot" (c_chroot cfp)
fchroot :: (MonadIO m, MonadMask m) => FilePath -> m a -> m a
fchroot path action =
do origWd <- liftIO $ getWorkingDirectory
......
commit e1fd4b583d8a09d54e089fe2b89e921d3b854182
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri Mar 15 18:49:39 2019 -0400
Adapt to base-4.13.0.0
diff --git a/src/FRP/Yampa/Event.hs b/src/FRP/Yampa/Event.hs
index 804fe46..0639f3f 100644
--- a/src/FRP/Yampa/Event.hs
......
commit 69d6cb742b2210f231620b90ee729a195a0f55ad
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Wed Aug 28 07:08:30 2019 -0400
Allow building with GHC 8.8
diff --git a/src/Data/Barbie/Internal/Constraints.hs b/src/Data/Barbie/Internal/Constraints.hs
index d1da2f2..7087ed2 100644
--- a/src/Data/Barbie/Internal/Constraints.hs
......
diff -ru bencode-0.6.0.0.orig/src/Data/BEncode/Parser.hs bencode-0.6.0.0/src/Data/BEncode/Parser.hs
--- bencode-0.6.0.0.orig/src/Data/BEncode/Parser.hs 2015-05-09 15:56:43.000000000 -0400
+++ bencode-0.6.0.0/src/Data/BEncode/Parser.hs 2019-05-17 14:32:05.074495583 -0400
diff --git a/src/Data/BEncode/Parser.hs b/src/Data/BEncode/Parser.hs
index 3441041..198c97c 100644
--- a/src/Data/BEncode/Parser.hs
+++ b/src/Data/BEncode/Parser.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
-----------------------------------------------------------------------------
-- |
-- Module : BParser
@@ -26,6 +28,7 @@
@@ -26,6 +28,7 @@ module Data.BEncode.Parser
import Control.Applicative hiding (optional)
import Control.Monad
......@@ -15,7 +16,7 @@ diff -ru bencode-0.6.0.0.orig/src/Data/BEncode/Parser.hs bencode-0.6.0.0/src/Dat
import Data.BEncode
import qualified Data.ByteString.Lazy.Char8 as L
import qualified Data.Map as Map
@@ -61,6 +64,11 @@
@@ -61,6 +64,11 @@ instance Monad BParser where
Ok a b' -> runB (f a) b'
Error str -> Error str
return val = BParser $ Ok val
......
diff -ru bytestring-mmap-0.2.2.orig/System/IO/Posix/MMap/Lazy.hs bytestring-mmap-0.2.2/System/IO/Posix/MMap/Lazy.hs
--- bytestring-mmap-0.2.2.orig/System/IO/Posix/MMap/Lazy.hs 2011-04-29 15:58:05.000000000 -0400
+++ bytestring-mmap-0.2.2/System/IO/Posix/MMap/Lazy.hs 2018-05-20 14:44:47.123915525 -0400
@@ -91,7 +91,11 @@
--
unsafeMMapFile :: FilePath -> IO ByteString
unsafeMMapFile path = do
- fd <- openFd path ReadOnly Nothing defaultFileFlags
+ fd <- openFd path ReadOnly
+#if !(MIN_VERSION_unix(2,8,0))
+ Nothing
+#endif
+ defaultFileFlags
always (closeFd fd) $ do
stat <- getFdStatus fd
let size = fromIntegral (fileSize stat)
diff -ru bytestring-mmap-0.2.2.orig/System/IO/Posix/MMap.hs bytestring-mmap-0.2.2/System/IO/Posix/MMap.hs
--- bytestring-mmap-0.2.2.orig/System/IO/Posix/MMap.hs 2011-04-29 15:58:05.000000000 -0400
+++ bytestring-mmap-0.2.2/System/IO/Posix/MMap.hs 2018-05-20 14:44:17.671914783 -0400
diff --git a/System/IO/Posix/MMap.hs b/System/IO/Posix/MMap.hs
index adf71e2..3525c84 100644
--- a/System/IO/Posix/MMap.hs
+++ b/System/IO/Posix/MMap.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
--------------------------------------------------------------------
-- |
-- Module : System.IO.Posix.MMap
@@ -98,7 +98,11 @@
@@ -98,7 +98,11 @@ import System.Posix
--
unsafeMMapFile :: FilePath -> IO ByteString
unsafeMMapFile f = do
......@@ -36,3 +21,20 @@ diff -ru bytestring-mmap-0.2.2.orig/System/IO/Posix/MMap.hs bytestring-mmap-0.2.
always (closeFd fd) $ do
stat <- getFdStatus fd
let size = fromIntegral (fileSize stat)
diff --git a/System/IO/Posix/MMap/Lazy.hs b/System/IO/Posix/MMap/Lazy.hs
index 16c9539..ffb7535 100644
--- a/System/IO/Posix/MMap/Lazy.hs
+++ b/System/IO/Posix/MMap/Lazy.hs
@@ -91,7 +91,11 @@ import System.Posix
--
unsafeMMapFile :: FilePath -> IO ByteString
unsafeMMapFile path = do
- fd <- openFd path ReadOnly Nothing defaultFileFlags
+ fd <- openFd path ReadOnly
+#if !(MIN_VERSION_unix(2,8,0))
+ Nothing
+#endif
+ defaultFileFlags
always (closeFd fd) $ do
stat <- getFdStatus fd
let size = fromIntegral (fileSize stat)
name: cheapskate
version: 0.1.1.1
x-revision: 1
synopsis: Experimental markdown processor.
description: This is an experimental Markdown processor in pure
Haskell. It aims to process Markdown efficiently and in
the most forgiving possible way. It is designed to deal
with any input, including garbage, with linear
performance. Output is sanitized by default for
protection against XSS attacks.
.
Several markdown extensions are implemented, including
fenced code blocks, significant list start numbers, and
autolinked URLs. See README.markdown for details.
homepage: http://github.com/jgm/cheapskate
license: BSD3
license-file: LICENSE
author: John MacFarlane
maintainer: jgm@berkeley.edu
copyright: (C) 2012-2013 John MacFarlane
category: Text
build-type: Simple
extra-source-files: README.markdown
changelog
man/man1/cheapskate.1
cabal-version: >=1.10
Source-repository head
type: git
location: git://github.com/jgm/cheapskate.git
Flag dingus
Description: Build cheapskate-dingus cgi script.
Default: False
library
hs-source-dirs: .
exposed-modules: Cheapskate
Cheapskate.Parse
Cheapskate.Types
Cheapskate.Html
other-modules: Cheapskate.Util
Cheapskate.Inlines
Cheapskate.ParserCombinators
Paths_cheapskate
build-depends: base >=4.6 && <5,
containers >=0.4 && <0.7,
mtl >=2.1 && <2.3,
text >= 0.9 && < 1.3,
blaze-html >=0.6 && < 0.10,
xss-sanitize >= 0.3 && < 0.4,
data-default >= 0.5 && < 0.8,
syb,
uniplate >= 1.6 && < 1.7,
deepseq
default-language: Haskell2010
ghc-options: -Wall -fno-warn-unused-do-bind
executable cheapskate
main-is: main.hs
hs-source-dirs: bin
build-depends: base >=4.4 && <5,
cheapskate,
bytestring,
blaze-html >=0.6 && < 0.10,
text >= 0.9 && < 1.3
default-language: Haskell2010
ghc-options: -Wall -fno-warn-unused-do-bind
executable cheapskate-dingus
main-is: cheapskate-dingus.hs
hs-source-dirs: bin
if flag(dingus)
build-depends: base, aeson, cheapskate, blaze-html,
text, wai-extra, wai >= 0.3, http-types
default-language: Haskell2010
if flag(dingus)
Buildable: True
else
Buildable: False
ghc-options: -Wall -fno-warn-unused-do-bind
commit e0686e310c948fbcbde9e64421563c91a42dc0b3
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri Apr 19 09:25:00 2019 -0400
Adapt to base-4.13.0.0
diff --git a/Cheapskate/ParserCombinators.hs b/Cheapskate/ParserCombinators.hs
index d60699d..77efb09 100644
--- a/Cheapskate/ParserCombinators.hs
......@@ -42,3 +36,23 @@ index d60699d..77efb09 100644
instance MonadPlus Parser where
mzero = Parser $ \st -> Left $ ParseError (position st) "(mzero)"
mplus p1 p2 = Parser $ \st ->
diff --git a/cheapskate.cabal b/cheapskate.cabal
index 682735c..d02bc96 100644
--- a/cheapskate.cabal
+++ b/cheapskate.cabal
@@ -1,5 +1,6 @@
name: cheapskate
version: 0.1.1.1
+x-revision: 1
synopsis: Experimental markdown processor.
description: This is an experimental Markdown processor in pure
Haskell. It aims to process Markdown efficiently and in
@@ -41,7 +42,7 @@ library
Cheapskate.Inlines
Cheapskate.ParserCombinators
Paths_cheapskate
- build-depends: base >=4.4 && <5,
+ build-depends: base >=4.6 && <5,
containers >=0.4 && <0.7,
mtl >=2.1 && <2.3,
text >= 0.9 && < 1.3,
commit 1138d062235185f05d76d3ce701662c0d22ab345
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Sat Dec 29 22:22:52 2018 -0500
Allow building with template-haskell-2.15.0.0
diff --git a/src/Database/CQL/Protocol/Record.hs b/src/Database/CQL/Protocol/Record.hs
index c69e454..d4ad7f2 100644
--- a/src/Database/CQL/Protocol/Record.hs
......
diff -ru critbit-0.2.0.0.orig/Data/CritBit/Set.hs critbit-0.2.0.0/Data/CritBit/Set.hs
--- critbit-0.2.0.0.orig/Data/CritBit/Set.hs 2014-07-04 01:40:10.000000000 -0400
+++ critbit-0.2.0.0/Data/CritBit/Set.hs 2018-01-07 18:44:32.747084107 -0500
diff --git a/Data/CritBit/Set.hs b/Data/CritBit/Set.hs
index 0039925..eab81a5 100644
--- a/Data/CritBit/Set.hs
+++ b/Data/CritBit/Set.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
-- |
@@ -90,6 +91,9 @@
@@ -90,6 +91,9 @@ import Data.CritBit.Types.Internal (CritBit(..), Set(..), CritBitKey, Node(..))
import Data.Foldable (Foldable, foldMap)
import Data.Maybe (isJust)
import Data.Monoid (Monoid(..))
......@@ -16,7 +17,7 @@ diff -ru critbit-0.2.0.0.orig/Data/CritBit/Set.hs critbit-0.2.0.0/Data/CritBit/S
import Prelude hiding (null, filter, map, foldl, foldr)
import qualified Data.CritBit.Tree as T
import qualified Data.List as List
@@ -97,9 +101,16 @@
@@ -97,9 +101,16 @@ import qualified Data.List as List
instance (Show a) => Show (Set a) where
show s = "fromList " ++ show (toList s)
......@@ -33,16 +34,17 @@ diff -ru critbit-0.2.0.0.orig/Data/CritBit/Set.hs critbit-0.2.0.0/Data/CritBit/S
mconcat = unions
instance Foldable Set where
diff -ru critbit-0.2.0.0.orig/Data/CritBit/Tree.hs critbit-0.2.0.0/Data/CritBit/Tree.hs
--- critbit-0.2.0.0.orig/Data/CritBit/Tree.hs 2014-07-04 01:40:10.000000000 -0400
+++ critbit-0.2.0.0/Data/CritBit/Tree.hs 2018-01-07 18:43:26.219082431 -0500
diff --git a/Data/CritBit/Tree.hs b/Data/CritBit/Tree.hs
index e50738b..9a3c3d4 100644
--- a/Data/CritBit/Tree.hs
+++ b/Data/CritBit/Tree.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE BangPatterns, RecordWildCards, ScopedTypeVariables #-}
+{-# LANGUAGE CPP, BangPatterns, RecordWildCards, ScopedTypeVariables #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
-- |
@@ -153,21 +153,31 @@
@@ -153,21 +153,31 @@ import Data.CritBit.Core
import Data.CritBit.Types.Internal
import Data.Maybe (fromMaybe)
import Data.Monoid (Monoid(..))
......@@ -75,7 +77,7 @@ diff -ru critbit-0.2.0.0.orig/Data/CritBit/Tree.hs critbit-0.2.0.0/Data/CritBit/
-- | /O(k)/. Find the value at a key.
-- Calls 'error' when the element can not be found.
@@ -1248,8 +1258,7 @@
@@ -1248,8 +1258,7 @@ deleteMax m = updateMaxWithKey (\_ _ -> Nothing) m
-- > deleteFindMin Error: can not return the minimal element of an empty map
deleteFindMin :: CritBit k v -> ((k, v), CritBit k v)
deleteFindMin = fromMaybe (error msg) . minViewWithKey
......@@ -85,7 +87,7 @@ diff -ru critbit-0.2.0.0.orig/Data/CritBit/Tree.hs critbit-0.2.0.0/Data/CritBit/
{-# INLINABLE deleteFindMin #-}
-- | /O(k)/. Delete and find the maximal element.
@@ -1258,8 +1267,7 @@
@@ -1258,8 +1267,7 @@ deleteFindMin = fromMaybe (error msg) . minViewWithKey
-- > deleteFindMax Error: can not return the maximal element of an empty map
deleteFindMax :: CritBit k v -> ((k, v), CritBit k v)
deleteFindMax = fromMaybe (error msg) . maxViewWithKey
......
diff -ru crypto-random-0.0.9.orig/Crypto/Random/Entropy/Unix.hs crypto-random-0.0.9/Crypto/Random/Entropy/Unix.hs
--- crypto-random-0.0.9.orig/Crypto/Random/Entropy/Unix.hs 2015-03-18 09:42:48.000000000 -0400
+++ crypto-random-0.0.9/Crypto/Random/Entropy/Unix.hs 2018-05-07 10:10:49.039215536 -0400
diff --git a/Crypto/Random/Entropy/Unix.hs b/Crypto/Random/Entropy/Unix.hs
index 42e7d8c..7777952 100644
--- a/Crypto/Random/Entropy/Unix.hs
+++ b/Crypto/Random/Entropy/Unix.hs
@@ -5,6 +5,7 @@
-- Stability : experimental
-- Portability : Good
......@@ -9,7 +10,7 @@ diff -ru crypto-random-0.0.9.orig/Crypto/Random/Entropy/Unix.hs crypto-random-0.
{-# LANGUAGE ScopedTypeVariables #-}
module Crypto.Random.Entropy.Unix
( DevRandom
@@ -22,10 +23,10 @@
@@ -22,10 +23,10 @@ import System.Posix.IO
type H = Fd
type DeviceName = String
......@@ -22,7 +23,7 @@ diff -ru crypto-random-0.0.9.orig/Crypto/Random/Entropy/Unix.hs crypto-random-0.
newtype DevURandom = DevURandom DeviceName
instance EntropySource DevRandom where
@@ -48,7 +49,11 @@
@@ -48,7 +49,11 @@ testOpen filepath = do
Just h -> closeDev h >> return (Just filepath)
openDev :: String -> IO (Maybe H)
......
diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/src/Data/DoubleWord/TH.hs
--- data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs 2018-01-13 13:49:48.000000000 -0500
+++ data-dword-0.3.1.2/src/Data/DoubleWord/TH.hs 2019-05-02 16:32:16.395011833 -0400
@@ -25,6 +25,9 @@
diff --git a/src/Data/DoubleWord/TH.hs b/src/Data/DoubleWord/TH.hs
index 1b4dc07..b48fc3d 100644
--- a/src/Data/DoubleWord/TH.hs
+++ b/src/Data/DoubleWord/TH.hs
@@ -25,6 +25,9 @@ import Control.Applicative ((<$>), (<*>))
import Language.Haskell.TH hiding (unpacked, match)
import Data.BinaryWord (BinaryWord(..))
import Data.DoubleWord.Base
......@@ -11,7 +12,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
-- | Declare signed and unsigned binary word types built from
-- the specified low and high halves. The high halves /must/ have
@@ -1378,8 +1381,12 @@
@@ -1378,8 +1381,12 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
hi' = mkName "hi'"
lo' = mkName "lo'"
tpT = ConT tp
......@@ -25,7 +26,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
TySynInstD n (TySynEqn ps t)
#else
TySynInstD n ps t
@@ -1448,11 +1455,19 @@
@@ -1448,11 +1455,19 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
#endif
singE e = appC '(:) [e, ConE '[]]
mkRules = do
......@@ -47,7 +48,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
(VarE 'fromIntegral)
(SigE (VarE (if signed then 'unsignedWord
else 'signedWord))
@@ -1464,11 +1479,17 @@
@@ -1464,11 +1479,17 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
(VarE 'signExtendLo)
mkRules' rules t narrowE extE signExtE = do
let narrowRule = RuleP ("fromIntegral/" ++ show tp ++ "->" ++ showT t)
......@@ -65,7 +66,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
[]
(VarE 'fromIntegral)
(SigE extE (AppT (AppT ArrowT t) tpT))
@@ -1476,18 +1497,26 @@
@@ -1476,18 +1497,26 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
signedRules ← do
insts ← reifyInstances ''SignedWord [t]
case insts of
......@@ -93,7 +94,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
[]
(VarE 'fromIntegral)
(SigE signExtE (AppT (AppT ArrowT signT) tpT))
@@ -1501,6 +1530,9 @@
@@ -1501,6 +1530,9 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
sSmallT = ConT sSmallName in
[ RuleP ("fromIntegral/" ++
show tp ++ "->" ++ show uSmallName)
......@@ -103,7 +104,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
[]
(VarE 'fromIntegral)
(SigE (appV '(.) [VarE 'fromIntegral, narrowE])
@@ -1508,6 +1540,9 @@
@@ -1508,6 +1540,9 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
AllPhases
, RuleP ("fromIntegral/" ++
show uSmallName ++ "->" ++ show tp)
......@@ -113,7 +114,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
[]
(VarE 'fromIntegral)
(SigE (appV '(.) [extE, VarE 'fromIntegral])
@@ -1515,6 +1550,9 @@
@@ -1515,6 +1550,9 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
AllPhases
, RuleP ("fromIntegral/" ++
show tp ++ "->" ++ show sSmallName)
......@@ -123,7 +124,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
[]
(VarE 'fromIntegral)
(SigE (appV '(.) [VarE 'fromIntegral, narrowE])
@@ -1522,6 +1560,9 @@
@@ -1522,6 +1560,9 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
AllPhases
, RuleP ("fromIntegral/" ++
show sSmallName ++ "->" ++ show tp)
......@@ -133,7 +134,7 @@ diff -ru data-dword-0.3.1.2.orig/src/Data/DoubleWord/TH.hs data-dword-0.3.1.2/sr
[]
(VarE 'fromIntegral)
(SigE (appV '(.) [signExtE, VarE 'fromIntegral])
@@ -1532,7 +1573,9 @@
@@ -1532,7 +1573,9 @@ mkDoubleWord' signed tp cn otp ocn hiS hiT loS loT ad = (<$> mkRules) $ (++) $
_ → do
insts ← reifyInstances ''LoWord [t]
case insts of
......
Name: diagrams-lib
Version: 1.4.2.3
x-revision: 2
Synopsis: Embedded domain-specific language for declarative graphics
Description: Diagrams is a flexible, extensible EDSL for creating
graphics of many types. Graphics can be created
in arbitrary vector spaces and rendered with
multiple backends. diagrams-lib provides a
standard library of primitives and operations for
creating diagrams. To get started using it, see
the "Diagrams" module, and refer to the tutorials and
documentation on the diagrams website,
<http://projects.haskell.org/diagrams>.
Homepage: http://projects.haskell.org/diagrams
License: BSD3
License-file: LICENSE
Author: Brent Yorgey
Maintainer: diagrams-discuss@googlegroups.com
Bug-reports: http://github.com/diagrams/diagrams-lib/issues
Category: Graphics