[arch-commits] Commit in hasktags/repos (6 files)
Felix Yan
fyan at archlinux.org
Thu Jun 2 16:12:07 UTC 2016
Date: Thursday, June 2, 2016 @ 18:12:07
Author: fyan
Revision: 177741
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
hasktags/repos/community-staging-i686/
hasktags/repos/community-staging-i686/PKGBUILD
(from rev 177740, hasktags/trunk/PKGBUILD)
hasktags/repos/community-staging-i686/ghc8.patch
(from rev 177740, hasktags/trunk/ghc8.patch)
hasktags/repos/community-staging-x86_64/
hasktags/repos/community-staging-x86_64/PKGBUILD
(from rev 177740, hasktags/trunk/PKGBUILD)
hasktags/repos/community-staging-x86_64/ghc8.patch
(from rev 177740, hasktags/trunk/ghc8.patch)
-------------------------------------+
community-staging-i686/PKGBUILD | 38 ++++++++++++++++++++++++++
community-staging-i686/ghc8.patch | 48 ++++++++++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 38 ++++++++++++++++++++++++++
community-staging-x86_64/ghc8.patch | 48 ++++++++++++++++++++++++++++++++++
4 files changed, 172 insertions(+)
Copied: hasktags/repos/community-staging-i686/PKGBUILD (from rev 177740, hasktags/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-06-02 16:12:07 UTC (rev 177741)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=hasktags
+pkgver=0.69.1
+pkgrel=3
+pkgdesc="Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"
+url="http://github.com/MarcWeber/hasktags"
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+depends=('gmp' 'libffi')
+makedepends=("ghc=8.0.1" "haskell-json" "haskell-utf8-string")
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ ghc8.patch)
+sha256sums=('243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6'
+ 'c2213489d358fdaccc7724c8d6bad2c1ce066b421940da582127331a5d1a4ca7')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../ghc8.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --prefix=/usr \
+ -f-debug
+ runhaskell Setup build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+}
Copied: hasktags/repos/community-staging-i686/ghc8.patch (from rev 177740, hasktags/trunk/ghc8.patch)
===================================================================
--- community-staging-i686/ghc8.patch (rev 0)
+++ community-staging-i686/ghc8.patch 2016-06-02 16:12:07 UTC (rev 177741)
@@ -0,0 +1,48 @@
+From 94c9f1e11940384eedf8c4749ffa4045539f9290 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit at google.com>
+Date: Sat, 28 May 2016 21:49:55 +0100
+Subject: [PATCH] src/Hasktags.hs: tweak for ghc-8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+directory-1.2.6.0 (comes with ghc-8.0.1)
+now includes 'isSymbolicLink' helper.
+
+Guard against symbol collisison:
+
+ src/Hasktags.hs:495:5: error:
+ Ambiguous occurrence ‘isSymbolicLink’
+ It could refer to either ‘System.Directory.isSymbolicLink’,
+ imported from ‘System.Directory’ at src/Hasktags.hs:31:1-23
+ or ‘System.Posix.Files.isSymbolicLink’,
+ imported from ‘System.Posix.Files’ at src/Hasktags.hs:38:1-25
+ (and originally defined in ‘unix-2.7.2.0:System.Posix.Files.Common’)
+
+Signed-off-by: Sergei Trofimovich <siarheit at google.com>
+---
+ src/Hasktags.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Hasktags.hs b/src/Hasktags.hs
+index e45bd05..f5abaaf 100644
+--- a/src/Hasktags.hs
++++ b/src/Hasktags.hs
+@@ -35,7 +35,7 @@ import Control.Monad
+ import DebugShow
+
+ #ifdef VERSION_unix
+-import System.Posix.Files
++import System.Posix.Files as SPF
+ #endif
+ import System.FilePath ((</>))
+
+@@ -492,7 +492,7 @@ dirToFiles followSyms suffixes p = do
+ isD <- doesDirectoryExist p
+ isSymLink <-
+ #ifdef VERSION_unix
+- isSymbolicLink `fmap` getSymbolicLinkStatus p
++ SPF.isSymbolicLink `fmap` getSymbolicLinkStatus p
+ #else
+ return False
+ #endif
Copied: hasktags/repos/community-staging-x86_64/PKGBUILD (from rev 177740, hasktags/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-06-02 16:12:07 UTC (rev 177741)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=hasktags
+pkgver=0.69.1
+pkgrel=3
+pkgdesc="Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"
+url="http://github.com/MarcWeber/hasktags"
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+depends=('gmp' 'libffi')
+makedepends=("ghc=8.0.1" "haskell-json" "haskell-utf8-string")
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ ghc8.patch)
+sha256sums=('243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6'
+ 'c2213489d358fdaccc7724c8d6bad2c1ce066b421940da582127331a5d1a4ca7')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../ghc8.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --prefix=/usr \
+ -f-debug
+ runhaskell Setup build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+}
Copied: hasktags/repos/community-staging-x86_64/ghc8.patch (from rev 177740, hasktags/trunk/ghc8.patch)
===================================================================
--- community-staging-x86_64/ghc8.patch (rev 0)
+++ community-staging-x86_64/ghc8.patch 2016-06-02 16:12:07 UTC (rev 177741)
@@ -0,0 +1,48 @@
+From 94c9f1e11940384eedf8c4749ffa4045539f9290 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit at google.com>
+Date: Sat, 28 May 2016 21:49:55 +0100
+Subject: [PATCH] src/Hasktags.hs: tweak for ghc-8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+directory-1.2.6.0 (comes with ghc-8.0.1)
+now includes 'isSymbolicLink' helper.
+
+Guard against symbol collisison:
+
+ src/Hasktags.hs:495:5: error:
+ Ambiguous occurrence ‘isSymbolicLink’
+ It could refer to either ‘System.Directory.isSymbolicLink’,
+ imported from ‘System.Directory’ at src/Hasktags.hs:31:1-23
+ or ‘System.Posix.Files.isSymbolicLink’,
+ imported from ‘System.Posix.Files’ at src/Hasktags.hs:38:1-25
+ (and originally defined in ‘unix-2.7.2.0:System.Posix.Files.Common’)
+
+Signed-off-by: Sergei Trofimovich <siarheit at google.com>
+---
+ src/Hasktags.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Hasktags.hs b/src/Hasktags.hs
+index e45bd05..f5abaaf 100644
+--- a/src/Hasktags.hs
++++ b/src/Hasktags.hs
+@@ -35,7 +35,7 @@ import Control.Monad
+ import DebugShow
+
+ #ifdef VERSION_unix
+-import System.Posix.Files
++import System.Posix.Files as SPF
+ #endif
+ import System.FilePath ((</>))
+
+@@ -492,7 +492,7 @@ dirToFiles followSyms suffixes p = do
+ isD <- doesDirectoryExist p
+ isSymLink <-
+ #ifdef VERSION_unix
+- isSymbolicLink `fmap` getSymbolicLinkStatus p
++ SPF.isSymbolicLink `fmap` getSymbolicLinkStatus p
+ #else
+ return False
+ #endif
More information about the arch-commits
mailing list