...@@ -5,12 +5,4 @@ ...@@ -5,12 +5,4 @@
<email>haskell@gentoo.org</email> <email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name> <name>Gentoo Haskell</name>
</maintainer> </maintainer>
<use>
</use>
<longdescription>
First class type families,
eval-style defunctionalization
See &quot;Fcf&quot;.
</longdescription>
</pkgmetadata> </pkgmetadata>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
EAPI=7 EAPI=7
# ebuild generated by hackport 0.6.5.9999 # ebuild generated by hackport 0.6.7.9999
#hackport: flags: -dev #hackport: flags: -dev
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
...@@ -18,17 +18,24 @@ SLOT="0/${PV}" ...@@ -18,17 +18,24 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="roundtrip" IUSE="roundtrip"
RDEPEND=">=dev-lang/ghc-7.4.1:= RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
>=dev-haskell/free-4.12:=[profile?]
>=dev-haskell/ghc-paths-0.1:=[profile?]
>=dev-haskell/mtl-2.2.1:=[profile?]
>=dev-haskell/syb-0.5:=[profile?]
>=dev-lang/ghc-7.10.2:=
roundtrip? ( dev-haskell/diff:=[profile?] roundtrip? ( dev-haskell/diff:=[profile?]
dev-haskell/filemanip:=[profile?] dev-haskell/filemanip:=[profile?]
>=dev-haskell/ghc-paths-0.1:=[profile?]
dev-haskell/hunit:=[profile?] dev-haskell/hunit:=[profile?]
>=dev-haskell/text-1.2.2:=[profile?] >=dev-haskell/text-1.2.2:=[profile?]
>=dev-haskell/turtle-1.3.0:=[profile?] >=dev-haskell/turtle-1.3.0:=[profile?] )
>=dev-lang/ghc-7.10.2:=[profile?] )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10 >=dev-haskell/cabal-1.22.2.0
test? ( >=dev-haskell/filemanip-0.3
>=dev-haskell/hunit-1.2
>=dev-haskell/silently-1.2
!roundtrip? ( dev-haskell/diff ) )
" "
src_configure() { src_configure() {
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<email>haskell@gentoo.org</email> <email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name> <name>Gentoo Haskell</name>
</maintainer> </maintainer>
<use>
<flag name="roundtrip">Build roundtripping executables</flag>
</use>
<longdescription> <longdescription>
Using the API Annotations available from GHC 7.10.2, this Using the API Annotations available from GHC 7.10.2, this
library provides a means to round trip any code that can library provides a means to round trip any code that can
...@@ -22,10 +25,10 @@ ...@@ -22,10 +25,10 @@
* Print - converts an AST and its annotations to * Print - converts an AST and its annotations to
properly formatted source text. properly formatted source text.
* Pretty - adds annotations to an AST (fragment) so that
the output can be parsed back to the same AST.
Note: requires GHC 7.10.2 or later Note: requires GHC 7.10.2 or later
</longdescription> </longdescription>
<use>
<flag name="roundtrip">Build roundtripping executables</flag>
</use>
</pkgmetadata> </pkgmetadata>
DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a DIST hakyll-4.13.4.1.tar.gz 105251 BLAKE2B 6a2c83f2784aad1c80ecce7d01ade1d1bde0546c3f828acc74c88df95b4217f191eb516bf57cc1993bdaebd76629d86d3963bf386f7df68ca5dc17288f3f2b3f SHA512 6045a1461855d46f57a20f7a84636f90e6d151bcbaf09511f10ab66fa0567062e355ff580d1f12a4432bbe517bc9e162d65927f3c343f8f077e81981e7c7973c
From 77afcbc2937a4ee5db9666c1f3e0c090914d3980 Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Sun, 6 Dec 2020 19:24:06 +0100
Subject: [PATCH] Pandoc 2.11 compatibility (#826)
* Pandoc 2.11 compatibility
* Bump stack.yaml
* Bump stack dependencies
---
lib/Hakyll/Web/Pandoc/Biblio.hs | 102 +++++++++++++++++---------------
lib/Hakyll/Web/Pandoc/Binary.hs | 12 ----
5 files changed, 123 insertions(+), 86 deletions(-)
diff --git a/lib/Hakyll/Web/Pandoc/Biblio.hs b/lib/Hakyll/Web/Pandoc/Biblio.hs
index 5127d881..567f478b 100644
--- a/lib/Hakyll/Web/Pandoc/Biblio.hs
+++ b/lib/Hakyll/Web/Pandoc/Biblio.hs
@@ -12,6 +12,7 @@
{-# LANGUAGE Arrows #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE OverloadedStrings #-}
module Hakyll.Web.Pandoc.Biblio
( CSL
, cslCompiler
@@ -23,33 +24,31 @@ module Hakyll.Web.Pandoc.Biblio
--------------------------------------------------------------------------------
-import Control.Monad (liftM, replicateM)
-import Data.Binary (Binary (..))
-import Data.Typeable (Typeable)
+import Control.Monad (liftM)
+import Data.Binary (Binary (..))
+import qualified Data.ByteString as B
+import qualified Data.ByteString.Lazy as BL
+import qualified Data.Map as Map
+import qualified Data.Time as Time
+import Data.Typeable (Typeable)
import Hakyll.Core.Compiler
import Hakyll.Core.Compiler.Internal
import Hakyll.Core.Identifier
import Hakyll.Core.Item
-import Hakyll.Core.Provider
import Hakyll.Core.Writable
import Hakyll.Web.Pandoc
-import Hakyll.Web.Pandoc.Binary ()
-import qualified Text.CSL as CSL
-import Text.CSL.Pandoc (processCites)
-import Text.Pandoc (Pandoc, ReaderOptions (..),
- enableExtension, Extension (..))
+import Text.Pandoc (Extension (..), Pandoc,
+ ReaderOptions (..),
+ enableExtension)
+import qualified Text.Pandoc as Pandoc
+import qualified Text.Pandoc.Citeproc as Pandoc (processCitations)
--------------------------------------------------------------------------------
-data CSL = CSL
- deriving (Show, Typeable)
+newtype CSL = CSL {unCSL :: B.ByteString}
+ deriving (Binary, Show, Typeable)
---------------------------------------------------------------------------------
-instance Binary CSL where
- put CSL = return ()
- get = return CSL
-
--------------------------------------------------------------------------------
instance Writable CSL where
@@ -59,21 +58,12 @@ instance Writable CSL where
--------------------------------------------------------------------------------
cslCompiler :: Compiler (Item CSL)
-cslCompiler = makeItem CSL
-
-
---------------------------------------------------------------------------------
-newtype Biblio = Biblio [CSL.Reference]
- deriving (Show, Typeable)
+cslCompiler = fmap (CSL . BL.toStrict) <$> getResourceLBS
--------------------------------------------------------------------------------
-instance Binary Biblio where
- -- Ugly.
- get = do
- len <- get
- Biblio <$> replicateM len get
- put (Biblio rs) = put (length rs) >> mapM_ put rs
+newtype Biblio = Biblio {unBiblio :: B.ByteString}
+ deriving (Binary, Show, Typeable)
--------------------------------------------------------------------------------
@@ -84,12 +74,7 @@ instance Writable Biblio where
--------------------------------------------------------------------------------
biblioCompiler :: Compiler (Item Biblio)
-biblioCompiler = do
- filePath <- getResourceFilePath
- makeItem =<< unsafeCompiler (Biblio <$> CSL.readBiblioFile idpred filePath)
- where
- -- This is a filter on citations. We include all citations.
- idpred = const True
+biblioCompiler = fmap (Biblio . BL.toStrict) <$> getResourceLBS
--------------------------------------------------------------------------------
@@ -99,19 +84,42 @@ readPandocBiblio :: ReaderOptions
-> (Item String)
-> Compiler (Item Pandoc)
readPandocBiblio ropt csl biblio item = do
- -- Parse CSL file, if given
- provider <- compilerProvider <$> compilerAsk
- style <- unsafeCompiler $
- CSL.readCSLFile Nothing . (resourceFilePath provider) . itemIdentifier $ csl
-
- -- We need to know the citation keys, add then *before* actually parsing the
- -- actual page. If we don't do this, pandoc won't even consider them
- -- citations!
- let Biblio refs = itemBody biblio
- pandoc <- itemBody <$> readPandocWith ropt item
- let pandoc' = processCites style refs pandoc
-
- return $ fmap (const pandoc') item
+ -- It's not straightforward to use the Pandoc API as of 2.11 to deal with
+ -- citations, since it doesn't export many things in 'Text.Pandoc.Citeproc'.
+ -- The 'citeproc' package is also hard to use.
+ --
+ -- So instead, we try treating Pandoc as a black box. Pandoc can read
+ -- specific csl and bilbio files based on metadata keys.
+ --
+ -- So we load the CSL and Biblio files and pass them to Pandoc using the
+ -- ersatz filesystem.
+ Pandoc.Pandoc (Pandoc.Meta meta) blocks <- itemBody <$>
+ readPandocWith ropt item
+
+ let cslFile = Pandoc.FileInfo zeroTime . unCSL $ itemBody csl
+ bibFile = Pandoc.FileInfo zeroTime . unBiblio $ itemBody biblio
+ addBiblioFiles = \st -> st
+ { Pandoc.stFiles =
+ Pandoc.insertInFileTree "_hakyll/style.csl" cslFile .
+ Pandoc.insertInFileTree "_hakyll/refs.bib" bibFile $
+ Pandoc.stFiles st
+ }
+ biblioMeta = Pandoc.Meta .
+ Map.insert "csl" (Pandoc.MetaString "_hakyll/style.csl") .
+ Map.insert "bibliography" (Pandoc.MetaString "_hakyll/refs.bib") $
+ meta
+ errOrPandoc = Pandoc.runPure $ do
+ Pandoc.modifyPureState addBiblioFiles
+ Pandoc.processCitations $ Pandoc.Pandoc biblioMeta blocks
+
+ pandoc <- case errOrPandoc of
+ Left e -> compilerThrow ["Error during processCitations: " ++ show e]
+ Right x -> return x
+
+ return $ fmap (const pandoc) item
+
+ where
+ zeroTime = Time.UTCTime (toEnum 0) 0
--------------------------------------------------------------------------------
pandocBiblioCompiler :: String -> String -> Compiler (Item String)
diff --git a/lib/Hakyll/Web/Pandoc/Binary.hs b/lib/Hakyll/Web/Pandoc/Binary.hs
index 5d3efead..3f7f4fb5 100644
--- a/lib/Hakyll/Web/Pandoc/Binary.hs
+++ b/lib/Hakyll/Web/Pandoc/Binary.hs
@@ -4,9 +4,6 @@ module Hakyll.Web.Pandoc.Binary where
import Data.Binary (Binary (..))
-import qualified Text.CSL as CSL
-import qualified Text.CSL.Reference as REF
-import qualified Text.CSL.Style as STY
import Text.Pandoc
--------------------------------------------------------------------------------
@@ -18,7 +15,6 @@ instance Binary Caption
instance Binary Cell
instance Binary ColSpan
instance Binary ColWidth
-instance Binary CSL.Reference
instance Binary Citation
instance Binary CitationMode
instance Binary Format
@@ -27,17 +23,9 @@ instance Binary ListNumberDelim
instance Binary ListNumberStyle
instance Binary MathType
instance Binary QuoteType
-instance Binary REF.CLabel
-instance Binary REF.CNum
-instance Binary REF.Literal
-instance Binary REF.RefDate
-instance Binary REF.RefType
-instance Binary REF.Season
instance Binary Row
instance Binary RowHeadColumns
instance Binary RowSpan
-instance Binary STY.Agent
-instance Binary STY.Formatted
instance Binary TableBody
instance Binary TableFoot
instance Binary TableHead
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
EAPI=7 EAPI=7
# ebuild generated by hackport 0.6.4.9999 # ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal inherit haskell-cabal
DESCRIPTION="A static website compiler library" DESCRIPTION="A static website compiler library"
HOMEPAGE="http://jaspervdj.be/hakyll" HOMEPAGE="https://jaspervdj.be/hakyll"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD" LICENSE="BSD"
...@@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:= ...@@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=
>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
>=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
>=dev-haskell/file-embed-0.0.10.1:=[profile?] >=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.14:=[profile?]
>=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?] >=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?]
>=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?]
>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
...@@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:= ...@@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=
>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
>=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
>=dev-lang/ghc-8.6.3:= >=dev-lang/ghc-8.6.3:=
buildwebsite? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] ) buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.12:=[profile?] )
checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] ) checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
...@@ -48,23 +48,26 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:= ...@@ -48,23 +48,26 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=
>=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] ) >=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
!previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] ) !previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) ) watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
usepandoc? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] usepandoc? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.12:=[profile?] )
>=dev-haskell/pandoc-citeproc-0.14:=[profile?] <dev-haskell/pandoc-citeproc-0.18:=[profile?] )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.4.0.1 >=dev-haskell/cabal-2.4.0.1
test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
" "
PATCHES=( "${FILESDIR}"/${P}-pandoc-2.11.patch )
src_prepare() { src_prepare() {
default default
cabal_chdeps \ cabal_chdeps \
'file-embed >= 0.0.10.1 && < 0.0.12' 'file-embed >= 0.0.10.1' \ 'pandoc >= 2.10 && < 2.11,' 'pandoc >= 2.11' \
'template-haskell >= 2.14 && < 2.16' 'template-haskell >= 2.14' 'pandoc >= 2.10 && < 2.11' 'pandoc >= 2.11' \
'pandoc-citeproc >= 0.14 && < 0.18' ' ' \
'file-embed >= 0.0.10.1 && < 0.0.12' 'file-embed >= 0.0.10.1'
} }
src_configure() { src_configure() {
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
</maintainer> </maintainer>
<use> <use>
<flag name="buildwebsite">Build the hakyll website</flag> <flag name="buildwebsite">Build the hakyll website</flag>
<flag name="previewserver">Include the preview server</flag>
<flag name="checkexternal">Include external link checking</flag> <flag name="checkexternal">Include external link checking</flag>
<flag name="watchserver">wait for filesystem changes and rebuild pages</flag> <flag name="previewserver">Include the preview server</flag>
<flag name="usepandoc">Include Pandoc support</flag> <flag name="usepandoc">Include Pandoc support</flag>
<flag name="watchserver">Include the watch server</flag>
</use> </use>
<longdescription> <longdescription>
Hakyll is a static website compiler library. It provides you with the tools to Hakyll is a static website compiler library. It provides you with the tools to
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
* &lt;http://jaspervdj.be/hakyll&gt; * &lt;http://jaspervdj.be/hakyll&gt;
If you seek assistance, there's: If you seek assistance, there&#39;s:
* A google group: &lt;http://groups.google.com/group/hakyll&gt; * A google group: &lt;http://groups.google.com/group/hakyll&gt;
* An IRC channel, @#hakyll@ on freenode * An IRC channel, @#hakyll@ on freenode
Additionally, there's the Haddock documentation in the different modules, Additionally, there&#39;s the Haddock documentation in the different modules,
meant as a reference. meant as a reference.
</longdescription> </longdescription>
</pkgmetadata> </pkgmetadata>
DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f DIST happstack-server-7.6.1.tar.gz 84878 BLAKE2B 5e146a317e41b039d24cac8dc41e7ebd707168193b5fc5cfe482ec53a3b31088438cffb5f91f741822e3ae1db19c98eaae6c1f0e012afebeebcda4182332bd1f SHA512 e75bc986b16777563410ce42010a161790df5f5a575b253dac2a85ca7e724a9bf1a7485406f7235395d3a9adc3d8205dd3549fd718815390927aeed3c0b8a05e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
EAPI=7 EAPI=7
# ebuild generated by hackport 0.6.4.9999 # ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal inherit haskell-cabal
...@@ -15,9 +15,9 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" ...@@ -15,9 +15,9 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD" LICENSE="BSD"
SLOT="0/${PV}" SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="+network-uri +template-haskell" IUSE="+network-uri"
RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
dev-haskell/exceptions:=[profile?] dev-haskell/exceptions:=[profile?]
dev-haskell/extensible-exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?]
...@@ -39,9 +39,9 @@ RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-byt ...@@ -39,9 +39,9 @@ RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-byt
dev-haskell/xhtml:=[profile?] dev-haskell/xhtml:=[profile?]
dev-haskell/zlib:=[profile?] dev-haskell/zlib:=[profile?]
>=dev-lang/ghc-7.8.2:= >=dev-lang/ghc-7.8.2:=
network-uri? ( >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
>=dev-haskell/network-3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
...@@ -51,6 +51,5 @@ DEPEND="${RDEPEND} ...@@ -51,6 +51,5 @@ DEPEND="${RDEPEND}
src_configure() { src_configure() {
haskell-cabal_src_configure \ haskell-cabal_src_configure \
$(cabal_flag network-uri network-uri) \ $(cabal_flag network-uri network-uri)
$(cabal_flag template-haskell template_haskell)
} }
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
<email>haskell@gentoo.org</email> <email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name> <name>Gentoo Haskell</name>
</maintainer> </maintainer>
<longdescription>
Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
</longdescription>
<use> <use>
<flag name="network-uri">Get Network.URI from the network-uri package</flag> <flag name="network-uri">Get Network.URI from the network-uri package</flag>
<flag name="template-haskell">Description: Template Haskell is available on this system</flag>
</use> </use>
<longdescription>
Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
</longdescription>
</pkgmetadata> </pkgmetadata>
...@@ -38,6 +38,13 @@ DEPEND="${RDEPEND} ...@@ -38,6 +38,13 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}" S="${WORKDIR}/${MY_P}"
src_prepare() {
default
cabal_chdeps \
'base >= 4.3 && < 4.14' 'base >= 4.3'
}
src_configure() { src_configure() {
haskell-cabal_src_configure \ haskell-cabal_src_configure \
$(cabal_flag network-bsd network-bsd) $(cabal_flag network-bsd network-bsd)
......
DIST hoauth2-1.11.0.tar.gz 18270 BLAKE2B 8258e8e7a1bfe12ca0da09297c18354617cb525aee70418a85a56cd5421b4695aa22861e1368fbd2d0ac11ff155fd4cebb8d220ebc4b1f7c3403268682e11e95 SHA512 179c97045f33da6f6cb4c153b9be3482031ce8a150ad70defcbbbfa3c67ff10b31c86c45d845aa605b9c4d3ac921f4372bcd49fbb384e0c78409219bc0bf1607 DIST hoauth2-1.16.0.tar.gz 18479 BLAKE2B ca9aa0d35d3bfb9ee3a9cbe62c2ecb1a0efd109c89600642a062fbcbe62cefae53f4810b38eb55b81c29c72e4b80aca8f746966ccbaf17ecc83883e2f6fc3528 SHA512 fe42759c2ccaf035bfa15d9276a7c8bf6608a7b74732c6950c2081616196296a73c34474989c1eda5fcfc15066626e1facf2f58b6977d5e00520290948731cb6
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
EAPI=7 EAPI=7
# ebuild generated by hackport 0.6.4 # ebuild generated by hackport 0.6.7.9999
#hackport: flags: -test #hackport: flags: -test
CABAL_FEATURES="lib profile haddock hoogle hscolour" CABAL_FEATURES="lib profile haddock hoogle hscolour"
...@@ -18,8 +18,8 @@ SLOT="0/${PV}" ...@@ -18,8 +18,8 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="" IUSE=""
RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
>=dev-haskell/binary-0.8.3.0:=[profile?] >=dev-haskell/binary-0.8.3:=[profile?]
>=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
>=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
...@@ -34,13 +34,6 @@ DEPEND="${RDEPEND} ...@@ -34,13 +34,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.4 >=dev-haskell/cabal-2.4
" "
src_prepare() {
default
cabal_chdeps \
'binary >= 0.8.3.0 && < 0.8.8' 'binary >= 0.8.3.0'
}
src_configure() { src_configure() {
haskell-cabal_src_configure \ haskell-cabal_src_configure \
--flag=-test --flag=-test
......
...@@ -5,15 +5,4 @@ ...@@ -5,15 +5,4 @@
<email>haskell@gentoo.org</email> <email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name> <name>Gentoo Haskell</name>
</maintainer> </maintainer>
<longdescription>
Haskell OAuth2 authentication.
Tested following services
* google web oauth: &lt;https://developers.google.com/accounts/docs/OAuth2WebServer&gt;
* weibo oauth2: &lt;http://open.weibo.com/wiki/Oauth2&gt;
* github oauth: &lt;http://developer.github.com/v3/oauth/&gt;
</longdescription>
</pkgmetadata> </pkgmetadata>
...@@ -35,3 +35,11 @@ DEPEND="${RDEPEND} ...@@ -35,3 +35,11 @@ DEPEND="${RDEPEND}
>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4
>=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 ) >=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 )
" "
src_prepare() {
default
cabal_chdeps \
'base >= 4 && < 4.15' 'base >= 4' \
'base >= 4 && < 4.14' 'base >= 4'
}
...@@ -36,3 +36,10 @@ DEPEND="${RDEPEND} ...@@ -36,3 +36,10 @@ DEPEND="${RDEPEND}
>=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.3
>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 ) >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
" "
src_prepare() {
default
cabal_chdeps \
'base >=4.6 && <4.14' 'base >=4.6'
}
...@@ -41,5 +41,6 @@ src_prepare() { ...@@ -41,5 +41,6 @@ src_prepare() {
cabal_chdeps \ cabal_chdeps \
'prettyprinter >= 1.2 && < 1.7' 'prettyprinter >= 1.2' \ 'prettyprinter >= 1.2 && < 1.7' 'prettyprinter >= 1.2' \
'unliftio-core >= 0.1.1.0 && < 0.2' 'unliftio-core >= 0.1.1.0' 'unliftio-core >= 0.1.1.0 && < 0.2' 'unliftio-core >= 0.1.1.0' \
'base >=4.8 && <4.14' 'base >=4.8'
} }
...@@ -17,6 +17,8 @@ SLOT="0/${PV}" ...@@ -17,6 +17,8 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="" IUSE=""
RESTRICT=test # broken on USE=doc
RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
>=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-6:=[profile?]
<dev-haskell/distributive-0.7:=[profile?] <dev-haskell/distributive-0.7:=[profile?]
......
DIST multistate-0.8.0.3.tar.gz 21505 BLAKE2B aa443171bc035504b4bc340b63d9aaaa42c9b848ddb63d0c7471f256946335fef797938c9078580d446d787ccb9fff3333c00c05b1ee8303b39781c7c2a82313 SHA512 e4405dfae45f3d7ca04f93871d6c29750390a1058c293561b681b792c31e2b44cac9ff09f3baab8b470858375a30e586d47ba64b72d2861ad6407ac124ca2ce5
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
<use>
<flag name="build-example">Build the MultiState-example example program</flag>
</use>
<longdescription>
When using multiple Read\/Write\/State transformers in the same monad stack,
it becomes necessary to lift the operations in order to affect a specific
transformer.
Using heterogeneous lists (and all kinds of GHC extensions magic),
this package provides transformers that remove that necessity:
MultiReaderT\/MultiWriterT\/MultiStateT\/MultiRWST can contain a
heterogeneous list of values.
See the &lt;https://github.com/lspitzner/multistate README&gt; for
a longer description.
</longdescription>
</pkgmetadata>