Allow binary 0.5. Version bump to 1.12.3.1.
This commit is contained in:
parent
68b438b1b8
commit
a1abb3eeea
3 changed files with 12 additions and 5 deletions
|
@ -1,3 +1,7 @@
|
|||
pandoc (1.12.3.1)
|
||||
|
||||
* Relaxed version constraint on binary, allowing the use of binary 0.5.
|
||||
|
||||
pandoc (1.12.3)
|
||||
|
||||
* The `--bibliography` option now sets the `biblio-files` variable.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Name: pandoc
|
||||
Version: 1.12.3
|
||||
Version: 1.12.3.1
|
||||
Cabal-Version: >= 1.10
|
||||
Build-Type: Custom
|
||||
License: GPL
|
||||
|
@ -233,7 +233,7 @@ Library
|
|||
yaml >= 0.8.3 && < 0.9,
|
||||
vector >= 0.10 && < 0.11,
|
||||
hslua >= 0.3 && < 0.4,
|
||||
binary >= 0.6 && < 0.8
|
||||
binary >= 0.5 && < 0.8
|
||||
Build-Tools: alex, happy
|
||||
if flag(http-conduit)
|
||||
Build-Depends: http-conduit >= 1.9 && < 2.1,
|
||||
|
|
|
@ -182,9 +182,12 @@ findJfifSize bs = do
|
|||
Nothing -> fail "Did not find length record"
|
||||
|
||||
exifSize :: ByteString -> Maybe ImageSize
|
||||
exifSize = -- runGet ((Just <$> exifHeader) `mplus` return Nothing) .
|
||||
runGet (Just <$> exifHeader) .
|
||||
BL.fromChunks . (:[])
|
||||
exifSize = runGet (Just <$> exifHeader) . BL.fromChunks . (:[])
|
||||
-- NOTE: It would be nicer to do
|
||||
-- runGet ((Just <$> exifHeader) <|> return Nothing)
|
||||
-- which would prevent pandoc from raising an error when an exif header can't
|
||||
-- be parsed. But we only get an Alternative instance for Get in binary 0.6,
|
||||
-- and binary 0.5 ships with ghc 7.6.
|
||||
|
||||
exifHeader :: Get ImageSize
|
||||
exifHeader = do
|
||||
|
|
Loading…
Add table
Reference in a new issue