Skip to content

Commit

Permalink
Update to ghc 7.8.2.
Browse files Browse the repository at this point in the history
Closes #122

Signed-off-by: Magnus Therning <magnus@therning.org>
  • Loading branch information
magthe committed Apr 13, 2014
1 parent d65990e commit 242efac
Show file tree
Hide file tree
Showing 18 changed files with 254 additions and 254 deletions.
422 changes: 211 additions & 211 deletions cblrepo.db

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ghc/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This implies that all libraries need to be rebuilt when ghc is rebuilt.

pkgname=ghc
pkgver=7.8.1
pkgver=7.8.2
pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
Expand Down Expand Up @@ -67,8 +67,8 @@ replaces=('haskell-array<0.5.0.0'
'haskell-unix<2.7.0.1'
'haskell-cabal<1.18.1.3')

source=("http://www.haskell.org/ghc/dist/7.8.1/ghc-${pkgver}-src.tar.xz"
"http://www.haskell.org/ghc/dist/7.8.1/ghc-${pkgver}-testsuite.tar.xz"
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' 'arch-gen-contents-index')

prepare() {
Expand Down Expand Up @@ -118,7 +118,7 @@ package() {
${pkgdir}/usr/share/licenses/ghc
}

sha256sums=('e07663febed2543a897e4070509c11860bde68d6334c86dcc67ced83ae3a8bc8'
'18779baabedfdeb58a33339a37150f4bd1f160aa85ef69ce59908e0b9283aad5'
sha256sums=('45d1e1a6edee34a7760ae9bfd8decf13a3f43de87309ff277f5a08fc51fa7e96'
'12e6ce94f2233523c9c575be63bdef29b456c4e612e10bc5ceddbe4bb1f9a2cb'
'f6f08c0fd1098396beba515db06d6c5f3aac633b56e2d35cbcefaf76272ee9af'
'f800cd0de93ae9926bb65c6324d6ce3e1ee814dae9c70c7a7bce28e5deb8245c')
2 changes: 1 addition & 1 deletion ghc/helpers/adjust-ghc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# modify the relver of ghc, this saves on recompilations of cblrepo

for f in $*; do
sed -e 's/ghc=7\.8\.0-1/ghc=7.8.1-1/' -i $f
sed -e 's/ghc=7\.8\.0-1/ghc=7.8.2-1/' -i $f
sed -e 's/--enable-split-objs//' -i $f
done
6 changes: 3 additions & 3 deletions patches/GLURaw.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Index: archhaskell/haskell-gluraw/PKGBUILD
@@ -12,7 +12,8 @@ license=("BSD3")
arch=('i686' 'x86_64')
makedepends=()
depends=("ghc=7.8.0-1"
- "haskell-openglraw=1.4.0.0-54")
+ "haskell-openglraw=1.4.0.0-54"
depends=("ghc=7.8.2-1"
- "haskell-openglraw=1.4.0.0-55")
+ "haskell-openglraw=1.4.0.0-55"
+ "glu")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions patches/OpenGLRaw.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Index: archhaskell/haskell-openglraw/PKGBUILD
license=("BSD3")
arch=('i686' 'x86_64')
makedepends=()
-depends=("ghc=7.8.0-1")
+depends=("ghc=7.8.0-1" "libgl")
-depends=("ghc=7.8.2-1")
+depends=("ghc=7.8.2-1" "libgl")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
"cabal.patch")
10 changes: 5 additions & 5 deletions patches/Unixutils.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Index: habs/haskell-unixutils/PKGBUILD
--- habs.orig/haskell-unixutils/PKGBUILD
+++ habs/haskell-unixutils/PKGBUILD
@@ -14,8 +14,7 @@ makedepends=()
depends=("ghc=7.8.0-1"
"haskell-puremd5=2.1.2.1-55"
"haskell-regex-tdfa=1.2.0-56"
- "haskell-zlib=0.5.4.1-54"
depends=("ghc=7.8.2-1"
"haskell-puremd5=2.1.2.1-56"
"haskell-regex-tdfa=1.2.0-57"
- "haskell-zlib=0.5.4.1-55"
- "crypt")
+ "haskell-zlib=0.5.4.1-54")
+ "haskell-zlib=0.5.4.1-55")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install="${pkgname}.install"
8 changes: 4 additions & 4 deletions patches/X11-xft.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Index: archhaskell-habs/haskell-x11-xft/PKGBUILD
+++ archhaskell-habs/haskell-x11-xft/PKGBUILD
@@ -13,7 +13,8 @@ arch=('i686' 'x86_64')
makedepends=()
depends=("ghc=7.8.0-1"
"haskell-x11=1.6.1.1-55"
- "haskell-utf8-string=0.3.7-54")
+ "haskell-utf8-string=0.3.7-54"
depends=("ghc=7.8.2-1"
"haskell-x11=1.6.1.1-56"
- "haskell-utf8-string=0.3.7-55")
+ "haskell-utf8-string=0.3.7-55"
+ "libxft")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
Expand Down
4 changes: 2 additions & 2 deletions patches/X11.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Index: archhaskell/haskell-x11/PKGBUILD
license=("BSD3")
arch=('i686' 'x86_64')
makedepends=()
depends=("ghc=7.8.0-1"
"haskell-data-default=0.5.3-55"
depends=("ghc=7.8.2-1"
"haskell-data-default=0.5.3-56"
- "X11"
- "Xrandr"
- "Xext")
Expand Down
2 changes: 1 addition & 1 deletion patches/bytestring-lexing.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Index: archhaskell/haskell-bytestring-lexing/PKGBUILD
license=("BSD3")
arch=('i686' 'x86_64')
-makedepends=()
depends=("ghc=7.6.3-1")
depends=("ghc=7.8.2-1")
+makedepends=("alex")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
Expand Down
8 changes: 4 additions & 4 deletions patches/conduit-extra.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ Index: habs/haskell-conduit-extra/PKGBUILD
===================================================================
--- habs.orig/haskell-conduit-extra/PKGBUILD
+++ habs/haskell-conduit-extra/PKGBUILD
@@ -22,6 +22,7 @@ depends=("ghc=7.8.0-1"
"haskell-streaming-commons=0.1.1-1"
"haskell-text=1.1.0.1-2"
"haskell-transformers-base=0.4.1-54")
@@ -22,6 +22,7 @@ depends=("ghc=7.8.2-1"
"haskell-streaming-commons=0.1.1-2"
"haskell-text=1.1.0.1-3"
"haskell-transformers-base=0.4.1-55")
+replaces=('haskell-blaze-builder-conduit' 'haskell-network-conduit')
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
Expand Down
4 changes: 2 additions & 2 deletions patches/digest.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Index: archhaskell/haskell-digest/PKGBUILD
license=("BSD3")
arch=('i686' 'x86_64')
makedepends=()
-depends=("ghc=7.8.0-1" "z")
+depends=("ghc=7.8.0-1" "zlib")
-depends=("ghc=7.8.2-1" "z")
+depends=("ghc=7.8.2-1" "zlib")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install="${pkgname}.install"
12 changes: 6 additions & 6 deletions patches/graphviz.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Index: habs/haskell-graphviz/PKGBUILD
===================================================================
--- habs.orig/haskell-graphviz/PKGBUILD
+++ habs/haskell-graphviz/PKGBUILD
@@ -18,7 +18,8 @@ depends=("ghc=7.6.3-1"
"haskell-polyparse=1.9-57"
"haskell-temporary=1.2.0.1-54"
"haskell-text=1.1.0.1-2"
- "haskell-wl-pprint-text=1.1.0.2-57")
+ "haskell-wl-pprint-text=1.1.0.2-57"
@@ -18,7 +18,8 @@ depends=("ghc=7.8.2-1"
"haskell-polyparse=1.9-58"
"haskell-temporary=1.2.0.1-55"
"haskell-text=1.1.0.1-3"
- "haskell-wl-pprint-text=1.1.0.2-58")
+ "haskell-wl-pprint-text=1.1.0.2-58"
+ "graphviz")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion patches/haskell-src-exts.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Index: habs/haskell-haskell-src-exts/PKGBUILD
arch=('i686' 'x86_64')
-makedepends=()
+makedepends=('llvm' 'happy')
depends=("ghc=7.8.0-1"
depends=("ghc=7.8.2-1"
"haskell-cpphs=1.18.4-2")
options=('strip' 'staticlibs')
@@ -33,6 +33,7 @@ build() {
Expand Down
4 changes: 2 additions & 2 deletions patches/ieee754.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Index: archhaskell/haskell-ieee754/PKGBUILD
license=("BSD3")
arch=('i686' 'x86_64')
makedepends=()
-depends=("ghc=7.8.0-1" "m")
+depends=("ghc=7.8.0-1")
-depends=("ghc=7.8.2-1" "m")
+depends=("ghc=7.8.2-1")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install="${pkgname}.install"
2 changes: 1 addition & 1 deletion patches/language-c.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Index: habs/haskell-language-c/PKGBUILD
arch=('i686' 'x86_64')
-makedepends=()
+makedepends=('happy' 'alex')
depends=("ghc=7.8.0-1"
depends=("ghc=7.8.2-1"
"haskell-syb=0.4.1-53")
options=('strip' 'staticlibs')
@@ -30,6 +30,8 @@ prepare() {
Expand Down
2 changes: 1 addition & 1 deletion patches/pandoc.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Index: habs/haskell-pandoc/PKGBUILD
arch=('i686' 'x86_64')
-makedepends=()
+makedepends=('alex' 'happy')
depends=("ghc=7.8.0-1"
depends=("ghc=7.8.2-1"
"haskell-http=4000.2.12-2"
"haskell-aeson=0.7.0.3-1"
2 changes: 1 addition & 1 deletion patches/xmonad.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Index: habs/haskell-xmonad/PKGBUILD
===================================================================
--- habs.orig/haskell-xmonad/PKGBUILD
+++ habs/haskell-xmonad/PKGBUILD
@@ -17,6 +17,7 @@ depends=("ghc=7.6.3-1"
@@ -17,6 +17,7 @@ depends=("ghc=7.8.2-1"
"haskell-mtl=2.1.2-51"
"haskell-utf8-string=0.3.7-51")
options=('strip' 'staticlibs')
Expand Down
4 changes: 2 additions & 2 deletions patches/zlib.pkgbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Index: archhaskell/haskell-zlib/PKGBUILD
license=("BSD3")
arch=('i686' 'x86_64')
makedepends=()
-depends=("ghc=7.8.0-1" "z")
+depends=("ghc=7.8.0-1" "zlib")
-depends=("ghc=7.8.2-1" "z")
+depends=("ghc=7.8.2-1" "zlib")
options=('strip' 'staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install="${pkgname}.install"

0 comments on commit 242efac

Please sign in to comment.