2 files changed, 53 insertions, 17 deletions
diff --git a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
new file mode 100644
index 000000000..2e687db21
--- /dev/null
+++ b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
@@ -0,0 +1,33 @@
+From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 07:43:41 -0700
+Subject: [PATCH] fix incorrect types in documentation/haddock
+
+---
+ src/Documentation/Haddock.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
+index 60bb314..8fd9674 100644
+--- a/src/Documentation/Haddock.hs
++++ b/src/Documentation/Haddock.hs
+@@ -59,6 +59,7 @@ import Haddock.Types
+ import Haddock.Options
+ import Haddock.Utils
+ import Main
++import GHC (Ghc)
+ 
+ 
+ -- | Create 'Interface' structures from a given list of Haddock command-line
+@@ -68,7 +69,7 @@ import Main
+ createInterfaces
+   :: [Flag]         -- ^ A list of command-line flags
+   -> [String]       -- ^ File or module names
+-  -> IO [Interface] -- ^ Resulting list of interfaces
++  -> Ghc [Interface] -- ^ Resulting list of interfaces
+ createInterfaces flags modules = do
+   (_, ifaces, _) <- readPackagesAndProcessModules flags modules
+   return ifaces
+-- 
+1.7.12
+
diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD
index 81a65961c..274cc7851 100644
--- a/community-testing/haddock/PKGBUILD
+++ b/community-testing/haddock/PKGBUILD
@@ -1,31 +1,30 @@
-# Maintainer: 
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haddock
-pkgver=2.10.0
-pkgrel=2
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="Tool for generating documentation for Haskell libraries"
 url="http://hackage.haskell.org/package/haddock"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-makedepends=('alex' 'happy')
-depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8')
+makedepends=('alex=3.0.2-2' 'happy=1.18.9-6')
+depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9')
 install=$pkgname.install
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410')
+source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+        '0001-fix-incorrect-types-in-documentation-haddock.patch')
+sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02'
+            'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  
-  # These doesn't make haddock work for ghc 7.4.1
-  #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal
-  #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal
-  #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs
 
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-    --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
+  patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch
+  
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
+    --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup haddock
   runhaskell Setup register --gen-script
@@ -37,11 +36,15 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   
   install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -m744 unregister.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
   install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+  ln -s "/usr/share/doc/$pkgname/html" \
+    "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
   runhaskell Setup copy --destdir="$pkgdir"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
   mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
 }
+
+# vim:set ts=2 sw=2 et: