Date: Saturday, October 13, 2012 @ 17:42:44 Author: tdziedzic Revision: 168665
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cabal-install/repos/extra-i686/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch (from rev 168664, cabal-install/trunk/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch) cabal-install/repos/extra-i686/PKGBUILD (from rev 168664, cabal-install/trunk/PKGBUILD) cabal-install/repos/extra-x86_64/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch (from rev 168664, cabal-install/trunk/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch) cabal-install/repos/extra-x86_64/PKGBUILD (from rev 168664, cabal-install/trunk/PKGBUILD) Deleted: cabal-install/repos/extra-i686/PKGBUILD cabal-install/repos/extra-x86_64/PKGBUILD ------------------------------------------------------------------------------+ extra-i686/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch | 27 +++ extra-i686/PKGBUILD | 90 +++++----- extra-x86_64/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch | 27 +++ extra-x86_64/PKGBUILD | 90 +++++----- 4 files changed, 148 insertions(+), 86 deletions(-) Copied: cabal-install/repos/extra-i686/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch (from rev 168664, cabal-install/trunk/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch) =================================================================== --- extra-i686/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch (rev 0) +++ extra-i686/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch 2012-10-13 21:42:44 UTC (rev 168665) @@ -0,0 +1,27 @@ +From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@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 + Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-10-13 21:29:34 UTC (rev 168664) +++ extra-i686/PKGBUILD 2012-10-13 21:42:44 UTC (rev 168665) @@ -1,43 +0,0 @@ -# Maintainer: Thomas Dziedzic <gos...@gmail.com> -# Maintainer: Vesa Kaihlavirta <v...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -pkgname=cabal-install -pkgver=1.16.0 -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") -md5sums=('da046116eee7664158411fa9e2cf6b14') - -build() { - cd cabal-install-${pkgver} - - runhaskell Setup configure \ - --enable-shared \ - --enable-split-objs \ - --enable-executable-stripping \ - --prefix=/usr - - runhaskell Setup build -} - -package() { - cd cabal-install-${pkgver} - - runhaskell Setup copy --destdir=$pkgdir - - # rm license installed to wrong location - rm -rf ${pkgdir}/usr/share/doc - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - # add bash completion - install -d ${pkgdir}/usr/share/bash-completion/completions - install -m644 bash-completion/cabal \ - ${pkgdir}/usr/share/bash-completion/completions -} Copied: cabal-install/repos/extra-i686/PKGBUILD (from rev 168664, cabal-install/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-10-13 21:42:44 UTC (rev 168665) @@ -0,0 +1,47 @@ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Maintainer: Vesa Kaihlavirta <v...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=cabal-install +pkgver=1.16.0 +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" + '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 \ + --enable-executable-stripping \ + --prefix=/usr + + runhaskell Setup build +} + +package() { + cd cabal-install-${pkgver} + + runhaskell Setup copy --destdir=$pkgdir + + # rm license installed to wrong location + rm -rf ${pkgdir}/usr/share/doc + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # add bash completion + install -d ${pkgdir}/usr/share/bash-completion/completions + install -m644 bash-completion/cabal \ + ${pkgdir}/usr/share/bash-completion/completions +} Copied: cabal-install/repos/extra-x86_64/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch (from rev 168664, cabal-install/trunk/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch) =================================================================== --- extra-x86_64/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch (rev 0) +++ extra-x86_64/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch 2012-10-13 21:42:44 UTC (rev 168665) @@ -0,0 +1,27 @@ +From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@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 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-10-13 21:29:34 UTC (rev 168664) +++ extra-x86_64/PKGBUILD 2012-10-13 21:42:44 UTC (rev 168665) @@ -1,43 +0,0 @@ -# Maintainer: Thomas Dziedzic <gos...@gmail.com> -# Maintainer: Vesa Kaihlavirta <v...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -pkgname=cabal-install -pkgver=1.16.0 -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") -md5sums=('da046116eee7664158411fa9e2cf6b14') - -build() { - cd cabal-install-${pkgver} - - runhaskell Setup configure \ - --enable-shared \ - --enable-split-objs \ - --enable-executable-stripping \ - --prefix=/usr - - runhaskell Setup build -} - -package() { - cd cabal-install-${pkgver} - - runhaskell Setup copy --destdir=$pkgdir - - # rm license installed to wrong location - rm -rf ${pkgdir}/usr/share/doc - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - # add bash completion - install -d ${pkgdir}/usr/share/bash-completion/completions - install -m644 bash-completion/cabal \ - ${pkgdir}/usr/share/bash-completion/completions -} Copied: cabal-install/repos/extra-x86_64/PKGBUILD (from rev 168664, cabal-install/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-10-13 21:42:44 UTC (rev 168665) @@ -0,0 +1,47 @@ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Maintainer: Vesa Kaihlavirta <v...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=cabal-install +pkgver=1.16.0 +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" + '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 \ + --enable-executable-stripping \ + --prefix=/usr + + runhaskell Setup build +} + +package() { + cd cabal-install-${pkgver} + + runhaskell Setup copy --destdir=$pkgdir + + # rm license installed to wrong location + rm -rf ${pkgdir}/usr/share/doc + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # add bash completion + install -d ${pkgdir}/usr/share/bash-completion/completions + install -m644 bash-completion/cabal \ + ${pkgdir}/usr/share/bash-completion/completions +}