[arch-commits] Commit in ghc-mod/repos (6 files)

Felix Yan felixonmars at archlinux.org
Sat Jan 7 06:45:22 UTC 2017


    Date: Saturday, January 7, 2017 @ 06:45:21
  Author: felixonmars
Revision: 205945

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  ghc-mod/repos/community-staging-i686/
  ghc-mod/repos/community-staging-i686/PKGBUILD
    (from rev 205944, ghc-mod/trunk/PKGBUILD)
  ghc-mod/repos/community-staging-i686/hse-1.18.patch
    (from rev 205944, ghc-mod/trunk/hse-1.18.patch)
  ghc-mod/repos/community-staging-x86_64/
  ghc-mod/repos/community-staging-x86_64/PKGBUILD
    (from rev 205944, ghc-mod/trunk/PKGBUILD)
  ghc-mod/repos/community-staging-x86_64/hse-1.18.patch
    (from rev 205944, ghc-mod/trunk/hse-1.18.patch)

-----------------------------------------+
 community-staging-i686/PKGBUILD         |   69 +++++++++++++++++++++++++++
 community-staging-i686/hse-1.18.patch   |   75 ++++++++++++++++++++++++++++++
 community-staging-x86_64/PKGBUILD       |   69 +++++++++++++++++++++++++++
 community-staging-x86_64/hse-1.18.patch |   75 ++++++++++++++++++++++++++++++
 4 files changed, 288 insertions(+)

Copied: ghc-mod/repos/community-staging-i686/PKGBUILD (from rev 205944, ghc-mod/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2017-01-07 06:45:21 UTC (rev 205945)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=ghc-mod
+pkgname=(ghc-mod haskell-ghc-mod)
+pkgver=5.6.0.0
+pkgrel=14
+pkgdesc="Happy Haskell Programming"
+url="http://www.mew.org/~kazu/proj/ghc-mod/"
+license=("AGPL3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "git" "haskell-cabal-helper" "haskell-djinn-ghc" "haskell-extra"
+             "haskell-fclabels" "haskell-ghc-paths" "haskell-ghc-syb-utils" "haskell-src-exts"
+             "haskell-hlint" "haskell-monad-control" "haskell-monad-journal" "haskell-mtl"
+             "haskell-old-time" "haskell-optparse-applicative0.12" "haskell-pipes" "haskell-safe"
+             "haskell-split" "haskell-syb" "haskell-temporary" "haskell-text"
+             "haskell-transformers-base")
+source=("git+https://github.com/DanielG/ghc-mod.git#tag=v$pkgver"
+        hse-1.18.patch)
+sha256sums=('SKIP'
+            'd7c598d5d1a2e8bdb35460f8588376eb45d20fce660708f28e685e6aced481ab')
+
+prepare() {
+    cd "$srcdir/$pkgbase"
+    patch -p1 -i ../hse-1.18.patch
+
+    sed -i 's/pipes             >= 4.1 && <4.3/pipes             >= 4.1 \&\& <4.4/' ghc-mod.cabal
+}
+
+build() {
+    cd "${srcdir}/${pkgbase}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    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_ghc-mod() {
+    depends=('cabal-helper' 'ghc')
+
+    cd "${srcdir}/${pkgbase}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/{lib,share/doc}
+
+    install -D -m644 "COPYING.BSD3" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING.BSD3"
+}
+
+package_haskell-ghc-mod() {
+    pkgdesc="Happy Haskell Programming (docs and libraries)"
+    depends=("${makedepends[@]}" 'ghc-mod')
+
+    cd "${srcdir}/${pkgbase}"
+
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s "/usr/share/doc/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -f "${pkgdir}/usr/share/doc/${pkgbase}/COPYING.BSD3"
+    rm -r "$pkgdir"/usr/{bin,share/$pkgbase}
+}

Copied: ghc-mod/repos/community-staging-i686/hse-1.18.patch (from rev 205944, ghc-mod/trunk/hse-1.18.patch)
===================================================================
--- community-staging-i686/hse-1.18.patch	                        (rev 0)
+++ community-staging-i686/hse-1.18.patch	2017-01-07 06:45:21 UTC (rev 205945)
@@ -0,0 +1,75 @@
+From afd535df487914152de3356be9a53aaa6311ecc7 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus at iki.fi>
+Date: Tue, 2 Aug 2016 06:35:56 +0300
+Subject: [PATCH] Support hse-1.18, allow newer extra and pipes too
+
+---
+ Language/Haskell/GhcMod/FillSig.hs  | 4 ++--
+ Language/Haskell/GhcMod/SrcUtils.hs | 4 ++--
+ ghc-mod.cabal                       | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Language/Haskell/GhcMod/FillSig.hs b/Language/Haskell/GhcMod/FillSig.hs
+index 3f7ae4c..3e03ec0 100644
+--- a/Language/Haskell/GhcMod/FillSig.hs
++++ b/Language/Haskell/GhcMod/FillSig.hs
+@@ -27,7 +27,7 @@ import qualified HsBinds as Ty
+ import qualified Class as Ty
+ import qualified Var as Ty
+ import qualified HsPat as Ty
+-import qualified Language.Haskell.Exts.Annotated as HE
++import qualified Language.Haskell.Exts as HE
+ import Djinn.GHC
+ 
+ import qualified Language.Haskell.GhcMod.Gap as Gap
+@@ -191,7 +191,7 @@ getSignatureFromHE file lineNo colNo = do
+                  HE.TypeSig (HE.SrcSpanInfo s _) names ty ->
+                      return $ HESignature s names ty
+ 
+-                 HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ ->
++                 HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ _ ->
+                    let (name, tys) = dHeadTyVars declHead in
+                    return $ HEFamSignature s Open name (map cleanTyVarBind tys)
+ 
+diff --git a/Language/Haskell/GhcMod/SrcUtils.hs b/Language/Haskell/GhcMod/SrcUtils.hs
+index fb36289..5829fde 100644
+--- a/Language/Haskell/GhcMod/SrcUtils.hs
++++ b/Language/Haskell/GhcMod/SrcUtils.hs
+@@ -16,7 +16,7 @@ import qualified Var as G
+ import qualified Type as G
+ import GHC.SYB.Utils
+ import GhcMonad
+-import qualified Language.Haskell.Exts.Annotated as HE
++import qualified Language.Haskell.Exts as HE
+ import Language.Haskell.GhcMod.Doc
+ import Language.Haskell.GhcMod.Gap
+ import qualified Language.Haskell.GhcMod.Gap as Gap
+@@ -175,7 +175,7 @@ fourIntsHE loc = ( HE.srcSpanStartLine loc, HE.srcSpanStartColumn loc
+ typeSigInRangeHE :: Int -> Int -> HE.Decl HE.SrcSpanInfo -> Bool
+ typeSigInRangeHE lineNo colNo (HE.TypeSig (HE.SrcSpanInfo s _) _ _) =
+   HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+-typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _) =
++typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _ _) =
+   HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+ typeSigInRangeHE lineNo colNo (HE.DataFamDecl (HE.SrcSpanInfo s _) _ _ _) =
+   HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+diff --git a/ghc-mod.cabal b/ghc-mod.cabal
+index d882262..0b210e6 100644
+--- a/ghc-mod.cabal
++++ b/ghc-mod.cabal
+@@ -196,12 +196,12 @@ Library
+                       , mtl               < 2.3 && >= 2.0
+                       , monad-control     < 1.1 && >= 1
+                       , split             < 0.3
+-                      , haskell-src-exts  < 1.18
++                      , haskell-src-exts  == 1.18.*
+                       , text              < 1.3
+                       , djinn-ghc         < 0.1 && >= 0.0.2.2
+                       , fclabels          == 2.0.*
+-                      , extra             == 1.4.*
+-                      , pipes             == 4.1.*
++                      , extra             >= 1.4 && <1.6
++                      , pipes             >= 4.1 && <4.3
+                       , safe              < 0.4 && >= 0.3.9
+                       , optparse-applicative >=0.11.0 && <0.13.0
+                       , template-haskell

Copied: ghc-mod/repos/community-staging-x86_64/PKGBUILD (from rev 205944, ghc-mod/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2017-01-07 06:45:21 UTC (rev 205945)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=ghc-mod
+pkgname=(ghc-mod haskell-ghc-mod)
+pkgver=5.6.0.0
+pkgrel=14
+pkgdesc="Happy Haskell Programming"
+url="http://www.mew.org/~kazu/proj/ghc-mod/"
+license=("AGPL3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "git" "haskell-cabal-helper" "haskell-djinn-ghc" "haskell-extra"
+             "haskell-fclabels" "haskell-ghc-paths" "haskell-ghc-syb-utils" "haskell-src-exts"
+             "haskell-hlint" "haskell-monad-control" "haskell-monad-journal" "haskell-mtl"
+             "haskell-old-time" "haskell-optparse-applicative0.12" "haskell-pipes" "haskell-safe"
+             "haskell-split" "haskell-syb" "haskell-temporary" "haskell-text"
+             "haskell-transformers-base")
+source=("git+https://github.com/DanielG/ghc-mod.git#tag=v$pkgver"
+        hse-1.18.patch)
+sha256sums=('SKIP'
+            'd7c598d5d1a2e8bdb35460f8588376eb45d20fce660708f28e685e6aced481ab')
+
+prepare() {
+    cd "$srcdir/$pkgbase"
+    patch -p1 -i ../hse-1.18.patch
+
+    sed -i 's/pipes             >= 4.1 && <4.3/pipes             >= 4.1 \&\& <4.4/' ghc-mod.cabal
+}
+
+build() {
+    cd "${srcdir}/${pkgbase}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    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_ghc-mod() {
+    depends=('cabal-helper' 'ghc')
+
+    cd "${srcdir}/${pkgbase}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/{lib,share/doc}
+
+    install -D -m644 "COPYING.BSD3" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING.BSD3"
+}
+
+package_haskell-ghc-mod() {
+    pkgdesc="Happy Haskell Programming (docs and libraries)"
+    depends=("${makedepends[@]}" 'ghc-mod')
+
+    cd "${srcdir}/${pkgbase}"
+
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s "/usr/share/doc/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -f "${pkgdir}/usr/share/doc/${pkgbase}/COPYING.BSD3"
+    rm -r "$pkgdir"/usr/{bin,share/$pkgbase}
+}

Copied: ghc-mod/repos/community-staging-x86_64/hse-1.18.patch (from rev 205944, ghc-mod/trunk/hse-1.18.patch)
===================================================================
--- community-staging-x86_64/hse-1.18.patch	                        (rev 0)
+++ community-staging-x86_64/hse-1.18.patch	2017-01-07 06:45:21 UTC (rev 205945)
@@ -0,0 +1,75 @@
+From afd535df487914152de3356be9a53aaa6311ecc7 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus at iki.fi>
+Date: Tue, 2 Aug 2016 06:35:56 +0300
+Subject: [PATCH] Support hse-1.18, allow newer extra and pipes too
+
+---
+ Language/Haskell/GhcMod/FillSig.hs  | 4 ++--
+ Language/Haskell/GhcMod/SrcUtils.hs | 4 ++--
+ ghc-mod.cabal                       | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Language/Haskell/GhcMod/FillSig.hs b/Language/Haskell/GhcMod/FillSig.hs
+index 3f7ae4c..3e03ec0 100644
+--- a/Language/Haskell/GhcMod/FillSig.hs
++++ b/Language/Haskell/GhcMod/FillSig.hs
+@@ -27,7 +27,7 @@ import qualified HsBinds as Ty
+ import qualified Class as Ty
+ import qualified Var as Ty
+ import qualified HsPat as Ty
+-import qualified Language.Haskell.Exts.Annotated as HE
++import qualified Language.Haskell.Exts as HE
+ import Djinn.GHC
+ 
+ import qualified Language.Haskell.GhcMod.Gap as Gap
+@@ -191,7 +191,7 @@ getSignatureFromHE file lineNo colNo = do
+                  HE.TypeSig (HE.SrcSpanInfo s _) names ty ->
+                      return $ HESignature s names ty
+ 
+-                 HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ ->
++                 HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ _ ->
+                    let (name, tys) = dHeadTyVars declHead in
+                    return $ HEFamSignature s Open name (map cleanTyVarBind tys)
+ 
+diff --git a/Language/Haskell/GhcMod/SrcUtils.hs b/Language/Haskell/GhcMod/SrcUtils.hs
+index fb36289..5829fde 100644
+--- a/Language/Haskell/GhcMod/SrcUtils.hs
++++ b/Language/Haskell/GhcMod/SrcUtils.hs
+@@ -16,7 +16,7 @@ import qualified Var as G
+ import qualified Type as G
+ import GHC.SYB.Utils
+ import GhcMonad
+-import qualified Language.Haskell.Exts.Annotated as HE
++import qualified Language.Haskell.Exts as HE
+ import Language.Haskell.GhcMod.Doc
+ import Language.Haskell.GhcMod.Gap
+ import qualified Language.Haskell.GhcMod.Gap as Gap
+@@ -175,7 +175,7 @@ fourIntsHE loc = ( HE.srcSpanStartLine loc, HE.srcSpanStartColumn loc
+ typeSigInRangeHE :: Int -> Int -> HE.Decl HE.SrcSpanInfo -> Bool
+ typeSigInRangeHE lineNo colNo (HE.TypeSig (HE.SrcSpanInfo s _) _ _) =
+   HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+-typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _) =
++typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _ _) =
+   HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+ typeSigInRangeHE lineNo colNo (HE.DataFamDecl (HE.SrcSpanInfo s _) _ _ _) =
+   HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+diff --git a/ghc-mod.cabal b/ghc-mod.cabal
+index d882262..0b210e6 100644
+--- a/ghc-mod.cabal
++++ b/ghc-mod.cabal
+@@ -196,12 +196,12 @@ Library
+                       , mtl               < 2.3 && >= 2.0
+                       , monad-control     < 1.1 && >= 1
+                       , split             < 0.3
+-                      , haskell-src-exts  < 1.18
++                      , haskell-src-exts  == 1.18.*
+                       , text              < 1.3
+                       , djinn-ghc         < 0.1 && >= 0.0.2.2
+                       , fclabels          == 2.0.*
+-                      , extra             == 1.4.*
+-                      , pipes             == 4.1.*
++                      , extra             >= 1.4 && <1.6
++                      , pipes             >= 4.1 && <4.3
+                       , safe              < 0.4 && >= 0.3.9
+                       , optparse-applicative >=0.11.0 && <0.13.0
+                       , template-haskell



More information about the arch-commits mailing list