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

[Thomas Dziedzic]

    Date: Friday, October 26, 2012 @ 00:07:53
  Author: tdziedzic
Revision: 169693

upgpkg: cabal-install 1.16.0.1-1

bump

Modified:
  cabal-install/trunk/PKGBUILD
Deleted:
  cabal-install/trunk/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 |   27 ----------
 PKGBUILD                                                        |   12 +---
 2 files changed, 4 insertions(+), 35 deletions(-)

Deleted: 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	2012-10-26 01:58:05 UTC (rev 169692)
+++ 0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch	2012-10-26 04:07:53 UTC (rev 169693)
@@ -1,27 +0,0 @@
-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-26 01:58:05 UTC (rev 169692)
+++ PKGBUILD	2012-10-26 04:07:53 UTC (rev 169693)
@@ -3,24 +3,20 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=cabal-install
-pkgver=1.16.0
-pkgrel=2
+pkgver=1.16.0.1
+pkgrel=1
 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"
-        '0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch')
-md5sums=('da046116eee7664158411fa9e2cf6b14'
-         'd4705a398588efe6dbbcf6f4c3185a7d')
+source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
+md5sums=('fdd184a8e097dd4dda8a8d9083b82280')
 
 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 \