[arch-commits] Commit in ghc/trunk (PKGBUILD ghc print-provides-replaces.sh)

Thomas Dziedzic td123 at nymeria.archlinux.org
Fri Apr 18 06:43:31 UTC 2014


    Date: Friday, April 18, 2014 @ 08:43:31
  Author: td123
Revision: 211182

upgpkg: ghc 7.8.2-2

rebuild to fix the provides and to add ghc auto completion script

Added:
  ghc/trunk/ghc
Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/print-provides-replaces.sh

----------------------------+
 PKGBUILD                   |   20 +++++++++++---------
 ghc                        |   10 ++++++++++
 print-provides-replaces.sh |    5 +++++
 3 files changed, 26 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-18 06:26:22 UTC (rev 211181)
+++ PKGBUILD	2014-04-18 06:43:31 UTC (rev 211182)
@@ -11,7 +11,7 @@
 
 pkgname=ghc
 pkgver=7.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
@@ -31,7 +31,6 @@
           'haskell-directory=1.2.1.0'
           'haskell-filepath=1.3.0.2'
           'haskell-ghc-prim=0.3.1.0'
-          'haskell-haskeline=0.7.1.2'
           'haskell-haskell2010=1.1.2.0'
           'haskell-haskell98=2.0.0.3'
           'haskell-hoopl=3.10.0.1'
@@ -42,11 +41,9 @@
           'haskell-pretty=1.1.1.1'
           'haskell-process=1.2.0.0'
           'haskell-template-haskell=2.9.0.0'
-          'haskell-terminfo=0.4.0.0'
           'haskell-time=1.4.2'
           'haskell-transformers=0.3.0.0'
           'haskell-unix=2.7.0.1'
-          'haskell-xhtml=3000.2.1'
           'haskell-cabal=1.18.1.3'
          )
 replaces=('haskell-array<0.5.0.0'
@@ -59,7 +56,6 @@
           'haskell-directory<1.2.1.0'
           'haskell-filepath<1.3.0.2'
           'haskell-ghc-prim<0.3.1.0'
-          'haskell-haskeline<0.7.1.2'
           'haskell-haskell2010<1.1.2.0'
           'haskell-haskell98<2.0.0.3'
           'haskell-hoopl<3.10.0.1'
@@ -70,19 +66,19 @@
           'haskell-pretty<1.1.1.1'
           'haskell-process<1.2.0.0'
           'haskell-template-haskell<2.9.0.0'
-          'haskell-terminfo<0.4.0.0'
           'haskell-time<1.4.2'
           'haskell-transformers<0.3.0.0'
           'haskell-unix<2.7.0.1'
-          'haskell-xhtml<3000.2.1'
           'haskell-cabal<1.18.1.3'
          )
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"
-        'build.mk')
+        'build.mk'
+        'ghc')
 md5sums=('97578e0c27574a99e0d5071a7f35d136'
          'ac54f7fa453010149a573740705ecbfb'
-         'c367ef26300648ee9b8aca3dee5c9669')
+         'c367ef26300648ee9b8aca3dee5c9669'
+         'c1d46d86752c50dd85e7143b029fa07f')
 
 build() {
   cd ghc-${pkgver}
@@ -137,4 +133,10 @@
   install -d ${pkgdir}/usr/share/licenses/ghc
   install -m644 LICENSE \
     ${pkgdir}/usr/share/licenses/ghc
+
+  # provide non vanilla bash completion since ghc currently doesn't ship with any:
+  # https://ghc.haskell.org/trac/ghc/ticket/9006
+  install -d ${pkgdir}/usr/share/bash-completion/completions
+  install -m644 ${srcdir}/ghc \
+    ${pkgdir}/usr/share/bash-completion/completions
 }

Added: ghc
===================================================================
--- ghc	                        (rev 0)
+++ ghc	2014-04-18 06:43:31 UTC (rev 211182)
@@ -0,0 +1,10 @@
+_ghc()
+{
+    local envs=`ghc --show-options`
+    # get the word currently being completed
+   local cur=${COMP_WORDS[$COMP_CWORD]}
+
+    # the resulting completions should be put into this array
+    COMPREPLY=( $( compgen -W "$envs" -- $cur ) )
+}
+complete -F _ghc -o default ghc

Modified: print-provides-replaces.sh
===================================================================
--- print-provides-replaces.sh	2014-04-18 06:26:22 UTC (rev 211181)
+++ print-provides-replaces.sh	2014-04-18 06:43:31 UTC (rev 211182)
@@ -12,6 +12,11 @@
 exclude['Win32']=1
 # no integer-simple because we use integer-gmp
 exclude['integer-simple']=1
+# the rest are installed as dependencies of ghc and some shouldn't even be installed!
+# https://ghc.haskell.org/trac/ghc/ticket/8919
+exclude['haskeline']=1
+exclude['terminfo']=1
+exclude['xhtml']=1
 # extract excluded libraries from ghc.mk
 for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
   exclude[${exclude_pkg}]=1




More information about the arch-commits mailing list