diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-16 00:31:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-16 00:31:59 -0400 |
| commit | 26c60e07ef7c903fa90b0b8ae70f7c259b230ded (patch) | |
| tree | a7fdee91504b4449d272885c057cf58e3de26006 /standalone/android/install-haskell-packages | |
| parent | 9a4c5746c2df53f9c385b62a051772f8dd91b1a9 (diff) | |
finished convering android build to pinned packages
Package versions match Debian jessie, except for a few differences
needed due to the different version of ghc pulling in a few buildin
packages with other versions.
Most of the patches were cherry-picked from past commits, since these are
older versions.
Diffstat (limited to 'standalone/android/install-haskell-packages')
| -rwxr-xr-x | standalone/android/install-haskell-packages | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 8ec551ffd..3cd6d3e6a 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -16,8 +16,6 @@ if [ ! -d haskell-patches ]; then fi setupcabal () { - cabal update - # Some packages fail to install in a non unicode locale. LANG=en_US.UTF-8 export LANG @@ -40,6 +38,7 @@ patched () { git config user.email dummy@example.com git add . git commit -m "pre-patched state of $pkg" + ln -sf ../../cabal.config for patch in ../../haskell-patches/${pkg}_* ../../../no-th/haskell-patches/${pkg}_*; do if [ -e "$patch" ]; then echo trying $patch @@ -50,8 +49,6 @@ patched () { fi fi done - set -x - ln -sf ../../cabal.config if [ -e config.sub ]; then cp /usr/share/misc/config.sub . fi @@ -66,8 +63,7 @@ patched () { } installgitannexdeps () { - pushd - cd ../.. + pushd ../.. ln -sf standalone/android/cabal.config cabal install --only-dependencies "$@" rm -f cabal.config @@ -107,6 +103,7 @@ EOF patched shakespeare-css patched shakespeare-js patched yesod-routes + patched hamlet patched yesod-core patched yesod-persistent patched yesod-form @@ -121,6 +118,8 @@ EOF patched dns patched gnutls patched unbounded-delays + patched gnuidn + patched network-protocol-xmpp cd .. @@ -132,4 +131,6 @@ cabal update PATH=$HOME/.ghc/$(cat abiversion)/bin:$HOME/.ghc/$(cat abiversion)/arm-linux-androideabi/bin:$PATH setupcabal +cabal update + install_pkgs |