Date: Thursday, January 21, 2016 @ 08:38:34 Author: fyan Revision: 158400
archrelease: copy trunk to community-i686, community-x86_64 Added: git-annex/repos/community-i686/PKGBUILD (from rev 158399, git-annex/trunk/PKGBUILD) git-annex/repos/community-i686/quickcheck-2.8.2.patch (from rev 158399, git-annex/trunk/quickcheck-2.8.2.patch) git-annex/repos/community-x86_64/PKGBUILD (from rev 158399, git-annex/trunk/PKGBUILD) git-annex/repos/community-x86_64/quickcheck-2.8.2.patch (from rev 158399, git-annex/trunk/quickcheck-2.8.2.patch) Deleted: git-annex/repos/community-i686/PKGBUILD git-annex/repos/community-x86_64/PKGBUILD -----------------------------------------+ /PKGBUILD | 130 ++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 57 ------------- community-i686/quickcheck-2.8.2.patch | 15 +++ community-x86_64/PKGBUILD | 57 ------------- community-x86_64/quickcheck-2.8.2.patch | 15 +++ 5 files changed, 160 insertions(+), 114 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-01-21 07:36:29 UTC (rev 158399) +++ community-i686/PKGBUILD 2016-01-21 07:38:34 UTC (rev 158400) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -pkgname=git-annex -pkgver=6.20160114 -pkgrel=7 -pkgdesc="Manage files with git, without checking their contents into git" -url="http://git-annex.branchable.com/" -license=("AGPL3") -arch=('i686' 'x86_64') -makedepends=("ghc=7.10.3" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder" - "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive" - "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" - "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite" - "haskell-data-default" "haskell-dav" "haskell-dbus" "haskell-dlist" "haskell-dns" - "haskell-edit-distance" "haskell-esqueleto" "haskell-exceptions" - "haskell-fdo-notify" "haskell-feed" "haskell-gnutls" "haskell-hinotify" - "haskell-hslogger" "haskell-http-client" "haskell-http-conduit" - "haskell-http-types" "haskell-ifelse" "haskell-json" "haskell-missingh" - "haskell-monad-control" "haskell-monad-logger" "haskell-mtl" "haskell-network" - "haskell-network-info" "haskell-network-multicast" "haskell-network-protocol-xmpp" - "haskell-network-uri" "haskell-old-locale" "haskell-optparse-applicative" - "haskell-path-pieces" "haskell-persistent" "haskell-persistent-sqlite" - "haskell-persistent-template" "haskell-quickcheck" "haskell-random" - "haskell-regex-tdfa" "haskell-resourcet" "haskell-safesemaphore" "haskell-sandi" - "haskell-securemem" "haskell-shakespeare" "haskell-stm" "haskell-tasty" - "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" - "haskell-text" "haskell-torrent" "haskell-unix-compat" "haskell-utf8-string" - "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp" "haskell-warp-tls" - "haskell-xml-types" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default" - "haskell-yesod-form" "haskell-yesod-static") -depends=('git' 'rsync' 'libxml2' 'gsasl') -options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha256sums=('671d165f9ea583b9a86060b60741c6aa54dbfde0673a2b278d82d761b7500181') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup configure -O --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \ - -fcryptonite -fnetwork-uri -f-ekg -fconcurrentoutput -ftorrentparser \ - -ftahoe -fquvi -ffeed -ftdfa -ftestsuite -f-androidsplice \ - -f-android -fproduction -fdns -fpairing -fwebapp-secure -fwebapp \ - -fassistant -fwebdav -fs3 -f-benchmark - runhaskell Setup build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup copy --destdir="${pkgdir}" - - install -Dm644 bash-completion.bash "${pkgdir}/usr/share/bash-completion/completions/git-annex" - - rm "$pkgdir/usr/share/doc/git-annex/COPYRIGHT" - rmdir "$pkgdir/usr/share/doc/git-annex" "$pkgdir/usr/share/doc" -} Copied: git-annex/repos/community-i686/PKGBUILD (from rev 158399, git-annex/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-01-21 07:38:34 UTC (rev 158400) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=git-annex +pkgver=6.20160114 +pkgrel=8 +pkgdesc="Manage files with git, without checking their contents into git" +url="http://git-annex.branchable.com/" +license=("AGPL3") +arch=('i686' 'x86_64') +makedepends=("ghc=7.10.3" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder" + "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive" + "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" + "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite" + "haskell-data-default" "haskell-dav" "haskell-dbus" "haskell-dlist" "haskell-dns" + "haskell-edit-distance" "haskell-esqueleto" "haskell-exceptions" + "haskell-fdo-notify" "haskell-feed" "haskell-gnutls" "haskell-hinotify" + "haskell-hslogger" "haskell-http-client" "haskell-http-conduit" + "haskell-http-types" "haskell-ifelse" "haskell-json" "haskell-missingh" + "haskell-monad-control" "haskell-monad-logger" "haskell-mtl" "haskell-network" + "haskell-network-info" "haskell-network-multicast" "haskell-network-protocol-xmpp" + "haskell-network-uri" "haskell-old-locale" "haskell-optparse-applicative" + "haskell-path-pieces" "haskell-persistent" "haskell-persistent-sqlite" + "haskell-persistent-template" "haskell-quickcheck" "haskell-random" + "haskell-regex-tdfa" "haskell-resourcet" "haskell-safesemaphore" "haskell-sandi" + "haskell-securemem" "haskell-shakespeare" "haskell-stm" "haskell-tasty" + "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" + "haskell-text" "haskell-torrent" "haskell-unix-compat" "haskell-utf8-string" + "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp" "haskell-warp-tls" + "haskell-xml-types" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default" + "haskell-yesod-form" "haskell-yesod-static") +depends=('git' 'rsync' 'libxml2' 'gsasl') +options=('staticlibs') +source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + quickcheck-2.8.2.patch) +sha256sums=('671d165f9ea583b9a86060b60741c6aa54dbfde0673a2b278d82d761b7500181' + 'f1814b955c282addd7adc6941444122e1d0ca28115a851e00c6702dfba72623e') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # https://github.com/fpco/stackage/issues/1168 + patch -p0 -i ../quickcheck-2.8.2.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup configure -O --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \ + -fcryptonite -fnetwork-uri -f-ekg -fconcurrentoutput -ftorrentparser \ + -ftahoe -fquvi -ffeed -ftdfa -ftestsuite -f-androidsplice \ + -f-android -fproduction -fdns -fpairing -fwebapp-secure -fwebapp \ + -fassistant -fwebdav -fs3 -f-benchmark + runhaskell Setup build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup copy --destdir="${pkgdir}" + + install -Dm644 bash-completion.bash "${pkgdir}/usr/share/bash-completion/completions/git-annex" + + rm "$pkgdir/usr/share/doc/git-annex/COPYRIGHT" + rmdir "$pkgdir/usr/share/doc/git-annex" "$pkgdir/usr/share/doc" +} Copied: git-annex/repos/community-i686/quickcheck-2.8.2.patch (from rev 158399, git-annex/trunk/quickcheck-2.8.2.patch) =================================================================== --- community-i686/quickcheck-2.8.2.patch (rev 0) +++ community-i686/quickcheck-2.8.2.patch 2016-01-21 07:38:34 UTC (rev 158400) @@ -0,0 +1,15 @@ +--- Utility/QuickCheck.hs.orig 2016-01-21 14:13:28.661285249 +0800 ++++ Utility/QuickCheck.hs 2016-01-21 14:13:34.534674457 +0800 +@@ -21,12 +21,6 @@ + import Control.Applicative + import Prelude + +-instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where +- arbitrary = M.fromList <$> arbitrary +- +-instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where +- arbitrary = S.fromList <$> arbitrary +- + {- Times before the epoch are excluded. -} + instance Arbitrary POSIXTime where + arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-01-21 07:36:29 UTC (rev 158399) +++ community-x86_64/PKGBUILD 2016-01-21 07:38:34 UTC (rev 158400) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -pkgname=git-annex -pkgver=6.20160114 -pkgrel=7 -pkgdesc="Manage files with git, without checking their contents into git" -url="http://git-annex.branchable.com/" -license=("AGPL3") -arch=('i686' 'x86_64') -makedepends=("ghc=7.10.3" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder" - "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive" - "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" - "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite" - "haskell-data-default" "haskell-dav" "haskell-dbus" "haskell-dlist" "haskell-dns" - "haskell-edit-distance" "haskell-esqueleto" "haskell-exceptions" - "haskell-fdo-notify" "haskell-feed" "haskell-gnutls" "haskell-hinotify" - "haskell-hslogger" "haskell-http-client" "haskell-http-conduit" - "haskell-http-types" "haskell-ifelse" "haskell-json" "haskell-missingh" - "haskell-monad-control" "haskell-monad-logger" "haskell-mtl" "haskell-network" - "haskell-network-info" "haskell-network-multicast" "haskell-network-protocol-xmpp" - "haskell-network-uri" "haskell-old-locale" "haskell-optparse-applicative" - "haskell-path-pieces" "haskell-persistent" "haskell-persistent-sqlite" - "haskell-persistent-template" "haskell-quickcheck" "haskell-random" - "haskell-regex-tdfa" "haskell-resourcet" "haskell-safesemaphore" "haskell-sandi" - "haskell-securemem" "haskell-shakespeare" "haskell-stm" "haskell-tasty" - "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" - "haskell-text" "haskell-torrent" "haskell-unix-compat" "haskell-utf8-string" - "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp" "haskell-warp-tls" - "haskell-xml-types" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default" - "haskell-yesod-form" "haskell-yesod-static") -depends=('git' 'rsync' 'libxml2' 'gsasl') -options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha256sums=('671d165f9ea583b9a86060b60741c6aa54dbfde0673a2b278d82d761b7500181') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup configure -O --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \ - -fcryptonite -fnetwork-uri -f-ekg -fconcurrentoutput -ftorrentparser \ - -ftahoe -fquvi -ffeed -ftdfa -ftestsuite -f-androidsplice \ - -f-android -fproduction -fdns -fpairing -fwebapp-secure -fwebapp \ - -fassistant -fwebdav -fs3 -f-benchmark - runhaskell Setup build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup copy --destdir="${pkgdir}" - - install -Dm644 bash-completion.bash "${pkgdir}/usr/share/bash-completion/completions/git-annex" - - rm "$pkgdir/usr/share/doc/git-annex/COPYRIGHT" - rmdir "$pkgdir/usr/share/doc/git-annex" "$pkgdir/usr/share/doc" -} Copied: git-annex/repos/community-x86_64/PKGBUILD (from rev 158399, git-annex/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-01-21 07:38:34 UTC (rev 158400) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=git-annex +pkgver=6.20160114 +pkgrel=8 +pkgdesc="Manage files with git, without checking their contents into git" +url="http://git-annex.branchable.com/" +license=("AGPL3") +arch=('i686' 'x86_64') +makedepends=("ghc=7.10.3" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder" + "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive" + "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" + "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite" + "haskell-data-default" "haskell-dav" "haskell-dbus" "haskell-dlist" "haskell-dns" + "haskell-edit-distance" "haskell-esqueleto" "haskell-exceptions" + "haskell-fdo-notify" "haskell-feed" "haskell-gnutls" "haskell-hinotify" + "haskell-hslogger" "haskell-http-client" "haskell-http-conduit" + "haskell-http-types" "haskell-ifelse" "haskell-json" "haskell-missingh" + "haskell-monad-control" "haskell-monad-logger" "haskell-mtl" "haskell-network" + "haskell-network-info" "haskell-network-multicast" "haskell-network-protocol-xmpp" + "haskell-network-uri" "haskell-old-locale" "haskell-optparse-applicative" + "haskell-path-pieces" "haskell-persistent" "haskell-persistent-sqlite" + "haskell-persistent-template" "haskell-quickcheck" "haskell-random" + "haskell-regex-tdfa" "haskell-resourcet" "haskell-safesemaphore" "haskell-sandi" + "haskell-securemem" "haskell-shakespeare" "haskell-stm" "haskell-tasty" + "haskell-tasty-hunit" "haskell-tasty-quickcheck" "haskell-tasty-rerun" + "haskell-text" "haskell-torrent" "haskell-unix-compat" "haskell-utf8-string" + "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp" "haskell-warp-tls" + "haskell-xml-types" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default" + "haskell-yesod-form" "haskell-yesod-static") +depends=('git' 'rsync' 'libxml2' 'gsasl') +options=('staticlibs') +source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + quickcheck-2.8.2.patch) +sha256sums=('671d165f9ea583b9a86060b60741c6aa54dbfde0673a2b278d82d761b7500181' + 'f1814b955c282addd7adc6941444122e1d0ca28115a851e00c6702dfba72623e') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # https://github.com/fpco/stackage/issues/1168 + patch -p0 -i ../quickcheck-2.8.2.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup configure -O --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \ + -fcryptonite -fnetwork-uri -f-ekg -fconcurrentoutput -ftorrentparser \ + -ftahoe -fquvi -ffeed -ftdfa -ftestsuite -f-androidsplice \ + -f-android -fproduction -fdns -fpairing -fwebapp-secure -fwebapp \ + -fassistant -fwebdav -fs3 -f-benchmark + runhaskell Setup build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup copy --destdir="${pkgdir}" + + install -Dm644 bash-completion.bash "${pkgdir}/usr/share/bash-completion/completions/git-annex" + + rm "$pkgdir/usr/share/doc/git-annex/COPYRIGHT" + rmdir "$pkgdir/usr/share/doc/git-annex" "$pkgdir/usr/share/doc" +} Copied: git-annex/repos/community-x86_64/quickcheck-2.8.2.patch (from rev 158399, git-annex/trunk/quickcheck-2.8.2.patch) =================================================================== --- community-x86_64/quickcheck-2.8.2.patch (rev 0) +++ community-x86_64/quickcheck-2.8.2.patch 2016-01-21 07:38:34 UTC (rev 158400) @@ -0,0 +1,15 @@ +--- Utility/QuickCheck.hs.orig 2016-01-21 14:13:28.661285249 +0800 ++++ Utility/QuickCheck.hs 2016-01-21 14:13:34.534674457 +0800 +@@ -21,12 +21,6 @@ + import Control.Applicative + import Prelude + +-instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where +- arbitrary = M.fromList <$> arbitrary +- +-instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where +- arbitrary = S.fromList <$> arbitrary +- + {- Times before the epoch are excluded. -} + instance Arbitrary POSIXTime where + arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral