[arch-commits] Commit in agda/repos (6 files)
Felix Yan
fyan at archlinux.org
Wed May 25 16:47:55 UTC 2016
Date: Wednesday, May 25, 2016 @ 18:47:55
Author: fyan
Revision: 177037
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
agda/repos/community-staging-i686/
agda/repos/community-staging-i686/PKGBUILD
(from rev 177036, agda/trunk/PKGBUILD)
agda/repos/community-staging-i686/unordered-containers-0.2.6.patch
(from rev 177036, agda/trunk/unordered-containers-0.2.6.patch)
agda/repos/community-staging-x86_64/
agda/repos/community-staging-x86_64/PKGBUILD
(from rev 177036, agda/trunk/PKGBUILD)
agda/repos/community-staging-x86_64/unordered-containers-0.2.6.patch
(from rev 177036, agda/trunk/unordered-containers-0.2.6.patch)
-----------------------------------------------------------+
community-staging-i686/PKGBUILD | 61 ++++++++++++
community-staging-i686/unordered-containers-0.2.6.patch | 40 +++++++
community-staging-x86_64/PKGBUILD | 61 ++++++++++++
community-staging-x86_64/unordered-containers-0.2.6.patch | 40 +++++++
4 files changed, 202 insertions(+)
Copied: agda/repos/community-staging-i686/PKGBUILD (from rev 177036, agda/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-05-25 16:47:55 UTC (rev 177037)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=Agda
+pkgname=agda
+pkgver=2.5.1
+pkgrel=5
+pkgdesc="A dependently typed functional programming language and proof assistant"
+url="http://wiki.portal.chalmers.se/agda/"
+license=("custom")
+arch=('i686' 'x86_64')
+depends=('gmp' 'libffi' 'zlib')
+makedepends=("ghc=8.0.1" "alex" "happy" "haskell-boxes" "haskell-cpphs"
+ "haskell-data-hash" "haskell-edisonapi" "haskell-edisoncore"
+ "haskell-edit-distance" "haskell-equivalence" "haskell-filemanip"
+ "haskell-geniplate-mirror" "haskell-hashable" "haskell-hashtables"
+ "haskell-monadplus" "haskell-mtl" "haskell-parallel"
+ "haskell-quickcheck" "haskell-src-exts" "haskell-strict"
+ "haskell-text" "haskell-transformers-compat"
+ "haskell-unordered-containers" "haskell-zlib")
+optdepends=('agda-stdlib: for standard library')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha256sums=('ee4658eafb514460d598322fa98528d1af6e25e5aa51843bb473c0d8a325c0c8')
+
+prepare() {
+ # TODO: Find a better way!
+ # Build it twice to compile the agdai file.
+ cp -a ${_hkgname}-${pkgver}{,-tmp}
+}
+
+build() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -fcpphs -f-uhc
+ LC_CTYPE=en_US.UTF-8 runhaskell Setup build
+
+ cd "${srcdir}/${_hkgname}-${pkgver}-tmp"
+ runhaskell Setup configure --prefix="$PWD/target" --datasubdir="$pkgname"
+ LC_CTYPE=en_US.UTF-8 runhaskell Setup build
+ runhaskell Setup copy
+
+ target/bin/agda target/share/agda/lib/prim/Agda/Primitive.agda
+ for _file in target/share/agda/lib/prim/Agda/Builtin/*.agda; do
+ target/bin/agda "$_file"
+ done
+}
+
+package() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+
+ install -m644 "${srcdir}/${_hkgname}-${pkgver}-tmp"/target/share/agda/lib/prim/Agda/Primitive.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Primitive.agdai
+ install -m644 "${srcdir}/${_hkgname}-${pkgver}-tmp"/target/share/agda/lib/prim/Agda/Builtin/*.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Builtin/
+
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: agda/repos/community-staging-i686/unordered-containers-0.2.6.patch (from rev 177036, agda/trunk/unordered-containers-0.2.6.patch)
===================================================================
--- community-staging-i686/unordered-containers-0.2.6.patch (rev 0)
+++ community-staging-i686/unordered-containers-0.2.6.patch 2016-05-25 16:47:55 UTC (rev 177037)
@@ -0,0 +1,40 @@
+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
Copied: agda/repos/community-staging-x86_64/PKGBUILD (from rev 177036, agda/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-05-25 16:47:55 UTC (rev 177037)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=Agda
+pkgname=agda
+pkgver=2.5.1
+pkgrel=5
+pkgdesc="A dependently typed functional programming language and proof assistant"
+url="http://wiki.portal.chalmers.se/agda/"
+license=("custom")
+arch=('i686' 'x86_64')
+depends=('gmp' 'libffi' 'zlib')
+makedepends=("ghc=8.0.1" "alex" "happy" "haskell-boxes" "haskell-cpphs"
+ "haskell-data-hash" "haskell-edisonapi" "haskell-edisoncore"
+ "haskell-edit-distance" "haskell-equivalence" "haskell-filemanip"
+ "haskell-geniplate-mirror" "haskell-hashable" "haskell-hashtables"
+ "haskell-monadplus" "haskell-mtl" "haskell-parallel"
+ "haskell-quickcheck" "haskell-src-exts" "haskell-strict"
+ "haskell-text" "haskell-transformers-compat"
+ "haskell-unordered-containers" "haskell-zlib")
+optdepends=('agda-stdlib: for standard library')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha256sums=('ee4658eafb514460d598322fa98528d1af6e25e5aa51843bb473c0d8a325c0c8')
+
+prepare() {
+ # TODO: Find a better way!
+ # Build it twice to compile the agdai file.
+ cp -a ${_hkgname}-${pkgver}{,-tmp}
+}
+
+build() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -fcpphs -f-uhc
+ LC_CTYPE=en_US.UTF-8 runhaskell Setup build
+
+ cd "${srcdir}/${_hkgname}-${pkgver}-tmp"
+ runhaskell Setup configure --prefix="$PWD/target" --datasubdir="$pkgname"
+ LC_CTYPE=en_US.UTF-8 runhaskell Setup build
+ runhaskell Setup copy
+
+ target/bin/agda target/share/agda/lib/prim/Agda/Primitive.agda
+ for _file in target/share/agda/lib/prim/Agda/Builtin/*.agda; do
+ target/bin/agda "$_file"
+ done
+}
+
+package() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+
+ install -m644 "${srcdir}/${_hkgname}-${pkgver}-tmp"/target/share/agda/lib/prim/Agda/Primitive.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Primitive.agdai
+ install -m644 "${srcdir}/${_hkgname}-${pkgver}-tmp"/target/share/agda/lib/prim/Agda/Builtin/*.agdai "$pkgdir"/usr/share/agda/lib/prim/Agda/Builtin/
+
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: agda/repos/community-staging-x86_64/unordered-containers-0.2.6.patch (from rev 177036, agda/trunk/unordered-containers-0.2.6.patch)
===================================================================
--- community-staging-x86_64/unordered-containers-0.2.6.patch (rev 0)
+++ community-staging-x86_64/unordered-containers-0.2.6.patch 2016-05-25 16:47:55 UTC (rev 177037)
@@ -0,0 +1,40 @@
+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
More information about the arch-commits
mailing list