[arch-commits] Commit in cabal-install/trunk (2 files)

[Thomas Dziedzic]

    Date: Saturday, October 13, 2012 @ 17:29:34
  Author: tdziedzic
Revision: 168664

add cabal-install fix for buggy cabal in ghc 7.6.1

Added:
  cabal-install/trunk/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
Modified:
  cabal-install/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch |   27 ++++++++++
 PKGBUILD                                                        |   10 ++-
 2 files changed, 34 insertions(+), 3 deletions(-)

Added: 0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
===================================================================
--- 0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch	                        (rev 0)
+++ 0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch	2012-10-13 21:29:34 UTC (rev 168664)
@@ -0,0 +1,27 @@
+From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sat, 13 Oct 2012 20:37:09 -0700
+Subject: [PATCH] disable setting jobs due to cabal 1.16.0 bug shipped with
+ ghc 7.6.1
+
+---
+ Distribution/Client/Config.hs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Distribution/Client/Config.hs b/Distribution/Client/Config.hs
+index 93e5a52..ecbc6f7 100644
+--- a/Distribution/Client/Config.hs
++++ b/Distribution/Client/Config.hs
+@@ -202,8 +202,7 @@ initialSavedConfig = do
+     },
+     savedInstallFlags    = mempty {
+       installSummaryFile = [toPathTemplate (logsDir </> "build.log")],
+-      installBuildReports= toFlag AnonymousReports,
+-      installNumJobs     = toFlag (Just numberOfProcessors)
++      installBuildReports= toFlag AnonymousReports
+     }
+   }
+ 
+-- 
+1.7.12.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-13 21:20:26 UTC (rev 168663)
+++ PKGBUILD	2012-10-13 21:29:34 UTC (rev 168664)
@@ -4,19 +4,23 @@
 
 pkgname=cabal-install
 pkgver=1.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
 depends=('ghc' 'gmp' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
-md5sums=('da046116eee7664158411fa9e2cf6b14')
+source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz"
+        '0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch')
+md5sums=('da046116eee7664158411fa9e2cf6b14'
+         'd4705a398588efe6dbbcf6f4c3185a7d')
 
 build() {
   cd cabal-install-${pkgver}
 
+  patch -Np1 -i ${srcdir}/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
+
   runhaskell Setup configure \
     --enable-shared \
     --enable-split-objs \