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

Felix Yan fyan at archlinux.org
Thu Apr 14 10:43:06 UTC 2016


    Date: Thursday, April 14, 2016 @ 12:43:05
  Author: fyan
Revision: 170964

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 170963, agda/trunk/PKGBUILD)
  agda/repos/community-staging-i686/haskell-agda.install
    (from rev 170963, agda/trunk/haskell-agda.install)
  agda/repos/community-staging-i686/unordered-containers-0.2.6.patch
    (from rev 170963, agda/trunk/unordered-containers-0.2.6.patch)
  agda/repos/community-staging-x86_64/
  agda/repos/community-staging-x86_64/PKGBUILD
    (from rev 170963, agda/trunk/PKGBUILD)
  agda/repos/community-staging-x86_64/haskell-agda.install
    (from rev 170963, agda/trunk/haskell-agda.install)
  agda/repos/community-staging-x86_64/unordered-containers-0.2.6.patch
    (from rev 170963, agda/trunk/unordered-containers-0.2.6.patch)

-----------------------------------------------------------+
 community-staging-i686/PKGBUILD                           |   70 ++++++++++++
 community-staging-i686/haskell-agda.install               |   18 +++
 community-staging-i686/unordered-containers-0.2.6.patch   |   40 ++++++
 community-staging-x86_64/PKGBUILD                         |   70 ++++++++++++
 community-staging-x86_64/haskell-agda.install             |   18 +++
 community-staging-x86_64/unordered-containers-0.2.6.patch |   40 ++++++
 6 files changed, 256 insertions(+)

Copied: agda/repos/community-staging-i686/PKGBUILD (from rev 170963, agda/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-04-14 10:43:05 UTC (rev 170964)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=Agda
+pkgname=agda
+pkgver=2.4.2.5
+pkgrel=6
+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=7.10.3" "alex" "happy" "haskell-boxes" "haskell-cpphs"
+             "haskell-data-hash" "haskell-edit-distance" "haskell-equivalence"
+             "haskell-geniplate-mirror" "haskell-hashable" "haskell-hashtables"
+             "haskell-src-exts" "haskell-mtl" "haskell-parallel" "haskell-quickcheck"
+             "haskell-strict" "haskell-text" "haskell-transformers-compat"
+             "haskell-unordered-containers" "haskell-zlib")
+optdepends=('agda-stdlib: for standard library')
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        unordered-containers-0.2.6.patch)
+sha256sums=('959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee'
+            '51e2d2160861ec6b8bd879f85cbbd00f9ed7a564b307870992370457e307f3ac')
+
+prepare() {
+    sed -e 's/transformers-compat >= 0.3.3.3 && < 0.5/transformers-compat >= 0.3.3.3 \&\& < 0.6/' \
+        -e 's/cpphs >= 1.19 && < 1.20/cpphs >= 1.19 \&\& < 1.21/' \
+        -i ${_hkgname}-${pkgver}/${_hkgname}.cabal
+
+    cd ${_hkgname}-${pkgver}
+    # https://github.com/agda/agda/issues/1779
+    patch -p1 -i ../unordered-containers-0.2.6.patch
+
+    cd ..
+    # 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
+    LC_CTYPE=en_US.UTF-8 runhaskell Setup build
+    LC_CTYPE=en_US.UTF-8 runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+
+    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
+}
+
+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
+
+    rm -r "$pkgdir"/usr/{lib,share/doc}
+    install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: agda/repos/community-staging-i686/haskell-agda.install (from rev 170963, agda/trunk/haskell-agda.install)
===================================================================
--- community-staging-i686/haskell-agda.install	                        (rev 0)
+++ community-staging-i686/haskell-agda.install	2016-04-14 10:43:05 UTC (rev 170964)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-agda
+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: agda/repos/community-staging-i686/unordered-containers-0.2.6.patch (from rev 170963, 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-04-14 10:43:05 UTC (rev 170964)
@@ -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 170963, agda/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-04-14 10:43:05 UTC (rev 170964)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=Agda
+pkgname=agda
+pkgver=2.4.2.5
+pkgrel=6
+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=7.10.3" "alex" "happy" "haskell-boxes" "haskell-cpphs"
+             "haskell-data-hash" "haskell-edit-distance" "haskell-equivalence"
+             "haskell-geniplate-mirror" "haskell-hashable" "haskell-hashtables"
+             "haskell-src-exts" "haskell-mtl" "haskell-parallel" "haskell-quickcheck"
+             "haskell-strict" "haskell-text" "haskell-transformers-compat"
+             "haskell-unordered-containers" "haskell-zlib")
+optdepends=('agda-stdlib: for standard library')
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        unordered-containers-0.2.6.patch)
+sha256sums=('959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee'
+            '51e2d2160861ec6b8bd879f85cbbd00f9ed7a564b307870992370457e307f3ac')
+
+prepare() {
+    sed -e 's/transformers-compat >= 0.3.3.3 && < 0.5/transformers-compat >= 0.3.3.3 \&\& < 0.6/' \
+        -e 's/cpphs >= 1.19 && < 1.20/cpphs >= 1.19 \&\& < 1.21/' \
+        -i ${_hkgname}-${pkgver}/${_hkgname}.cabal
+
+    cd ${_hkgname}-${pkgver}
+    # https://github.com/agda/agda/issues/1779
+    patch -p1 -i ../unordered-containers-0.2.6.patch
+
+    cd ..
+    # 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
+    LC_CTYPE=en_US.UTF-8 runhaskell Setup build
+    LC_CTYPE=en_US.UTF-8 runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+
+    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
+}
+
+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
+
+    rm -r "$pkgdir"/usr/{lib,share/doc}
+    install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: agda/repos/community-staging-x86_64/haskell-agda.install (from rev 170963, agda/trunk/haskell-agda.install)
===================================================================
--- community-staging-x86_64/haskell-agda.install	                        (rev 0)
+++ community-staging-x86_64/haskell-agda.install	2016-04-14 10:43:05 UTC (rev 170964)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-agda
+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: agda/repos/community-staging-x86_64/unordered-containers-0.2.6.patch (from rev 170963, 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-04-14 10:43:05 UTC (rev 170964)
@@ -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