reverted updates to new lib versions that broke android build

I ran into several evilsplicer problems with the new lib versions, most notably including a problem with encoding of embedded binary files

standalone/android/install-haskell-packages

@@ -8,6 +8,10 @@
 # versions that have been gotten working. To update, delete the
 # cabal.config, run this script with an empty cabal and fix up the broken
 # patches, and then use cabal freeze to generate a new cabal.config.
+#
+# This only installs haskell packages for ghc-android. The host ghc
+# also needs to have all the git-annex build deps installed, in similar
+# versions. Those are installed from Debian packages using apt.
 
 set -e
 
@@ -86,9 +90,10 @@ EOF
 	patched iproute
 	patched primitive
 	patched socks
-	patched entropy
+	# patched entropy # needed for newer version, not current pinned version
 	patched vector
 	patched stm-chans
+	patched persistent
 	patched profunctors
 	patched skein
 	patched lens
@@ -97,14 +102,19 @@ EOF
 	patched persistent-template
 	patched system-filepath
 	patched optparse-applicative
-	patched warp
 	patched wai-app-static
 	patched shakespeare
+	patched shakespeare-css
+	patched shakespeare-js
+	patched yesod-routes
 	patched yesod-core
+	patched yesod-persistent
 	patched yesod-form
+	patched crypto-numbers
 	patched clock
 	patched yesod-auth
 	patched yesod
+	patched shakespeare-text
 	patched process-conduit
 	patched DAV
 	patched yesod-static
@@ -112,6 +122,7 @@ EOF
 	patched dns
 	patched gnutls
 	patched unbounded-delays
+	patched gnuidn
 	patched network-protocol-xmpp
 
 	cd ..
@@ -119,13 +130,11 @@ EOF
 	installgitannexdeps -fAndroid -f-Pairing
 }
 
-setupcabal
-
-# Install packages for host ghc.
+# native cabal needs its own update
 cabal update
-installgitannexdeps
 
-# Install packages for cross ghc, with patches as necessary.
 PATH=$HOME/.ghc/$(cat abiversion)/bin:$HOME/.ghc/$(cat abiversion)/arm-linux-androideabi/bin:$PATH
+setupcabal
 cabal update
+
 install_pkgs