diff --git a/community/ghc/PKGBUILD b/community/ghc/PKGBUILD index 86b5ee4d0..d922d4008 100644 --- a/community/ghc/PKGBUILD +++ b/community/ghc/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Felix Yan # Contributor: Vesa Kaihlavirta # Contributor: Thomas Dziedzic @@ -17,19 +16,19 @@ shopt -s extglob pkgbase=ghc pkgname=(ghc-libs ghc ghc-static) -pkgver=8.6.5 -pkgrel=1 +pkgver=8.8.1 +pkgrel=2 pkgdesc='The Glasgow Haskell Compiler' arch=('x86_64') -url='http://www.haskell.org/ghc/' +url='https://www.haskell.org/ghc/' license=('custom') makedepends=('ghc-static' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskell-hscolour' - 'texlive-bin' 'texlive-latexextra' 'ttf-dejavu') + 'texlive-bin' 'texlive-latexextra' 'ttf-dejavu' 'alex' 'happy' 'time') source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.xz" ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook 0001-llvm-targets-Add-armv6l-unknown-linux-gnueabihf-and-.patch) noextract=("$pkgbase-${pkgver}-src.tar.xz") -sha512sums=('c08a7480200cb99e1ffbe4ce7669f552b1054054966f7e7efcbc5f98af8032e1249fa391c4fc4c7d62cc8e0be5d17fa05845177f3cea3dbcf86e6c92d40fc0f9' +sha512sums=('7268b012c3a6c34e7eac05c7d6959de6005651d33e870860bbfe589295502e8794a76580130b8f4da2f88032b68116dbbdbc4c1e900e0c862aaa9891fa788bef' 'afb119e4f665770c5704b97034d2488504eaa7afcddca2fb6b554079921cd2330599bcb5c36669f0d0e7856dd99ae1deeca1b0e97e2371a783f26e5ef9776ba9' 'bd65a369b618ec9bee46c028c2b6acff8f883f60f6cad6e5be8561fbcef6118278abec11bb86f9e6f92cb2e05ad74ec54611c1788e8ed95187d0091fcbbf8767' 'd4bfdd4c8ad9ac612cf187fec150850e9f4068a4a4202503c00dba07ba26f804bc11d7181249f7e3452d7ede60dc5dedea34e73fdb584ac2953068b51c6fd5ad' @@ -69,7 +68,7 @@ package_ghc-static() { make DESTDIR="$pkgdir" -j1 install mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d - find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -type f -delete + find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -type f -delete find "$pkgdir"/usr/lib -type d -empty -delete mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/ rm -r "$pkgdir"/usr/bin "$pkgdir"/usr/share/man @@ -87,7 +86,7 @@ package_ghc() { make DESTDIR="$pkgdir" -j1 install # Remove static libs - find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete + find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete # ghc-pkg is in ghc-libs rm "$pkgdir"/usr/lib/ghc-$pkgver/bin/ghc-pkg* @@ -105,36 +104,36 @@ package_ghc-libs() { pkgdesc='The Glasgow Haskell Compiler - Dynamic Libraries' install='ghc.install' depends=('gmp' 'libffi' 'perl' 'llvm50') - provides=('haskell-array=0.5.3.0' - 'haskell-base=4.12.0.0' - 'haskell-binary=0.8.6.0' - 'haskell-bytestring=0.10.8.2' - 'haskell-containers=0.6.0.1' + provides=('haskell-array=0.5.4.0' + 'haskell-base=4.13.0.0' + 'haskell-binary=0.8.7.0' + 'haskell-bytestring=0.10.9.0' + 'haskell-containers=0.6.2.1' 'haskell-deepseq=1.4.4.0' - 'haskell-directory=1.3.3.0' + 'haskell-directory=1.3.3.2' 'haskell-filepath=1.4.2.1' - 'haskell-ghc-boot=8.6.5' - 'haskell-ghc-boot-th=8.6.5' + 'haskell-ghc-boot=8.8.1' + 'haskell-ghc-boot-th=8.8.1' 'haskell-ghc-compact=0.1.0.0' - 'haskell-ghc-heap=8.6.5' + 'haskell-ghc-heap=8.8.1' 'haskell-ghc-prim=0.5.3' - 'haskell-haskeline=0.7.4.3' + 'haskell-haskeline=0.7.5.0' 'haskell-hpc=0.6.0.3' 'haskell-integer-gmp=1.0.2.0' - 'haskell-libiserv=8.6.3' + 'haskell-libiserv=8.8.1' 'haskell-mtl=2.2.2' - 'haskell-parsec=3.1.13.0' + 'haskell-parsec=3.1.14.0' 'haskell-pretty=1.1.3.6' - 'haskell-process=1.6.5.0' + 'haskell-process=1.6.5.1' 'haskell-stm=2.5.0.0' - 'haskell-template-haskell=2.14.0.0' - 'haskell-terminfo=0.4.1.2' - 'haskell-text=1.2.3.1' - 'haskell-time=1.8.0.2' + 'haskell-template-haskell=2.15.0.0' + 'haskell-terminfo=0.4.1.4' + 'haskell-text=1.2.4.0' + 'haskell-time=1.9.3' 'haskell-transformers=0.5.6.2' 'haskell-unix=2.7.2.2' 'haskell-xhtml=3000.2.2.1' - 'haskell-cabal=2.4.0.1') + 'haskell-cabal=3.0.0.0') replaces=('haskell-array' 'haskell-base' 'haskell-binary' @@ -174,7 +173,7 @@ package_ghc-libs() { make DESTDIR="$pkgdir" -j1 install # Remove static libs - find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete + find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete # ghc library and other exes are in the ghc package rm -r "$pkgdir"/usr/lib/ghc-$pkgver/ghc-$pkgver diff --git a/community/ghc/print-provides-replaces.sh b/community/ghc/print-provides-replaces.sh index eafc946f4..c8ee904b2 100755 --- a/community/ghc/print-provides-replaces.sh +++ b/community/ghc/print-provides-replaces.sh @@ -23,7 +23,7 @@ cd src/ghc-${pkgver}/libraries # $2 is the string for the test, either '=' or '<' print_var() { printf " $1=(" - for path in $(ls ./*/*.cabal); do + for path in $(ls ./*/*.cabal ./containers/containers/*.cabal); do dirname=$(echo $path | awk -F '/' '{ print $2 }') cabalfile=$(echo $path | awk -F '/' '{ print $3 }') cabalname=$(basename $cabalfile .cabal)