[arch-commits] Commit in hasktags/trunk (PKGBUILD ghc8.patch)

[Felix Yan]

    Date: Monday, August 29, 2016 @ 16:19:45
  Author: felixonmars
Revision: 187947

upgpkg: hasktags 0.69.2-1

rebuild with conduit-combinators-1.0.5, hackage-security-0.5.2.2, hasktags-0.69.2, hoogle-5.0.3, http-client-0.5.2, http-conduit-2.2.0.1, stylish-haskell-0.6.4.0, yesod-core-1.4.24

Modified:
  hasktags/trunk/PKGBUILD
Deleted:
  hasktags/trunk/ghc8.patch

------------+
 PKGBUILD   |   20 ++++++++------------
 ghc8.patch |   48 ------------------------------------------------
 2 files changed, 8 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-29 16:05:17 UTC (rev 187946)
+++ PKGBUILD	2016-08-29 16:19:45 UTC (rev 187947)
@@ -3,24 +3,17 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=hasktags
-pkgver=0.69.1
-pkgrel=3
+pkgver=0.69.2
+pkgrel=1
 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')
+makedepends=("ghc=8.0.1" "haskell-hunit" "haskell-json" "haskell-utf8-string")
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('92c7742ff50527dd5ff45cf65c2009f364b06e17bdc4e41874a75bbf0c1f75fc')
 
-prepare() {
-    cd $pkgname-$pkgver
-    patch -p1 -i ../ghc8.patch
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     
@@ -35,4 +28,7 @@
     install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
     rm -r "$pkgdir"/usr/{lib,share/doc}
+
+    # :/
+    rm "$pkgdir"/usr/bin/test
 }

Deleted: ghc8.patch
===================================================================
--- ghc8.patch	2016-08-29 16:05:17 UTC (rev 187946)
+++ ghc8.patch	2016-08-29 16:19:45 UTC (rev 187947)
@@ -1,48 +0,0 @@
-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