[arch-commits] Commit in haskell-quickcheck/repos (8 files)

Alexander Rødseth arodseth at nymeria.archlinux.org
Sat Feb 2 08:49:29 UTC 2013


    Date: Saturday, February 2, 2013 @ 09:49:28
  Author: arodseth
Revision: 83487

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  haskell-quickcheck/repos/community-staging-i686/
  haskell-quickcheck/repos/community-staging-i686/0001-update-code-to-support-extensible-exceptions-no-long.patch
    (from rev 83486, haskell-quickcheck/trunk/0001-update-code-to-support-extensible-exceptions-no-long.patch)
  haskell-quickcheck/repos/community-staging-i686/PKGBUILD
    (from rev 83486, haskell-quickcheck/trunk/PKGBUILD)
  haskell-quickcheck/repos/community-staging-i686/haskell-quickcheck.install
    (from rev 83486, haskell-quickcheck/trunk/haskell-quickcheck.install)
  haskell-quickcheck/repos/community-staging-x86_64/
  haskell-quickcheck/repos/community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch
    (from rev 83486, haskell-quickcheck/trunk/0001-update-code-to-support-extensible-exceptions-no-long.patch)
  haskell-quickcheck/repos/community-staging-x86_64/PKGBUILD
    (from rev 83486, haskell-quickcheck/trunk/PKGBUILD)
  haskell-quickcheck/repos/community-staging-x86_64/haskell-quickcheck.install
    (from rev 83486, haskell-quickcheck/trunk/haskell-quickcheck.install)

------------------------------------------------------------------------------------------+
 community-staging-i686/0001-update-code-to-support-extensible-exceptions-no-long.patch   |   50 ++++++++++
 community-staging-i686/PKGBUILD                                                          |   43 ++++++++
 community-staging-i686/haskell-quickcheck.install                                        |   18 +++
 community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch |   50 ++++++++++
 community-staging-x86_64/PKGBUILD                                                        |   43 ++++++++
 community-staging-x86_64/haskell-quickcheck.install                                      |   18 +++
 6 files changed, 222 insertions(+)

Copied: haskell-quickcheck/repos/community-staging-i686/0001-update-code-to-support-extensible-exceptions-no-long.patch (from rev 83486, haskell-quickcheck/trunk/0001-update-code-to-support-extensible-exceptions-no-long.patch)
===================================================================
--- community-staging-i686/0001-update-code-to-support-extensible-exceptions-no-long.patch	                        (rev 0)
+++ community-staging-i686/0001-update-code-to-support-extensible-exceptions-no-long.patch	2013-02-02 08:49:28 UTC (rev 83487)
@@ -0,0 +1,50 @@
+From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Tue, 11 Sep 2012 03:59:50 -0700
+Subject: [PATCH] update code to support extensible exceptions no longer being
+ a part of ghc >= 7.6.1
+
+---
+ QuickCheck.cabal             | 6 +++++-
+ Test/QuickCheck/Exception.hs | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/QuickCheck.cabal b/QuickCheck.cabal
+index 1a9126e..5afd6fb 100644
+--- a/QuickCheck.cabal
++++ b/QuickCheck.cabal
+@@ -60,9 +60,13 @@ library
+       Build-depends: ghc
+ 
+   -- We want to use extensible-exceptions even if linking against base-3.
+-  if impl(ghc >= 6.9)
++  if impl(ghc >= 6.9) && impl(ghc < 7.6)
+     Build-depends: extensible-exceptions
+ 
++  -- GHC >= 7.6.1 no longer provides extensible exceptions
++  if impl(ghc >= 7.6)
++    cpp-options: -DNEW_EXCEPTIONS
++
+   -- Modules that are always built.
+   Exposed-Modules:
+     Test.QuickCheck,
+diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
+index f895351..d463195 100644
+--- a/Test/QuickCheck/Exception.hs
++++ b/Test/QuickCheck/Exception.hs
+@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
+ 
+ #if defined(OLD_EXCEPTIONS)
+ import Control.Exception(evaluate, try, Exception(..), throw)
++#elif defined(NEW_EXCEPTIONS)
++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
++#if defined(GHC_INTERRUPT)
++  , AsyncException(UserInterrupt)
++#endif
++  )
+ #else
+ import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
+ #if defined(GHC_INTERRUPT)
+-- 
+1.7.12
+

Copied: haskell-quickcheck/repos/community-staging-i686/PKGBUILD (from rev 83486, haskell-quickcheck/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2013-02-02 08:49:28 UTC (rev 83487)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=QuickCheck
+pkgname=haskell-quickcheck
+pkgver=2.5.1.1
+pkgrel=2
+pkgdesc='Automatic testing of Haskell programs'
+url='http://hackage.haskell.org/package/QuickCheck'
+license=('custom:BSD3')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.2-1' 'haskell-random=1.0.1.1-4' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
+install=${pkgname}.install
+sha256sums=('98492011a2e546eccf2b747a990e82a726d68af9822f9d2d620cd1232aacc2b9')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  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
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+  runhaskell Setup copy --destdir=${pkgdir}
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:

Copied: haskell-quickcheck/repos/community-staging-i686/haskell-quickcheck.install (from rev 83486, haskell-quickcheck/trunk/haskell-quickcheck.install)
===================================================================
--- community-staging-i686/haskell-quickcheck.install	                        (rev 0)
+++ community-staging-i686/haskell-quickcheck.install	2013-02-02 08:49:28 UTC (rev 83487)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-quickcheck
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}

Copied: haskell-quickcheck/repos/community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch (from rev 83486, haskell-quickcheck/trunk/0001-update-code-to-support-extensible-exceptions-no-long.patch)
===================================================================
--- community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch	                        (rev 0)
+++ community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch	2013-02-02 08:49:28 UTC (rev 83487)
@@ -0,0 +1,50 @@
+From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Tue, 11 Sep 2012 03:59:50 -0700
+Subject: [PATCH] update code to support extensible exceptions no longer being
+ a part of ghc >= 7.6.1
+
+---
+ QuickCheck.cabal             | 6 +++++-
+ Test/QuickCheck/Exception.hs | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/QuickCheck.cabal b/QuickCheck.cabal
+index 1a9126e..5afd6fb 100644
+--- a/QuickCheck.cabal
++++ b/QuickCheck.cabal
+@@ -60,9 +60,13 @@ library
+       Build-depends: ghc
+ 
+   -- We want to use extensible-exceptions even if linking against base-3.
+-  if impl(ghc >= 6.9)
++  if impl(ghc >= 6.9) && impl(ghc < 7.6)
+     Build-depends: extensible-exceptions
+ 
++  -- GHC >= 7.6.1 no longer provides extensible exceptions
++  if impl(ghc >= 7.6)
++    cpp-options: -DNEW_EXCEPTIONS
++
+   -- Modules that are always built.
+   Exposed-Modules:
+     Test.QuickCheck,
+diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
+index f895351..d463195 100644
+--- a/Test/QuickCheck/Exception.hs
++++ b/Test/QuickCheck/Exception.hs
+@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
+ 
+ #if defined(OLD_EXCEPTIONS)
+ import Control.Exception(evaluate, try, Exception(..), throw)
++#elif defined(NEW_EXCEPTIONS)
++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
++#if defined(GHC_INTERRUPT)
++  , AsyncException(UserInterrupt)
++#endif
++  )
+ #else
+ import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
+ #if defined(GHC_INTERRUPT)
+-- 
+1.7.12
+

Copied: haskell-quickcheck/repos/community-staging-x86_64/PKGBUILD (from rev 83486, haskell-quickcheck/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-02-02 08:49:28 UTC (rev 83487)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=QuickCheck
+pkgname=haskell-quickcheck
+pkgver=2.5.1.1
+pkgrel=2
+pkgdesc='Automatic testing of Haskell programs'
+url='http://hackage.haskell.org/package/QuickCheck'
+license=('custom:BSD3')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.2-1' 'haskell-random=1.0.1.1-4' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
+install=${pkgname}.install
+sha256sums=('98492011a2e546eccf2b747a990e82a726d68af9822f9d2d620cd1232aacc2b9')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  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
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+  runhaskell Setup copy --destdir=${pkgdir}
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:

Copied: haskell-quickcheck/repos/community-staging-x86_64/haskell-quickcheck.install (from rev 83486, haskell-quickcheck/trunk/haskell-quickcheck.install)
===================================================================
--- community-staging-x86_64/haskell-quickcheck.install	                        (rev 0)
+++ community-staging-x86_64/haskell-quickcheck.install	2013-02-02 08:49:28 UTC (rev 83487)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-quickcheck
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}




More information about the arch-commits mailing list