Date: Sunday, July 3, 2016 @ 13:51:07 Author: felixonmars Revision: 181837
upgpkg: pandoc-citeproc 0.10-8 rebuild with Glob-0.7.8, JuicyPixels-3.2.7.2, aeson-pretty-0.8.1, data-accessor-template-0.2.1.13, http-client-0.4.30, http-conduit-2.1.11 Added: pandoc-citeproc/trunk/aeson-pretty-0.8.patch Modified: pandoc-citeproc/trunk/PKGBUILD ------------------------+ PKGBUILD | 13 ++++++++++--- aeson-pretty-0.8.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-07-03 13:33:18 UTC (rev 181836) +++ PKGBUILD 2016-07-03 13:51:07 UTC (rev 181837) @@ -5,7 +5,7 @@ pkgbase=pandoc-citeproc pkgname=(pandoc-citeproc haskell-pandoc-citeproc) pkgver=0.10 -pkgrel=7 +pkgrel=8 pkgdesc="Supports using pandoc with citeproc" url="http://hackage.haskell.org/package/${pkgbase}" license=("custom:BSD3") @@ -16,9 +16,16 @@ "haskell-rfc5051" "haskell-setenv" "haskell-split" "haskell-syb" "haskell-tagsoup" "haskell-temporary" "haskell-text" "haskell-text-icu" "haskell-unordered-containers" "haskell-vector" "haskell-xml-conduit" "haskell-yaml") -source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz") -sha256sums=('2465117b5e922d8c93f6ebf3b99d76c90d31573d01bd9935f5a1cc7be1cdb702') +source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz" + aeson-pretty-0.8.patch) +sha256sums=('2465117b5e922d8c93f6ebf3b99d76c90d31573d01bd9935f5a1cc7be1cdb702' + '7605c9736a9bd284a15446c249324791b9b7b0ad8db4e7113d971d89a5912a6a') +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -p1 -i ../aeson-pretty-0.8.patch +} + build() { cd "${srcdir}/${pkgbase}-${pkgver}" Added: aeson-pretty-0.8.patch =================================================================== --- aeson-pretty-0.8.patch (rev 0) +++ aeson-pretty-0.8.patch 2016-07-03 13:51:07 UTC (rev 181837) @@ -0,0 +1,38 @@ +diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal +index 40c27af..595bb53 100644 +--- a/pandoc-citeproc.cabal ++++ b/pandoc-citeproc.cabal +@@ -148,7 +148,7 @@ executable pandoc-citeproc + pandoc-types >= 1.16 && < 1.17, + pandoc >= 1.16 && < 1.18, + aeson, +- aeson-pretty, yaml, bytestring, syb, attoparsec, text, ++ aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, + filepath + other-modules: Paths_pandoc_citeproc + Prelude +diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs +index f72fa41..2c1ce27 100644 +--- a/pandoc-citeproc.hs ++++ b/pandoc-citeproc.hs +@@ -12,7 +12,7 @@ import qualified Data.ByteString.Char8 as B8 + import Data.Attoparsec.ByteString.Char8 as Attoparsec + import qualified Data.Text as T + import Data.Text.Encoding (encodeUtf8) +-import Data.Aeson.Encode.Pretty (encodePretty', Config(..)) ++import Data.Aeson.Encode.Pretty (encodePretty', Config(..), Indent(Spaces), NumberFormat(Generic)) + import System.Console.GetOpt + import Control.Monad + import System.IO +@@ -62,8 +62,9 @@ main = do + B8.intercalate (B.singleton 10) . + map (unescapeTags . toByteString . (:[])) + else B8.putStrLn . unescapeUnicode . B.concat . BL.toChunks . +- encodePretty' Config{ confIndent = 2 +- , confCompare = compare } ++ encodePretty' Config{ confIndent = Spaces 2 ++ , confCompare = compare ++ , confNumFormat = Generic } + else toJSONFilter doCites + + formatFromExtension :: FilePath -> Maybe BibFormat