[arch-commits] Commit in haskell-hakyll/trunk (3 files)

Felix Yan felixonmars at archlinux.org
Thu Oct 20 07:43:29 UTC 2016


    Date: Thursday, October 20, 2016 @ 07:43:28
  Author: felixonmars
Revision: 192681

upgpkg: haskell-hakyll 4.9.0.0-1

Added:
  haskell-hakyll/trunk/http-conduit-2.2.patch
  haskell-hakyll/trunk/optparse-applicative-0.13.patch
Modified:
  haskell-hakyll/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   32 ++++++++++++++++++-------------
 http-conduit-2.2.patch          |   39 ++++++++++++++++++++++++++++++++++++++
 optparse-applicative-0.13.patch |   37 ++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-20 07:43:14 UTC (rev 192680)
+++ PKGBUILD	2016-10-20 07:43:28 UTC (rev 192681)
@@ -4,24 +4,30 @@
 
 _hkgname=hakyll
 pkgname=haskell-hakyll
-pkgver=4.8.3.2
-pkgrel=19
+pkgver=4.9.0.0
+pkgrel=1
 pkgdesc="A static website compiler library"
 url="http://jaspervdj.be/hakyll"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=8.0.1" "haskell-blaze-html" "haskell-blaze-markup" "haskell-cmdargs"
-         "haskell-cryptohash" "haskell-data-default" "haskell-http-conduit" "haskell-http-types"
-         "haskell-lrucache" "haskell-mtl" "haskell-network" "haskell-network-uri" "haskell-pandoc"
-         "haskell-pandoc-citeproc" "haskell-parsec" "haskell-random" "haskell-regex-base"
-         "haskell-regex-tdfa" "haskell-resourcet" "haskell-scientific" "haskell-tagsoup"
-         "haskell-text" "haskell-time-locale-compat" "haskell-unordered-containers" "haskell-vector"
-         "haskell-yaml")
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha256sums=('ddc8c659590d29ba34afdced18ff1e60dc9d1bfb102a5cc7df447e31ee5e0b39')
+depends=("ghc=8.0.1" "haskell-blaze-html" "haskell-blaze-markup" "haskell-cryptohash"
+         "haskell-data-default" "haskell-fsnotify" "haskell-http-conduit" "haskell-http-types"
+         "haskell-lrucache" "haskell-mtl" "haskell-network" "haskell-network-uri"
+         "haskell-optparse-applicative" "haskell-pandoc" "haskell-pandoc-citeproc" "haskell-parsec"
+         "haskell-random" "haskell-regex-base" "haskell-regex-tdfa" "haskell-resourcet"
+         "haskell-scientific" "haskell-system-filepath" "haskell-tagsoup" "haskell-text"
+         "haskell-time-locale-compat" "haskell-unordered-containers" "haskell-vector" "haskell-wai"
+         "haskell-wai-app-static" "haskell-warp" "haskell-yaml")
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        http-conduit-2.2.patch optparse-applicative-0.13.patch)
+sha256sums=('6c21697efaf30166a1afc508f1122e2b828ade9d8d4d53408b13c1216337295e'
+            'f1871d8f381bacfe4ba01e7f037c635fff591d8fb353a2f26d08b1af1311142a'
+            '0b38abf39d8a410e06a5875ddadfb9c22cd37b4552b224dfabd52f30e9015abb')
 
 prepare() {
-    sed -i 's/http-conduit >= 2.1    && < 2.2,/http-conduit >= 2.1    \&\& < 2.3,/' ${_hkgname}-${pkgver}/${_hkgname}.cabal
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    patch -p1 -i ../http-conduit-2.2.patch
+    patch -p1 -i ../optparse-applicative-0.13.patch
 }
 
 build() {
@@ -30,7 +36,7 @@
     runhaskell Setup configure -O --enable-library-profiling --enable-shared \
         --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
         --libsubdir=\$compiler/site-local/\$pkgid \
-            -fcheckexternal -f-watchserver -f-previewserver
+            -fcheckexternal -fwatchserver -fpreviewserver
     runhaskell Setup build
     runhaskell Setup haddock --hoogle --html
     runhaskell Setup register --gen-script

Added: http-conduit-2.2.patch
===================================================================
--- http-conduit-2.2.patch	                        (rev 0)
+++ http-conduit-2.2.patch	2016-10-20 07:43:28 UTC (rev 192681)
@@ -0,0 +1,39 @@
+From ccb004ba10cfcdbcc419440e5f877605896bac4c Mon Sep 17 00:00:00 2001
+From: Chris Wong <lambda.fairy at gmail.com>
+Date: Fri, 14 Oct 2016 22:42:03 +1300
+Subject: [PATCH] Update to http-conduit 2.2
+
+The new `parseRequest` function doesn't throw on non-200 responses, so
+we don't need to account for these in the exception handler.
+---
+ hakyll.cabal        | 2 +-
+ src/Hakyll/Check.hs | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/hakyll.cabal b/hakyll.cabal
+index 44a09e5..c66524e 100644
+--- a/hakyll.cabal
++++ b/hakyll.cabal
+@@ -202,7 +202,7 @@ Library
+ 
+   If flag(checkExternal)
+     Build-depends:
+-      http-conduit >= 2.1    && < 2.2,
++      http-conduit >= 2.2    && < 2.3,
+       http-types   >= 0.7    && < 0.10
+     Cpp-options:
+       -DCHECK_EXTERNAL
+diff --git a/src/Hakyll/Check.hs b/src/Hakyll/Check.hs
+index c917f3a..b41b40e 100644
+--- a/src/Hakyll/Check.hs
++++ b/src/Hakyll/Check.hs
+@@ -236,8 +236,7 @@ checkExternalUrl url = do
+ 
+     -- Convert exception to a concise form
+     showException e = case cast e of
+-        Just (Http.StatusCodeException (Http.Status code msg) _ _) ->
+-            show code ++ " " ++ unpack msg
++        Just (Http.HttpExceptionRequest _ e') -> show e'
+         _ -> head $ words $ show e
+ #else
+ checkExternalUrl _ = return ()

Added: optparse-applicative-0.13.patch
===================================================================
--- optparse-applicative-0.13.patch	                        (rev 0)
+++ optparse-applicative-0.13.patch	2016-10-20 07:43:28 UTC (rev 192681)
@@ -0,0 +1,37 @@
+From 218d68363adc426b91dcbcdfb44f9f3da85f2e7a Mon Sep 17 00:00:00 2001
+From: Chris Wong <lambda.fairy at gmail.com>
+Date: Fri, 14 Oct 2016 22:44:24 +1300
+Subject: [PATCH] Update to optparse-applicative 0.13
+
+---
+ hakyll.cabal       | 2 +-
+ src/Hakyll/Main.hs | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/hakyll.cabal b/hakyll.cabal
+index c66524e..06cff67 100644
+--- a/hakyll.cabal
++++ b/hakyll.cabal
+@@ -175,7 +175,7 @@ Library
+     unordered-containers >= 0.2    && < 0.3,
+     vector               >= 0.11   && < 0.12,
+     yaml                 >= 0.8    && < 0.9,
+-    optparse-applicative >= 0.12   && < 0.13
++    optparse-applicative >= 0.13   && < 0.14
+ 
+   If flag(previewServer)
+     Build-depends:
+diff --git a/src/Hakyll/Main.hs b/src/Hakyll/Main.hs
+index c46c705..b48743b 100644
+--- a/src/Hakyll/Main.hs
++++ b/src/Hakyll/Main.hs
+@@ -16,7 +16,8 @@ import           System.Exit                     (ExitCode(ExitSuccess), exitWit
+ 
+ 
+ --------------------------------------------------------------------------------
+-import Options.Applicative
++import           Data.Monoid                     ((<>))
++import           Options.Applicative
+ 
+ 
+ --------------------------------------------------------------------------------



More information about the arch-commits mailing list