Date: Thursday, December 28, 2017 @ 09:32:47 Author: felixonmars Revision: 276390
archrelease: copy trunk to community-x86_64 Added: agda/repos/community-x86_64/PKGBUILD (from rev 276389, agda/trunk/PKGBUILD) Deleted: agda/repos/community-x86_64/PKGBUILD agda/repos/community-x86_64/unordered-containers-0.2.6.patch ----------------------------------+ PKGBUILD | 124 +++++++++++++++++-------------------- unordered-containers-0.2.6.patch | 40 ----------- 2 files changed, 58 insertions(+), 106 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-28 09:32:23 UTC (rev 276389) +++ PKGBUILD 2017-12-28 09:32:47 UTC (rev 276390) @@ -1,66 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -_hkgname=Agda -pkgname=agda -pkgver=2.5.3 -pkgrel=5 -pkgdesc="A dependently typed functional programming language and proof assistant" -url="http://wiki.portal.chalmers.se/agda/" -license=("custom") -arch=('x86_64') -depends=('ghc-libs' "alex" "happy" "haskell-async" "haskell-blaze-html" "haskell-boxes" - "haskell-cpphs" "haskell-data-hash" "haskell-edisonapi" "haskell-edisoncore" - "haskell-edit-distance" "haskell-equivalence" "haskell-geniplate-mirror" "haskell-gitrev" - "haskell-hashable" "haskell-hashtables" "haskell-ieee754" "haskell-monadplus" "haskell-mtl" - "haskell-murmur-hash" "haskell-parallel" "haskell-regex-tdfa" "haskell-stm" - "haskell-strict" "haskell-text" "haskell-unordered-containers" "haskell-uri-encode" - "haskell-zlib") -optdepends=('agda-stdlib: for standard library') -makedepends=('ghc') -source=("https://github.com/agda/agda/archive/v$pkgver.tar.gz") -sha512sums=('89cf67d095cb3694a8f266445092620746a04aa866ab3af277f73b304d8c0f54dc7880a6093336f0c4893ee3861fc853bcf7ca48c430f2c8c83b2c24bf6cb97a') - -prepare() { - # TODO: Find a better way! - # Build it twice to compile the agdai file. - cp -a ${pkgname}-${pkgver}{,-tmp} -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ - --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \ - --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ - -fcpphs -f-debug -f-enable-cluster-counting - LC_CTYPE=en_US.UTF-8 runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh - - cd "${srcdir}/${pkgname}-${pkgver}-tmp" - runhaskell Setup configure --prefix="$PWD/target" --enable-executable-dynamic --disable-library-vanilla --datasubdir="$pkgname" - LC_CTYPE=en_US.UTF-8 runhaskell Setup build - runhaskell Setup copy - - LD_PRELOAD=(dist/build/libHSAgda-*-ghc*.so) dist/build/agda/agda target/share/agda/lib/prim/Agda/Primitive.agda - for _file in target/share/agda/lib/prim/Agda/Builtin/*.agda; do - LD_PRELOAD=(dist/build/libHSAgda-*-ghc*.so) dist/build/agda/agda "$_file" - done -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" - install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" - runhaskell Setup copy --destdir="${pkgdir}" - install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE" - - install -m644 "${srcdir}/${pkgname}-${pkgver}-tmp"/target/share/agda/lib/prim/Agda/Primitive.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Primitive.agdai - install -m644 "${srcdir}/${pkgname}-${pkgver}-tmp"/target/share/agda/lib/prim/Agda/Builtin/*.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Builtin/ -} Copied: agda/repos/community-x86_64/PKGBUILD (from rev 276389, agda/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-28 09:32:47 UTC (rev 276390) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +_hkgname=Agda +pkgname=agda +pkgver=2.5.3 +pkgrel=6 +pkgdesc="A dependently typed functional programming language and proof assistant" +url="http://wiki.portal.chalmers.se/agda/" +license=("custom") +arch=('x86_64') +depends=('ghc-libs' "alex" "happy" "haskell-async" "haskell-blaze-html" "haskell-boxes" + "haskell-cpphs" "haskell-data-hash" "haskell-edisonapi" "haskell-edisoncore" + "haskell-edit-distance" "haskell-equivalence" "haskell-geniplate-mirror" "haskell-gitrev" + "haskell-hashable" "haskell-hashtables" "haskell-ieee754" "haskell-monadplus" "haskell-mtl" + "haskell-murmur-hash" "haskell-parallel" "haskell-regex-tdfa" "haskell-stm" + "haskell-strict" "haskell-text" "haskell-unordered-containers" "haskell-uri-encode" + "haskell-zlib") +optdepends=('agda-stdlib: for standard library') +makedepends=('ghc') +source=("https://github.com/agda/agda/archive/v$pkgver.tar.gz") +sha512sums=('89cf67d095cb3694a8f266445092620746a04aa866ab3af277f73b304d8c0f54dc7880a6093336f0c4893ee3861fc853bcf7ca48c430f2c8c83b2c24bf6cb97a') + +prepare() { + mkdir -p lib-target + cp -a $pkgname-$pkgver/src/data/lib lib-target/lib + sed -e "s|rawSystem agda \\[|rawSystem \"env\" [\"Agda_datadir=$PWD/lib-target\", \"LD_LIBRARY_PATH=$PWD/$pkgname-$pkgver/dist/build\", agda,|" \ + -e "s|(ms, datadir dirs|(ms, \"$PWD/lib-target\"|" \ + -i $pkgname-$pkgver/Setup.hs +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ + --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \ + --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ + -fcpphs -f-debug -f-enable-cluster-counting + LC_CTYPE=en_US.UTF-8 runhaskell Setup build + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" + install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" + runhaskell Setup copy --destdir="${pkgdir}" + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE" + + install -m644 "$srcdir"/lib-target/lib/prim/Agda/Primitive.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Primitive.agdai + install -m644 "$srcdir"/lib-target/lib/prim/Agda/Builtin/*.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Builtin/ +} Deleted: unordered-containers-0.2.6.patch =================================================================== --- unordered-containers-0.2.6.patch 2017-12-28 09:32:23 UTC (rev 276389) +++ unordered-containers-0.2.6.patch 2017-12-28 09:32:47 UTC (rev 276390) @@ -1,40 +0,0 @@ -diff --git a/src/full/Agda/Utils/HashMap.hs b/src/full/Agda/Utils/HashMap.hs -index 5e1da8b..bd14fac 100644 ---- a/src/full/Agda/Utils/HashMap.hs -+++ b/src/full/Agda/Utils/HashMap.hs -@@ -1,29 +1,14 @@ - module Agda.Utils.HashMap - ( module HashMap -- , mapMaybe -- , alter - ) where - --import Data.Hashable - import Data.HashMap.Strict as HashMap --import qualified Data.Maybe as Maybe - ---- | Like 'Data.Map.Strict.mapMaybe'. -+-- ASR (20 January 2016) Issue 1779: I removed the @mapMaybe@ and -+-- @alter@ functions because them currently aren't used and -+-- them were added in unordered-containers 0.2.6.0. - ---- This code has not been benchmarked. Other implementations may be ---- more efficient. -+-- mapMaybe :: (a -> Maybe b) -> HashMap k a -> HashMap k b - --mapMaybe :: (a -> Maybe b) -> HashMap k a -> HashMap k b --mapMaybe f = fmap Maybe.fromJust . HashMap.filter Maybe.isJust . fmap f -- ---- | Like 'Data.Map.Strict.alter'. -- --alter :: (Eq k, Hashable k) => -- (Maybe a -> Maybe a) -> k -> HashMap k a -> HashMap k a --alter f k m = case HashMap.lookup k m of -- Nothing -> case f Nothing of -- Nothing -> m -- Just v -> HashMap.insert k v m -- Just v -> case f (Just v) of -- Nothing -> HashMap.delete k m -- Just v -> HashMap.insert k v m -+-- alter :: (Eq k, Hashable k) => -+-- (Maybe a -> Maybe a) -> k -> HashMap k a -> HashMap k a