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

18 files changed, 725 insertions, 1328 deletions

diff --git a/standalone/android/cabal.config b/standalone/android/cabal.config
index ccfd3b22b..4cda02637 100644
--- a/standalone/android/cabal.config
+++ b/standalone/android/cabal.config
@@ -1,1062 +1,208 @@
-constraints: abstract-deque ==0.3,
-             abstract-par ==0.3.3,
-             accelerate ==0.15.1.0,
-             ace ==0.6,
-             action-permutations ==0.0.0.1,
-             active ==0.1.0.19,
-             AC-Vector ==2.3.2,
-             ad ==4.2.2,
-             adjunctions ==4.2.1,
-             aeson-pretty ==0.7.2,
-             aeson-qq ==0.7.4,
-             aeson-utils ==0.3.0.1,
-             alarmclock ==0.2.0.6,
-             alex ==3.1.4,
-             amazonka ==0.3.4,
-             amazonka-autoscaling ==0.3.4,
-             amazonka-cloudformation ==0.3.4,
-             amazonka-cloudfront ==0.3.4,
-             amazonka-cloudhsm ==0.3.4,
-             amazonka-cloudsearch ==0.3.4,
-             amazonka-cloudsearch-domains ==0.3.4,
-             amazonka-cloudtrail ==0.3.4,
-             amazonka-cloudwatch ==0.3.4,
-             amazonka-cloudwatch-logs ==0.3.4,
-             amazonka-codedeploy ==0.3.4,
-             amazonka-cognito-identity ==0.3.4,
-             amazonka-cognito-sync ==0.3.4,
-             amazonka-config ==0.3.4,
-             amazonka-core ==0.3.4,
-             amazonka-datapipeline ==0.3.4,
-             amazonka-directconnect ==0.3.4,
-             amazonka-dynamodb ==0.3.4,
-             amazonka-ec2 ==0.3.4,
-             amazonka-ecs ==0.3.4,
-             amazonka-elasticache ==0.3.4,
-             amazonka-elasticbeanstalk ==0.3.4,
-             amazonka-elastictranscoder ==0.3.4,
-             amazonka-elb ==0.3.4,
-             amazonka-emr ==0.3.4,
-             amazonka-glacier ==0.3.4,
-             amazonka-iam ==0.3.4,
-             amazonka-importexport ==0.3.4,
-             amazonka-kinesis ==0.3.4,
-             amazonka-kms ==0.3.4,
-             amazonka-lambda ==0.3.4,
-             amazonka-opsworks ==0.3.4,
-             amazonka-rds ==0.3.4,
-             amazonka-redshift ==0.3.4,
-             amazonka-route53 ==0.3.4,
-             amazonka-route53-domains ==0.3.4,
-             amazonka-s3 ==0.3.4,
-             amazonka-sdb ==0.3.4,
-             amazonka-ses ==0.3.4,
-             amazonka-sns ==0.3.4,
-             amazonka-sqs ==0.3.4,
-             amazonka-ssm ==0.3.4,
-             amazonka-storagegateway ==0.3.4,
-             amazonka-sts ==0.3.4,
-             amazonka-support ==0.3.4,
-             amazonka-swf ==0.3.4,
-             amqp ==0.12.2,
-             ansi-terminal ==0.6.2.1,
-             ansi-wl-pprint ==0.6.7.2,
+constraints: Crypto ==4.2.5.1,
+             DAV ==1.0.3,
+             HTTP ==4000.2.17,
+             HUnit ==1.2.5.2,
+             IfElse ==0.85,
+             MissingH ==1.2.1.0,
+             MonadRandom ==0.1.13,
+             QuickCheck ==2.7.6,
+             SafeSemaphore ==0.10.1,
+             aeson ==0.7.0.6,
+             ansi-terminal ==0.6.1.1,
+             ansi-wl-pprint ==0.6.7.1,
              appar ==0.1.4,
-             applicative-quoters ==0.1.0.8,
-             approximate ==0.2.1.1,
-             arbtt ==0.9.0.2,
-             arithmoi ==0.4.1.2,
-             array installed,
-             arrow-list ==0.7,
-             asn1-data ==0.7.1,
-             asn1-encoding ==0.9.0,
-             asn1-parse ==0.9.1,
-             asn1-types ==0.3.0,
-             async ==2.0.2,
-             atto-lisp ==0.2.2,
-             attoparsec ==0.12.1.6,
-             attoparsec-enumerator ==0.3.4,
-             attoparsec-expr ==0.1.1.2,
-             authenticate ==1.3.2.11,
-             authenticate-oauth ==1.5.1.1,
-             auto-update ==0.1.2.1,
-             aws ==0.11.4,
-             bake ==0.2,
-             bank-holidays-england ==0.1.0.3,
-             base installed,
+             asn1-encoding ==0.8.1.3,
+             asn1-parse ==0.8.1,
+             asn1-types ==0.2.3,
+             async ==2.0.1.5,
+             attoparsec ==0.11.3.4,
+             attoparsec-conduit ==1.1.0,
+             authenticate ==1.3.2.10,
+             base-unicode-symbols ==0.2.2.4,
              base16-bytestring ==0.1.1.6,
              base64-bytestring ==1.0.0.1,
-             base64-string ==0.2,
-             base-compat ==0.6.0,
-             base-prelude ==0.1.19,
-             base-unicode-symbols ==0.2.2.4,
-             basic-prelude ==0.3.13,
-             bcrypt ==0.0.6,
-             bifunctors ==4.2.1,
-             binary installed,
-             binary-conduit ==1.2.3,
-             binary-list ==1.1.1.0,
-             bindings-DSL ==1.0.22,
-             bin-package-db installed,
-             bioace ==0.0.1,
-             bioalign ==0.0.5,
-             biocore ==0.3.1,
-             biofasta ==0.0.3,
-             biofastq ==0.1,
-             biophd ==0.0.7,
-             biopsl ==0.4,
-             biosff ==0.3.7.1,
-             bits ==0.4,
-             blank-canvas ==0.5,
-             BlastHTTP ==1.0.1,
-             blastxml ==0.3.2,
-             blaze-builder ==0.4.0.1,
-             blaze-builder-enumerator ==0.2.1.0,
-             blaze-html ==0.8.0.2,
-             blaze-markup ==0.7.0.2,
-             blaze-svg ==0.3.4.1,
-             blaze-textual ==0.2.0.9,
-             bloodhound ==0.5.0.1,
-             bmp ==1.2.5.2,
-             Boolean ==0.2.3,
-             boolsimplifier ==0.1.8,
-             bound ==1.0.5,
-             BoundedChan ==1.0.3.0,
-             broadcast-chan ==0.1.0,
-             bson ==0.3.1,
-             bumper ==0.6.0.3,
+             bifunctors ==4.1.1.1,
+             bloomfilter ==2.0.0.0,
              byteable ==0.1.1,
-             bytedump ==1.0,
              byteorder ==1.0.4,
-             bytes ==0.15,
-             bytestring installed,
-             bytestring-builder ==0.10.6.0.0,
-             bytestring-conversion ==0.3.0,
-             bytestring-lexing ==0.4.3.2,
-             bytestring-mmap ==0.2.2,
-             bytestring-progress ==1.0.5,
-             bytestring-trie ==0.2.4.1,
-             bzlib ==0.5.0.5,
-             bzlib-conduit ==0.2.1.3,
-             c2hs ==0.25.2,
-             Cabal installed,
-             cabal-file-th ==0.2.3,
-             Cabal-ide-backend ==1.23.0.0,
-             cabal-install ==1.18.1.0,
-             cabal-rpm ==0.9.6,
-             cabal-src ==0.2.5.1,
-             cabal-test-quickcheck ==0.1.4,
-             cairo ==0.13.1.0,
-             cartel ==0.14.2.6,
-             case-insensitive ==1.2.0.4,
-             cases ==0.1.2.1,
-             cassava ==0.4.2.4,
-             cereal ==0.4.1.1,
-             cereal-conduit ==0.7.2.3,
-             certificate ==1.3.9,
-             charset ==0.3.7.1,
-             Chart ==1.3.3,
-             Chart-diagrams ==1.3.3,
-             ChasingBottoms ==1.3.0.12,
-             check-email ==1.0,
-             checkers ==0.4.3,
-             chell ==0.4.0.1,
-             chell-quickcheck ==0.2.5,
-             chunked-data ==0.1.0.1,
-             cipher-aes ==0.2.10,
-             cipher-aes128 ==0.6.4,
-             cipher-blowfish ==0.0.3,
-             cipher-camellia ==0.0.2,
+             case-insensitive ==1.2.0.1,
+             cereal ==0.4.0.1,
+             cipher-aes ==0.2.8,
              cipher-des ==0.0.6,
              cipher-rc4 ==0.1.4,
-             circle-packing ==0.1.0.4,
-             classy-prelude ==0.11.1.1,
-             classy-prelude-conduit ==0.11.1,
-             classy-prelude-yesod ==0.11.1,
-             clay ==0.10.1,
-             clientsession ==0.9.1.1,
-             clock ==0.4.6.0,
-             cmdargs ==0.10.13,
-             code-builder ==0.1.3,
-             colour ==2.3.3,
-             comonad ==4.2.6,
-             comonads-fd ==4.0,
-             comonad-transformers ==4.0,
-             compdata ==0.9,
-             compensated ==0.6.1,
-             composition ==1.0.1.1,
-             compressed ==3.10,
-             concatenative ==1.0.1,
-             concurrent-extra ==0.7.0.9,
-             concurrent-supply ==0.1.7.1,
-             cond ==0.4.1.1,
-             conduit ==1.2.4.2,
-             conduit-combinators ==0.3.1,
-             conduit-extra ==1.1.8,
-             configurator ==0.3.0.0,
-             connection ==0.2.4,
-             constraints ==0.4.1.3,
-             consul-haskell ==0.1,
-             containers installed,
-             containers-unicode-symbols ==0.3.1.1,
-             contravariant ==1.3.1.1,
-             control-monad-free ==0.6.1,
-             control-monad-loop ==0.1,
-             convertible ==1.1.1.0,
-             cookie ==0.4.1.5,
-             courier ==0.1.0.15,
-             cpphs ==1.19,
-             cprng-aes ==0.6.1,
-             cpu ==0.1.2,
-             criterion ==1.1.0.0,
+             clientsession ==0.9.0.3,
+             comonad ==4.2,
+             conduit ==1.1.6,
+             conduit-extra ==1.1.3,
+             connection ==0.2.3,
+             contravariant ==0.6.1.1,
+             cookie ==0.4.1.2,
+             cprng-aes ==0.5.2,
              crypto-api ==0.13.2,
-             crypto-api-tests ==0.3,
-             cryptocipher ==0.6.2,
-             crypto-cipher-tests ==0.0.11,
              crypto-cipher-types ==0.0.9,
+             crypto-numbers ==0.2.3,
+             crypto-pubkey ==0.2.4,
+             crypto-pubkey-types ==0.4.2.2,
+             crypto-random ==0.0.7,
              cryptohash ==0.11.6,
              cryptohash-conduit ==0.1.1,
-             cryptohash-cryptoapi ==0.1.3,
-             cryptol ==2.2.2,
-             crypto-numbers ==0.2.7,
-             crypto-pubkey ==0.2.8,
-             crypto-pubkey-types ==0.4.3,
-             crypto-random ==0.0.9,
-             crypto-random-api ==0.2.0,
              css-text ==0.1.2.1,
-             csv ==0.1.2,
-             csv-conduit ==0.6.6,
-             cubicspline ==0.1.1,
-             curl ==1.3.8,
-             data-accessor ==0.2.2.6,
-             data-accessor-mtl ==0.2.0.4,
-             data-binary-ieee754 ==0.4.4,
+             shakespeare-text ==1.0.2,
              data-default ==0.5.3,
              data-default-class ==0.0.1,
              data-default-instances-base ==0.0.1,
              data-default-instances-containers ==0.0.1,
              data-default-instances-dlist ==0.0.1,
              data-default-instances-old-locale ==0.0.1,
-             data-inttrie ==0.1.0,
-             data-lens-light ==0.1.2.1,
-             data-memocombinators ==0.5.1,
-             data-reify ==0.6.1,
-             DAV ==1.0.5,
-             Decimal ==0.4.2,
-             deepseq installed,
-             deepseq-generics ==0.1.1.2,
-             derive ==2.5.22,
-             descriptive ==0.9.3,
-             diagrams ==1.2,
-             diagrams-cairo ==1.2.0.7,
-             diagrams-canvas ==0.3.0.4,
-             diagrams-contrib ==1.1.2.6,
-             diagrams-core ==1.2.0.6,
-             diagrams-lib ==1.2.0.9,
-             diagrams-postscript ==1.1.0.5,
-             diagrams-rasterific ==0.1.0.8,
-             diagrams-svg ==1.1.0.5,
-             Diff ==0.3.2,
-             digest ==0.0.1.2,
-             digestive-functors ==0.7.1.5,
-             dimensional ==0.13.0.2,
-             directory installed,
-             directory-tree ==0.12.0,
-             direct-sqlite ==2.3.15,
-             distributed-process ==0.5.3,
-             distributed-process-async ==0.2.1,
-             distributed-process-client-server ==0.1.2,
-             distributed-process-execution ==0.1.1,
-             distributed-process-extras ==0.2.0,
-             distributed-process-simplelocalnet ==0.2.2.0,
-             distributed-process-supervisor ==0.1.2,
-             distributed-process-task ==0.1.1,
-             distributed-static ==0.3.1.0,
+             sandi ==0.3.0.1,
+             dbus ==0.10.8,
              distributive ==0.4.4,
-             djinn-ghc ==0.0.2.3,
-             djinn-lib ==0.0.1.2,
-             dlist ==0.7.1.1,
-             dlist-instances ==0.1,
-             doctest ==0.9.13,
-             double-conversion ==2.0.1.0,
-             DRBG ==0.5.4,
-             dual-tree ==0.2.0.6,
-             easy-file ==0.2.1,
-             ede ==0.2.8.2,
-             edit-distance ==0.2.1.3,
-             effect-handlers ==0.1.0.6,
-             either ==4.3.4,
-             elm-core-sources ==1.0.0,
-             email-validate ==2.0.1,
-             enclosed-exceptions ==1.0.1.1,
-             entropy ==0.3.6,
-             enumerator ==0.4.20,
-             eq ==4.0.4,
-             erf ==2.0.0.0,
-             errorcall-eq-instance ==0.2.0.1,
+             dlist ==0.7.0.1,
+             dns ==1.3.0,
+             edit-distance ==0.2.1.2,
+             either ==4.3,
+             email-validate ==1.0.0,
+             entropy ==0.2.1,
              errors ==1.4.7,
-             ersatz ==0.3,
-             esqueleto ==2.1.3,
-             exception-mtl ==0.3.0.5,
-             exceptions ==0.8.0.2,
-             exception-transformers ==0.3.0.4,
-             executable-hash ==0.2.0.0,
-             executable-path ==0.0.3,
-             extensible-exceptions ==0.1.1.4,
-             extra ==1.1,
-             fast-logger ==2.3.1,
-             fay ==0.23.1.4,
-             fay-base ==0.20.0.0,
-             fay-builder ==0.2.0.5,
-             fay-dom ==0.5.0.1,
-             fay-jquery ==0.6.0.3,
-             fay-text ==0.3.2.2,
-             fay-uri ==0.2.0.0,
-             fb ==1.0.10,
-             fb-persistent ==0.3.4,
-             fclabels ==2.0.2.2,
-             FenwickTree ==0.1.2.1,
-             fgl ==5.5.1.0,
-             file-embed ==0.0.8.2,
-             file-location ==0.4.7.1,
-             filemanip ==0.3.6.3,
-             filepath installed,
-             fingertree ==0.1.0.2,
-             fixed ==0.2.1.1,
-             fixed-list ==0.1.6,
-             fixed-vector ==0.7.0.3,
-             flexible-defaults ==0.0.1.1,
-             flock ==0.3.1.8,
-             fmlist ==0.9,
-             focus ==0.1.4,
-             foldl ==1.0.10,
-             FontyFruity ==0.5.1.1,
-             force-layout ==0.3.0.11,
-             foreign-store ==0.2,
-             formatting ==6.2.0,
-             free ==4.11,
-             freenect ==1.2,
-             frisby ==0.2,
-             fsnotify ==0.1.0.3,
-             fuzzcheck ==0.1.1,
-             gd ==3000.7.3,
-             generic-aeson ==0.2.0.5,
-             generic-deriving ==1.6.3,
-             GenericPretty ==1.2.1,
-             generics-sop ==0.1.1.2,
-             generic-xmlpickler ==0.1.0.2,
-             ghc installed,
-             ghc-heap-view ==0.5.3,
-             ghcid ==0.3.6,
-             ghc-mod ==5.2.1.2,
-             ghc-mtl ==1.2.1.0,
-             ghc-paths ==0.1.0.9,
-             ghc-prim installed,
-             ghc-syb-utils ==0.2.3,
-             gio ==0.13.1.0,
-             gipeda ==0.1.0.2,
-             git-embed ==0.1.0,
-             gitlib ==3.1.0.1,
-             gitlib-libgit2 ==3.1.0.4,
-             gitlib-test ==3.1.0.2,
-             gitrev ==1.0.0,
-             gitson ==0.5.1,
-             gl ==0.7.7,
-             glib ==0.13.1.0,
-             Glob ==0.7.5,
-             GLURaw ==1.5.0.1,
-             GLUT ==2.7.0.1,
-             graph-core ==0.2.2.0,
-             graphs ==0.6.0.1,
-             GraphSCC ==1.0.4,
-             graphviz ==2999.17.0.2,
-             gravatar ==0.8.0,
-             groundhog ==0.7.0.3,
-             groundhog-mysql ==0.7.0.1,
-             groundhog-postgresql ==0.7.0.2,
-             groundhog-sqlite ==0.7.0.1,
-             groundhog-th ==0.7.0.1,
-             groupoids ==4.0,
-             groups ==0.4.0.0,
-             gtk ==0.13.6,
-             gtk2hs-buildtools ==0.13.0.3,
-             gtk3 ==0.13.6,
-             hackage-mirror ==0.1.0.0,
-             haddock-api ==2.15.0.2,
-             haddock-library ==1.1.1,
-             hakyll ==4.6.9.0,
-             half ==0.2.0.1,
-             HandsomeSoup ==0.3.5,
-             happstack-server ==7.4.2,
-             happy ==1.19.5,
-             hashable ==1.2.3.2,
-             hashable-extras ==0.2.1,
-             hashmap ==1.3.0.1,
-             hashtables ==1.2.0.2,
-             haskeline installed,
-             haskell2010 installed,
-             haskell98 installed,
-             haskell-lexer ==1.0,
-             haskell-names ==0.5.2,
-             HaskellNet ==0.4.4,
-             haskell-packages ==0.2.4.4,
-             haskell-src ==1.0.2.0,
-             haskell-src-exts ==1.16.0.1,
-             haskell-src-meta ==0.6.0.9,
-             haskintex ==0.5.0.3,
-             hasql ==0.7.3.1,
-             hasql-backend ==0.4.1,
-             hasql-postgres ==0.10.3.1,
-             hastache ==0.6.1,
-             HaTeX ==3.16.1.1,
-             HaXml ==1.25.3,
-             haxr ==3000.10.4.2,
-             HCodecs ==0.5,
-             hdaemonize ==0.5.0.0,
-             hdevtools ==0.1.0.8,
-             hdocs ==0.4.1.3,
-             heap ==1.0.2,
-             heaps ==0.3.2.1,
-             hebrew-time ==0.1.1,
-             heist ==0.14.1,
-             here ==1.2.7,
-             heredoc ==0.2.0.0,
-             hexpat ==0.20.9,
-             hflags ==0.4,
-             highlighting-kate ==0.5.12,
-             hindent ==4.4.2,
-             hinotify ==0.3.7,
-             hint ==0.4.2.3,
-             histogram-fill ==0.8.4.1,
-             hit ==0.6.3,
+             exceptions ==0.6.1,
+             failure ==0.2.0.3,
+             fast-logger ==2.1.5,
+             fdo-notify ==0.3.1,
+             feed ==0.3.9.2,
+             file-embed ==0.0.6,
+             fingertree ==0.1.0.0,
+             free ==4.9,
+             gnuidn ==0.2,
+             gnutls ==0.1.4,
+             gsasl ==0.3.5,
+             hS3 ==0.5.7,
+             hamlet ==1.1.9.2,
+             hashable ==1.2.1.0,
+             hinotify ==0.3.5,
              hjsmin ==0.1.4.7,
-             hledger ==0.24.1,
-             hledger-lib ==0.24.1,
-             hledger-web ==0.24.1,
-             hlibgit2 ==0.18.0.14,
-             hlint ==1.9.20,
-             hmatrix ==0.16.1.5,
-             hmatrix-gsl ==0.16.0.3,
-             hmatrix-gsl-stats ==0.2.1,
-             hmatrix-repa ==0.1.2.1,
-             hoauth2 ==0.4.7,
-             holy-project ==0.1.1.1,
-             hoogle ==4.2.41,
-             hoopl installed,
-             hOpenPGP ==2.0,
-             hopenpgp-tools ==0.14.1,
-             hostname ==1.0,
-             hostname-validate ==1.0.0,
-             hourglass ==0.2.9,
-             hpc installed,
-             hpc-coveralls ==0.9.0,
-             hPDB ==1.2.0.3,
-             hPDB-examples ==1.2.0.2,
-             hs-bibutils ==5.5,
-             hscolour ==1.22,
-             hsdev ==0.1.3.4,
-             hse-cpp ==0.1,
-             hsignal ==0.2.7,
-             hslogger ==1.2.9,
-             hslua ==0.3.13,
-             HsOpenSSL ==0.11.1.1,
-             hspec ==2.1.7,
-             hspec-attoparsec ==0.1.0.2,
-             hspec-core ==2.1.7,
-             hspec-discover ==2.1.7,
-             hspec-expectations ==0.6.1.1,
-             hspec-meta ==2.1.7,
-             hspec-smallcheck ==0.3.0,
-             hspec-wai ==0.6.3,
-             hspec-wai-json ==0.6.0,
-             hstatistics ==0.2.5.2,
-             HStringTemplate ==0.8.3,
-             hsyslog ==2.0,
-             HTF ==0.12.2.4,
-             html ==1.0.1.2,
-             html-conduit ==1.1.1.2,
-             HTTP ==4000.2.19,
-             http-client ==0.4.11.2,
-             http-client-openssl ==0.2.0.1,
+             hslogger ==1.2.1,
+             http-client ==0.4.11.1,
              http-client-tls ==0.2.2,
              http-conduit ==2.1.5,
-             http-date ==0.0.6.1,
-             http-media ==0.6.2,
-             http-reverse-proxy ==0.4.2,
-             http-types ==0.8.6,
-             HUnit ==1.2.5.2,
-             hweblib ==0.6.3,
-             hxt ==9.3.1.15,
-             hxt-charproperties ==9.2.0.1,
-             hxt-curl ==9.1.1.1,
-             hxt-expat ==9.1.1,
-             hxt-http ==9.1.5.2,
-             hxt-pickle-utils ==0.1.0.3,
-             hxt-regex-xmlschema ==9.2.0.2,
-             hxt-relaxng ==9.1.5.5,
-             hxt-tagsoup ==9.1.3,
-             hxt-unicode ==9.0.2.4,
-             hybrid-vectors ==0.1.2.1,
-             hyphenation ==0.4.2.1,
-             iconv ==0.4.1.2,
-             ide-backend ==0.9.0.9,
-             ide-backend-common ==0.9.1.1,
-             ide-backend-rts ==0.1.3.1,
-             idna ==0.3.0,
-             ieee754 ==0.7.6,
-             IfElse ==0.85,
-             imagesize-conduit ==1.1,
-             immortal ==0.2,
-             include-file ==0.1.0.2,
-             incremental-parser ==0.2.3.4,
-             indents ==0.3.3,
-             ini ==0.3.1,
-             integer-gmp installed,
-             integration ==0.2.1,
-             interpolate ==0.1.0,
-             interpolatedstring-perl6 ==0.9.0,
-             intervals ==0.7.1,
-             io-choice ==0.0.5,
-             io-manager ==0.1.0.2,
-             io-memoize ==1.1.1.0,
-             iproute ==1.3.2,
-             iterable ==3.0,
-             ixset ==1.0.6,
-             jmacro ==0.6.12,
-             jmacro-rpc ==0.3.2,
-             jmacro-rpc-happstack ==0.3.2,
-             jmacro-rpc-snap ==0.3,
-             jose-jwt ==0.4.2,
-             js-flot ==0.8.3,
-             js-jquery ==1.11.3,
-             json ==0.9.1,
-             json-autotype ==0.2.5.13,
-             json-schema ==0.7.3.5,
-             JuicyPixels ==3.2.4,
-             JuicyPixels-repa ==0.7,
-             kan-extensions ==4.2.2,
-             kansas-comet ==0.3.1,
-             kdt ==0.2.3,
-             keter ==1.3.10.1,
-             keys ==3.10.2,
-             kmeans ==0.1.3,
-             koofr-client ==1.0.0.3,
-             kure ==2.16.10,
-             language-c ==0.4.7,
-             language-c-quote ==0.10.2.1,
-             language-ecmascript ==0.17,
-             language-glsl ==0.1.1,
-             language-haskell-extract ==0.2.4,
-             language-java ==0.2.7,
-             language-javascript ==0.5.13.3,
-             lattices ==1.2.1.1,
-             lazy-csv ==0.5,
-             lca ==0.3,
-             lens ==4.7.0.1,
-             lens-action ==0.1.0.1,
-             lens-aeson ==1.0.0.4,
-             lens-family-core ==1.2.0,
-             lens-family-th ==0.4.1.0,
-             lhs2tex ==1.19,
-             libgit ==0.3.1,
-             libnotify ==0.1.1.0,
-             lifted-async ==0.7.0.1,
-             lifted-base ==0.2.3.6,
-             linear ==1.18.1.1,
-             linear-accelerate ==0.2,
-             List ==0.5.2,
-             ListLike ==4.2.0,
-             list-t ==0.4.5.1,
-             loch-th ==0.2.1,
-             log-domain ==0.10.0.1,
-             logict ==0.6.0.2,
-             loop ==0.2.0,
-             lrucache ==1.2.0.0,
-             lucid ==2.9.2,
-             lucid-svg ==0.4.0.4,
-             lzma-conduit ==1.1.3,
-             machines ==0.4.1,
-             machines-directory ==0.2.0.6,
-             machines-io ==0.2.0.6,
-             machines-process ==0.2.0.4,
-             mainland-pretty ==0.2.7.2,
-             managed ==1.0.0,
-             mandrill ==0.2.2.0,
-             map-syntax ==0.2,
-             markdown ==0.1.13.2,
-             markdown-unlit ==0.2.0.1,
-             math-functions ==0.1.5.2,
-             matrix ==0.3.4.3,
-             maximal-cliques ==0.1.1,
-             MaybeT ==0.1.2,
-             mbox ==0.3.1,
-             MemoTrie ==0.6.2,
-             mersenne-random-pure64 ==0.2.0.4,
-             messagepack ==0.3.0,
-             messagepack-rpc ==0.1.0.3,
-             MFlow ==0.4.5.9,
-             mime-mail ==0.4.8.2,
-             mime-mail-ses ==0.3.2.2,
-             mime-types ==0.1.0.6,
-             missing-foreign ==0.1.1,
-             MissingH ==1.3.0.1,
-             mmap ==0.5.9,
-             mmorph ==1.0.4,
-             MonadCatchIO-transformers ==0.3.1.3,
-             monad-control ==1.0.0.4,
-             monad-coroutine ==0.9.0.1,
-             monadcryptorandom ==0.6.1,
-             monadic-arrays ==0.2.1.4,
-             monad-journal ==0.7,
-             monadLib ==3.7.3,
-             monadloc ==0.7.1,
-             monad-logger ==0.3.13.1,
-             monad-logger-json ==0.1.0.0,
-             monad-logger-syslog ==0.1.1.1,
+             http-date ==0.0.2,
+             http-types ==0.8.5,
+             hxt ==9.3.1.4,
+             hxt-charproperties ==9.1.1.1,
+             hxt-regex-xmlschema ==9.0.4,
+             hxt-unicode ==9.0.2.2,
+             idna ==0.2,
+             iproute ==1.2.11,
+             json ==0.5,
+             keys ==3.10.1,
+             language-javascript ==0.5.13,
+             lens ==4.4.0.2,
+             libxml-sax ==0.7.5,
+             mime-mail ==0.4.1.2,
+             mime-types ==0.1.0.4,
+             mmorph ==1.0.3,
+             monad-control ==0.3.2.2,
+             monad-logger ==0.3.6.1,
              monad-loops ==0.4.2.1,
-             monad-par ==0.3.4.7,
-             monad-parallel ==0.7.1.4,
-             monad-par-extras ==0.3.3,
-             monad-primitive ==0.1,
-             monad-products ==4.0.0.1,
-             MonadPrompt ==1.0.0.5,
-             MonadRandom ==0.3.0.2,
-             monad-st ==0.2.4,
              monads-tf ==0.1.0.2,
-             mongoDB ==2.0.5,
-             monoid-extras ==0.3.3.5,
-             monoid-subclasses ==0.4.0.4,
-             mono-traversable ==0.9.1,
-             mtl ==2.1.3.1,
-             mtl-compat ==0.2.1.1,
-             mtlparse ==0.1.4.0,
-             mtl-prelude ==1.0.3,
-             multiarg ==0.30.0.8,
-             multimap ==1.2.1,
-             multipart ==0.1.2,
-             MusicBrainz ==0.2.4,
-             mutable-containers ==0.3.0,
-             mwc-random ==0.13.3.2,
-             mysql ==0.1.1.8,
-             mysql-simple ==0.2.2.5,
-             nanospec ==0.2.1,
-             nats ==1,
-             neat-interpolation ==0.2.2.1,
-             nettle ==0.1.0,
-             network ==2.6.1.0,
-             network-anonymous-i2p ==0.10.0,
-             network-attoparsec ==0.12.2,
+             mtl ==2.1.2,
+             nats ==0.1.2,
+             network ==2.4.1.2,
              network-conduit ==1.1.0,
-             network-conduit-tls ==1.1.2,
              network-info ==0.2.0.5,
-             network-multicast ==0.0.11,
-             network-simple ==0.4.0.4,
-             network-transport ==0.4.1.0,
-             network-transport-tcp ==0.4.1,
-             network-transport-tests ==0.2.2.0,
-             network-uri ==2.6.0.3,
-             newtype ==0.2,
-             nsis ==0.2.5,
-             numbers ==3000.2.0.1,
-             numeric-extras ==0.0.3,
-             NumInstances ==1.4,
-             numtype ==1.1,
-             ObjectName ==1.1.0.0,
-             Octree ==0.5.4.2,
-             old-locale installed,
-             OneTuple ==0.2.1,
-             opaleye ==0.3.1.2,
-             OpenGL ==2.12.0.1,
-             OpenGLRaw ==2.4.1.0,
-             openpgp-asciiarmor ==0.1,
-             operational ==0.2.3.2,
-             options ==1.2.1.1,
-             optparse-applicative ==0.11.0.2,
-             optparse-simple ==0.0.2,
-             osdkeys ==0.0,
-             pagerduty ==0.0.3.1,
-             palette ==0.1.0.2,
-             pandoc ==1.13.2.1,
-             pandoc-citeproc ==0.6.0.1,
-             pandoc-types ==1.12.4.2,
-             pango ==0.13.1.0,
-             parallel ==3.2.0.6,
-             parallel-io ==0.3.3,
-             parseargs ==0.1.5.2,
-             parsec ==3.1.9,
-             parsers ==0.12.2.1,
-             partial-handler ==0.1.1,
-             path-pieces ==0.2.0,
-             patience ==0.1.1,
-             pcre-heavy ==0.2.2,
-             pcre-light ==0.4.0.3,
-             pdfinfo ==1.5.4,
+             network-multicast ==0.0.10,
+             network-protocol-xmpp ==0.4.6,
+             network-uri ==2.6.0.1,
+             optparse-applicative ==0.10.0,
+             parallel ==3.2.0.4,
+             path-pieces ==0.1.4,
              pem ==0.2.2,
-             persistent ==2.1.5,
-             persistent-mongoDB ==2.1.2.2,
-             persistent-mysql ==2.1.3.1,
-             persistent-postgresql ==2.1.5.3,
-             persistent-sqlite ==2.1.4.2,
-             persistent-template ==2.1.3.1,
-             phantom-state ==0.2.0.2,
-             picoparsec ==0.1.2.2,
-             pipes ==4.1.5,
-             pipes-aeson ==0.4.1.3,
-             pipes-attoparsec ==0.5.1.2,
-             pipes-binary ==0.4.0.4,
-             pipes-bytestring ==2.1.1,
-             pipes-concurrency ==2.0.3,
-             pipes-group ==1.0.2,
-             pipes-network ==0.6.4,
-             pipes-parse ==3.0.2,
-             pipes-safe ==2.2.2,
-             placeholders ==0.1,
-             plot ==0.2.3.4,
-             plot-gtk ==0.2.0.2,
-             plot-gtk3 ==0.1,
-             pointed ==4.2.0.2,
-             polyparse ==1.11,
-             postgresql-binary ==0.5.2.1,
-             postgresql-libpq ==0.9.0.2,
-             postgresql-simple ==0.4.10.0,
-             post-mess-age ==0.1.0.0,
-             prednote ==0.32.0.6,
-             prefix-units ==0.1.0.2,
+             persistent ==1.3.3,
+             persistent-template ==1.3.2.2,
+             pointed ==4.0,
              prelude-extras ==0.4,
-             presburger ==1.3.1,
-             present ==2.2,
-             pretty installed,
-             prettyclass ==1.0.0.0,
-             pretty-class ==1.0.1.1,
-             pretty-show ==1.6.8.2,
-             primes ==0.2.1.0,
-             primitive ==0.6,
-             process installed,
-             process-extras ==0.3.3.4,
-             product-profunctors ==0.6.1,
-             profunctor-extras ==4.0,
-             profunctors ==4.4.1,
-             project-template ==0.1.4.2,
-             PSQueue ==1.1,
+             profunctors ==4.0.4,
              publicsuffixlist ==0.1,
              punycode ==2.0,
-             pure-io ==0.2.1,
-             pureMD5 ==2.1.2.1,
-             pwstore-fast ==2.4.4,
-             quandl-api ==0.2.1.0,
-             QuasiText ==0.1.2.5,
-             QuickCheck ==2.7.6,
-             quickcheck-assertions ==0.2.0,
-             quickcheck-instances ==0.3.11,
-             quickcheck-io ==0.1.1,
-             quickcheck-unicode ==1.0.0.1,
-             rainbow ==0.22.0.2,
-             random ==1.1,
-             random-fu ==0.2.6.2,
-             random-shuffle ==0.0.4,
-             random-source ==0.3.0.6,
-             rank1dynamic ==0.2.0.1,
-             Rasterific ==0.5.2.1,
-             rasterific-svg ==0.1.0.3,
-             raw-strings-qq ==1.0.2,
-             ReadArgs ==1.2.2,
-             reducers ==3.10.3.1,
-             reflection ==1.5.2.1,
-             RefSerialize ==0.3.1.4,
-             regex-applicative ==0.3.1,
+             random ==1.0.1.1,
+             ranges ==0.2.4,
+             reducers ==3.10.2.1,
+             reflection ==1.2.0.1,
              regex-base ==0.93.2,
              regex-compat ==0.95.1,
-             regex-pcre-builtin ==0.94.4.8.8.35,
              regex-posix ==0.95.2,
-             regexpr ==0.5.4,
              regex-tdfa ==1.2.0,
-             regex-tdfa-rc ==1.1.8.3,
-             regular ==0.3.4.4,
-             regular-xmlpickler ==0.2,
-             rematch ==0.2.0.0,
-             repa ==3.3.1.2,
-             repa-algorithms ==3.3.1.2,
-             repa-devil ==0.3.2.6,
-             repa-io ==3.3.1.2,
-             reroute ==0.2.3.0,
-             resource-pool ==0.2.3.2,
-             resourcet ==1.1.5,
-             rest-client ==0.5.0.3,
-             rest-core ==0.35.1,
-             rest-gen ==0.17.0.4,
-             rest-happstack ==0.2.10.8,
-             rest-snap ==0.1.17.18,
-             rest-stringmap ==0.2.0.4,
-             rest-types ==1.13.1,
-             rest-wai ==0.1.0.8,
-             rethinkdb-client-driver ==0.0.18,
-             retry ==0.6,
-             rev-state ==0.1,
-             rfc5051 ==0.1.0.3,
-             RSA ==2.1.0.1,
-             rts installed,
-             runmemo ==1.0.0.1,
-             rvar ==0.2.0.2,
-             safe ==0.3.9,
-             safecopy ==0.8.5,
-             sbv ==4.2,
-             scientific ==0.3.3.8,
-             scotty ==0.9.1,
-             scrobble ==0.2.1.1,
-             sdl2 ==1.3.1,
-             securemem ==0.1.7,
-             semigroupoid-extras ==4.0,
-             semigroupoids ==4.3,
-             semigroups ==0.16.2.2,
-             semver ==0.3.3.1,
-             sendfile ==0.7.9,
-             seqloc ==0.6.1.1,
-             servant ==0.2.2,
-             servant-client ==0.2.2,
-             servant-docs ==0.3.1,
-             servant-jquery ==0.2.2.1,
-             servant-server ==0.2.4,
-             setenv ==0.1.1.3,
-             set-monad ==0.2.0.0,
-             SHA ==1.6.4.2,
-             shake ==0.15.2,
-             shake-language-c ==0.6.4,
-             shakespeare ==2.0.5,
-             shakespeare-text ==1.1.0,
-             shell-conduit ==4.5.2,
-             shelltestrunner ==1.3.5,
-             shelly ==1.6.1.2,
+             resource-pool ==0.2.1.1,
+             resourcet ==1.1.2.3,
+             safe ==0.3.8,
+             securemem ==0.1.3,
+             semigroupoids ==4.2,
+             semigroups ==0.15.3,
+             shakespeare ==1.2.1.1,
+             shakespeare-css ==1.0.7.4,
+             shakespeare-i18n ==1.0.0.5,
+             shakespeare-js ==1.2.0.4,
              silently ==1.2.4.1,
-             simple-reflect ==0.3.2,
-             simple-sendfile ==0.2.20,
-             singletons ==1.1.2,
-             siphash ==1.0.3,
-             skein ==1.0.9.3,
-             slave-thread ==0.1.6,
-             smallcheck ==1.1.1,
-             smoothie ==0.1.3,
-             smtLib ==1.0.7,
-             snap ==0.14.0.4,
-             snap-core ==0.9.7.0,
-             snaplet-fay ==0.3.3.11,
-             snap-server ==0.9.5.1,
-             snowflake ==0.1.1.1,
-             soap ==0.2.2.5,
-             soap-openssl ==0.1.0.2,
-             soap-tls ==0.1.1.2,
+             simple-sendfile ==0.2.14,
+             skein ==1.0.9,
              socks ==0.5.4,
-             sodium ==0.11.0.3,
-             sourcemap ==0.1.3.0,
-             speculation ==1.5.0.2,
-             sphinx ==0.6.0.1,
              split ==0.2.2,
-             Spock ==0.7.9.0,
-             Spock-digestive ==0.1.0.0,
-             Spock-worker ==0.2.1.3,
-             spoon ==0.3.1,
-             sqlite-simple ==0.4.8.0,
-             srcloc ==0.4.1,
-             stackage ==0.7.2.0,
-             stackage-build-plan ==0.1.1.0,
-             stackage-cli ==0.1.0.2,
-             stackage-curator ==0.7.4,
-             stackage-install ==0.1.1.1,
-             stackage-types ==1.0.1.1,
-             stackage-update ==0.1.2,
-             stackage-upload ==0.1.0.5,
-             stateref ==0.3,
-             statestack ==0.2.0.4,
-             StateVar ==1.1.0.0,
-             statistics ==0.13.2.3,
-             statistics-linreg ==0.3,
-             stm ==2.4.4,
-             stm-chans ==3.0.0.3,
-             stm-conduit ==2.5.4,
-             stm-containers ==0.2.9,
-             stm-stats ==0.2.0.0,
-             storable-complex ==0.2.2,
-             storable-endian ==0.2.5,
-             streaming-commons ==0.1.12.1,
-             streams ==3.2,
-             strict ==0.3.2,
-             stringable ==0.1.3,
-             stringbuilder ==0.5.0,
-             string-conversions ==0.3.0.3,
-             stringprep ==1.0.0,
-             stringsearch ==0.3.6.6,
-             stylish-haskell ==0.5.13.0,
-             SVGFonts ==1.4.0.3,
-             svg-tree ==0.1.1,
-             syb ==0.4.4,
-             syb-with-class ==0.6.1.5,
-             symbol ==0.2.4,
-             system-canonicalpath ==0.3.2.0,
-             system-fileio ==0.3.16.3,
-             system-filepath ==0.4.13.4,
-             system-posix-redirect ==1.1.0.1,
-             tabular ==0.2.2.7,
-             tagged ==0.7.3,
-             tagshare ==0.0,
-             tagsoup ==0.13.3,
-             tagstream-conduit ==0.5.5.3,
-             tar ==0.4.1.0,
-             tardis ==0.3.0.0,
-             tasty ==0.10.1.2,
-             tasty-ant-xml ==1.0.1,
-             tasty-golden ==2.3.0.1,
-             tasty-hunit ==0.9.2,
-             tasty-kat ==0.0.3,
-             tasty-quickcheck ==0.8.3.2,
-             tasty-smallcheck ==0.8.0.1,
-             tasty-th ==0.1.3,
-             TCache ==0.12.0,
-             template-haskell installed,
-             temporary ==1.2.0.3,
-             temporary-rc ==1.2.0.3,
-             terminal-progress-bar ==0.0.1.4,
-             terminal-size ==0.3.0,
-             terminfo installed,
-             test-framework ==0.8.1.1,
-             test-framework-hunit ==0.3.0.1,
-             test-framework-quickcheck2 ==0.3.0.3,
-             test-framework-th ==0.2.4,
-             testing-feat ==0.4.0.2,
-             testpack ==2.1.3.0,
-             texmath ==0.8.2,
-             text ==1.2.0.6,
-             text-binary ==0.1.0,
-             text-format ==0.3.1.1,
-             text-icu ==0.7.0.1,
-             text-manipulate ==0.1.3.1,
+             stm ==2.4.2,
+             stm-chans ==3.0.0.2,
+             streaming-commons ==0.1.4.1,
+             stringprep ==0.1.5,
+             stringsearch ==0.3.6.5,
+             syb ==0.4.0,
+             system-fileio ==0.3.14,
+             system-filepath ==0.4.12,
+             tagged ==0.7.2,
+             tagsoup ==0.13.1,
+             tagstream-conduit ==0.5.5.1,
+             tasty ==0.10,
+             tasty-hunit ==0.9,
+             tasty-quickcheck ==0.8.1,
+             tasty-rerun ==1.1.3,
+             text ==1.1.1.0,
+             text-icu ==0.6.3.7,
              tf-random ==0.5,
-             th-desugar ==1.5.3,
-             th-expand-syns ==0.3.0.6,
-             th-extras ==0.0.0.2,
-             th-lift ==0.7.2,
-             th-orphans ==0.11.1,
-             threads ==0.5.1.3,
-             th-reify-many ==0.1.3,
-             thyme ==0.3.5.5,
-             time installed,
-             time-compat ==0.1.0.3,
-             time-lens ==0.4.0.1,
-             time-locale-compat ==0.1.0.1,
-             timezone-olson ==0.1.7,
-             timezone-series ==0.1.5.1,
-             tls ==1.2.17,
-             tls-debug ==0.3.4,
-             tostring ==0.2.1.1,
-             transformers-base ==0.4.4,
-             transformers-compat ==0.4.0.3,
-             traverse-with-class ==0.2.0.3,
-             tree-view ==0.4,
-             trifecta ==1.5.1.3,
-             tttool ==1.3,
-             tuple ==0.3.0.2,
-             turtle ==1.0.2,
-             type-eq ==0.5,
-             type-list ==0.0.0.1,
-             udbus ==0.2.1,
-             unbounded-delays ==0.1.0.9,
-             unbound-generics ==0.1.2.1,
-             union-find ==0.2,
-             uniplate ==1.6.12,
-             unix installed,
-             unix-compat ==0.4.1.4,
-             unix-time ==0.3.5,
-             unordered-containers ==0.2.5.1,
-             uri-encode ==1.5.0.4,
-             url ==2.1.3,
-             users ==0.1.0.0,
-             users-postgresql-simple ==0.1.0.1,
-             users-test ==0.1.0.0,
-             utf8-light ==0.4.2,
-             utf8-string ==1,
-             uuid ==1.3.10,
-             uuid-types ==1.0.1,
-             vault ==0.3.0.4,
-             vector ==0.10.12.3,
-             vector-algorithms ==0.6.0.4,
-             vector-binary-instances ==0.2.1.0,
-             vector-buffer ==0.4.1,
-             vector-instances ==3.3.0.1,
-             vector-space ==0.9,
-             vector-space-points ==0.2.1.1,
-             vector-th-unbox ==0.2.1.2,
-             vhd ==0.2.2,
-             void ==0.7,
-             wai ==3.0.2.3,
-             wai-app-static ==3.0.1.1,
-             wai-conduit ==3.0.0.2,
-             wai-eventsource ==3.0.0,
-             wai-extra ==3.0.7.1,
-             wai-handler-launch ==3.0.0.3,
-             wai-logger ==2.2.4,
-             wai-middleware-consul ==0.1.0.2,
-             wai-middleware-static ==0.6.0.1,
-             waitra ==0.0.3.0,
-             wai-websockets ==3.0.0.5,
-             warp ==3.0.13.1,
-             warp-tls ==3.0.3,
-             webdriver ==0.6.1,
-             web-fpco ==0.1.1.0,
-             websockets ==0.9.4.0,
-             wizards ==1.0.2,
-             wl-pprint ==1.1,
-             wl-pprint-extras ==3.5.0.4,
-             wl-pprint-terminfo ==3.7.1.3,
-             wl-pprint-text ==1.1.0.4,
-             word8 ==0.1.2,
-             wordpass ==1.0.0.3,
-             Workflow ==0.8.3,
-             wrap ==0.0.0,
-             wreq ==0.3.0.1,
-             X11 ==1.6.1.2,
-             x509 ==1.5.0.1,
-             x509-store ==1.5.0,
-             x509-system ==1.5.0,
-             x509-validation ==1.5.2,
-             xenstore ==0.1.1,
-             xhtml installed,
-             xml ==1.3.14,
-             xml-conduit ==1.2.6,
-             xml-conduit-writer ==0.1.1.1,
-             xmlgen ==0.6.2.1,
-             xml-hamlet ==0.4.0.11,
-             xmlhtml ==0.2.3.4,
-             xml-to-json ==2.0.1,
-             xml-to-json-fast ==2.0.0,
+             tls ==1.2.9,
+             transformers ==0.3.0.0,
+             transformers-base ==0.4.1,
+             transformers-compat ==0.3.3.3,
+             unbounded-delays ==0.1.0.8,
+             unix-compat ==0.4.1.3,
+             unix-time ==0.2.2,
+             unordered-containers ==0.2.5.0,
+             utf8-string ==0.3.7,
+             uuid ==1.3.3,
+             vault ==0.3.0.3,
+             vector ==0.10.0.1,
+             void ==0.6.1,
+             wai ==3.0.1.1,
+             wai-app-static ==3.0.0.1,
+             wai-extra ==3.0.1.2,
+             wai-logger ==2.1.1,
+             warp ==3.0.0.5,
+             warp-tls ==3.0.0,
+             word8 ==0.1.1,
+             x509 ==1.4.11,
+             x509-store ==1.4.4,
+             x509-system ==1.4.5,
+             x509-validation ==1.5.0,
+             xml ==1.3.13,
+             xml-conduit ==1.2.1,
+             xml-hamlet ==0.4.0.9,
              xml-types ==0.3.4,
-             xss-sanitize ==0.3.5.5,
-             yackage ==0.7.0.8,
-             yaml ==0.8.11,
-             Yampa ==0.9.7,
-             YampaSynth ==0.2,
-             yarr ==1.3.3.3,
-             yesod ==1.4.1.5,
-             yesod-auth ==1.4.5,
-             yesod-auth-deskcom ==1.4.0,
-             yesod-auth-fb ==1.6.6,
-             yesod-auth-hashdb ==1.4.2.1,
-             yesod-auth-oauth ==1.4.0.2,
-             yesod-auth-oauth2 ==0.0.12,
-             yesod-bin ==1.4.9.2,
-             yesod-core ==1.4.9.1,
-             yesod-eventsource ==1.4.0.1,
-             yesod-fay ==0.7.1,
-             yesod-fb ==0.3.4,
-             yesod-form ==1.4.4.1,
-             yesod-gitrepo ==0.1.1.0,
-             yesod-newsfeed ==1.4.0.1,
-             yesod-persistent ==1.4.0.2,
-             yesod-sitemap ==1.4.0.1,
-             yesod-static ==1.4.0.4,
-             yesod-test ==1.4.3.1,
-             yesod-text-markdown ==0.1.7,
-             yesod-websockets ==0.2.1.1,
-             zeromq4-haskell ==0.6.3,
-             zip-archive ==0.2.3.7,
-             zlib ==0.5.4.2,
-             zlib-bindings ==0.1.1.5,
-             zlib-enum ==0.2.3.1,
-             zlib-lens ==0.1.2
+             xss-sanitize ==0.3.5.2,
+             yaml ==0.8.9.3,
+             yesod ==1.2.6.1,
+             yesod-auth ==1.3.4.6,
+             yesod-core ==1.2.20.1,
+             yesod-default ==1.2.0,
+             yesod-form ==1.3.16,
+             yesod-persistent ==1.2.3.1,
+             yesod-routes ==1.2.0.7,
+             yesod-static ==1.2.4,
+             zlib ==0.5.4.1,
+             bytestring ==0.10.4.0,
+             scientific ==0.3.3.1,
+             clock ==0.4.6.0
diff --git a/standalone/android/haskell-patches/crypto-numbers_build-fix.patch b/standalone/android/haskell-patches/crypto-numbers_build-fix.patch
new file mode 100644
index 000000000..5c0693a31
--- /dev/null
+++ b/standalone/android/haskell-patches/crypto-numbers_build-fix.patch
@@ -0,0 +1,227 @@
+From 0cfdb30120976290068f4bcbebbf236b960afbb6 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Thu, 26 Dec 2013 20:01:30 -0400
+Subject: [PATCH] hack to build
+
+---
+ Crypto/Number/Basic.hs         |   14 --------------
+ Crypto/Number/ModArithmetic.hs |   29 -----------------------------
+ Crypto/Number/Prime.hs         |   18 ------------------
+ crypto-numbers.cabal           |    2 +-
+ 4 files changed, 1 insertion(+), 62 deletions(-)
+
+diff --git a/Crypto/Number/Basic.hs b/Crypto/Number/Basic.hs
+index 65c14b3..eaee853 100644
+--- a/Crypto/Number/Basic.hs
++++ b/Crypto/Number/Basic.hs
+@@ -20,11 +20,7 @@ module Crypto.Number.Basic
+     , areEven
+     ) where
+ 
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-import GHC.Integer.GMP.Internals
+-#else
+ import Data.Bits
+-#endif
+ 
+ -- | sqrti returns two integer (l,b) so that l <= sqrt i <= b
+ -- the implementation is quite naive, use an approximation for the first number
+@@ -63,25 +59,16 @@ sqrti i
+ -- gcde 'a' 'b' find (x,y,gcd(a,b)) where ax + by = d
+ --
+ gcde :: Integer -> Integer -> (Integer, Integer, Integer)
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-gcde a b = (s, t, g)
+-  where (# g, s #) = gcdExtInteger a b
+-        t = (g - s * a) `div` b
+-#else
+ gcde a b = if d < 0 then (-x,-y,-d) else (x,y,d) where
+     (d, x, y)                     = f (a,1,0) (b,0,1)
+     f t              (0, _, _)    = t
+     f (a', sa, ta) t@(b', sb, tb) =
+         let (q, r) = a' `divMod` b' in
+         f t (r, sa - (q * sb), ta - (q * tb))
+-#endif
+ 
+ -- | get the extended GCD of two integer using the extended binary algorithm (HAC 14.61)
+ -- get (x,y,d) where d = gcd(a,b) and x,y satisfying ax + by = d
+ gcde_binary :: Integer -> Integer -> (Integer, Integer, Integer)
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-gcde_binary = gcde
+-#else
+ gcde_binary a' b'
+     | b' == 0   = (1,0,a')
+     | a' >= b'  = compute a' b'
+@@ -105,7 +92,6 @@ gcde_binary a' b'
+              in if u2 >= v2
+                 then loop g x y (u2 - v2) v2 (a2 - c2) (b2 - d2) c2 d2
+                 else loop g x y u2 (v2 - u2) a2 b2 (c2 - a2) (d2 - b2)
+-#endif
+ 
+ -- | check if a list of integer are all even
+ areEven :: [Integer] -> Bool
+diff --git a/Crypto/Number/ModArithmetic.hs b/Crypto/Number/ModArithmetic.hs
+index 942c12f..f8cfc32 100644
+--- a/Crypto/Number/ModArithmetic.hs
++++ b/Crypto/Number/ModArithmetic.hs
+@@ -29,12 +29,8 @@ module Crypto.Number.ModArithmetic
+ import Control.Exception (throw, Exception)
+ import Data.Typeable
+ 
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-import GHC.Integer.GMP.Internals
+-#else
+ import Crypto.Number.Basic (gcde_binary)
+ import Data.Bits
+-#endif
+ 
+ -- | Raised when two numbers are supposed to be coprimes but are not.
+ data CoprimesAssertionError = CoprimesAssertionError
+@@ -55,13 +51,7 @@ expSafe :: Integer -- ^ base
+         -> Integer -- ^ exponant
+         -> Integer -- ^ modulo
+         -> Integer -- ^ result
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-expSafe b e m
+-    | odd m     = powModSecInteger b e m
+-    | otherwise = powModInteger b e m
+-#else
+ expSafe = exponentiation
+-#endif
+ 
+ -- | Compute the modular exponentiation of base^exponant using
+ -- the fastest algorithm without any consideration for
+@@ -74,11 +64,7 @@ expFast :: Integer -- ^ base
+         -> Integer -- ^ modulo
+         -> Integer -- ^ result
+ expFast =
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-    powModInteger
+-#else
+     exponentiation
+-#endif
+ 
+ -- note on exponentiation: 0^0 is treated as 1 for mimicking the standard library;
+ -- the mathematic debate is still open on whether or not this is true, but pratically
+@@ -87,22 +73,15 @@ expFast =
+ -- | exponentiation_rtl_binary computes modular exponentiation as b^e mod m
+ -- using the right-to-left binary exponentiation algorithm (HAC 14.79)
+ exponentiation_rtl_binary :: Integer -> Integer -> Integer -> Integer
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-exponentiation_rtl_binary = expSafe
+-#else
+ exponentiation_rtl_binary 0 0 m = 1 `mod` m
+ exponentiation_rtl_binary b e m = loop e b 1
+     where sq x          = (x * x) `mod` m
+           loop !0 _  !a = a `mod` m
+           loop !i !s !a = loop (i `shiftR` 1) (sq s) (if odd i then a * s else a)
+-#endif
+ 
+ -- | exponentiation computes modular exponentiation as b^e mod m
+ -- using repetitive squaring.
+ exponentiation :: Integer -> Integer -> Integer -> Integer
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-exponentiation = expSafe
+-#else
+ exponentiation b e m
+     | b == 1    = b
+     | e == 0    = 1
+@@ -110,7 +89,6 @@ exponentiation b e m
+     | even e    = let p = (exponentiation b (e `div` 2) m) `mod` m
+                    in (p^(2::Integer)) `mod` m
+     | otherwise = (b * exponentiation b (e-1) m) `mod` m
+-#endif
+ 
+ --{-# DEPRECATED exponantiation_rtl_binary "typo in API name it's called exponentiation_rtl_binary #-}
+ exponantiation_rtl_binary :: Integer -> Integer -> Integer -> Integer
+@@ -122,17 +100,10 @@ exponantiation = exponentiation
+ 
+ -- | inverse computes the modular inverse as in g^(-1) mod m
+ inverse :: Integer -> Integer -> Maybe Integer
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-inverse g m
+-    | r == 0    = Nothing
+-    | otherwise = Just r
+-  where r = recipModInteger g m
+-#else
+ inverse g m
+     | d > 1     = Nothing
+     | otherwise = Just (x `mod` m)
+   where (x,_,d) = gcde_binary g m
+-#endif
+ 
+ -- | Compute the modular inverse of 2 coprime numbers.
+ -- This is equivalent to inverse except that the result
+diff --git a/Crypto/Number/Prime.hs b/Crypto/Number/Prime.hs
+index 0cea9da..458c94d 100644
+--- a/Crypto/Number/Prime.hs
++++ b/Crypto/Number/Prime.hs
+@@ -3,9 +3,7 @@
+ #ifndef MIN_VERSION_integer_gmp
+ #define MIN_VERSION_integer_gmp(a,b,c) 0
+ #endif
+-#if MIN_VERSION_integer_gmp(0,5,1)
+ {-# LANGUAGE MagicHash #-}
+-#endif
+ -- |
+ -- Module      : Crypto.Number.Prime
+ -- License     : BSD-style
+@@ -30,12 +28,7 @@ import Crypto.Number.Generate
+ import Crypto.Number.Basic (sqrti, gcde_binary)
+ import Crypto.Number.ModArithmetic (exponantiation)
+ 
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-import GHC.Integer.GMP.Internals
+-import GHC.Base
+-#else
+ import Data.Bits
+-#endif
+ 
+ -- | returns if the number is probably prime.
+ -- first a list of small primes are implicitely tested for divisibility,
+@@ -78,21 +71,11 @@ findPrimeFromWith rng prop !n
+ -- | find a prime from a starting point with no specific property.
+ findPrimeFrom :: CPRG g => g -> Integer -> (Integer, g)
+ findPrimeFrom rng n =
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-    (nextPrimeInteger n, rng)
+-#else
+     findPrimeFromWith rng (\g _ -> (True, g)) n
+-#endif
+ 
+ -- | Miller Rabin algorithm return if the number is probably prime or composite.
+ -- the tries parameter is the number of recursion, that determines the accuracy of the test.
+ primalityTestMillerRabin :: CPRG g => g -> Int -> Integer -> (Bool, g)
+-#if MIN_VERSION_integer_gmp(0,5,1)
+-primalityTestMillerRabin rng (I# tries) !n =
+-    case testPrimeInteger n tries of
+-        0# -> (False, rng)
+-        _  -> (True, rng)
+-#else
+ primalityTestMillerRabin rng tries !n
+     | n <= 3     = error "Miller-Rabin requires tested value to be > 3"
+     | even n     = (False, rng)
+@@ -129,7 +112,6 @@ primalityTestMillerRabin rng tries !n
+                   | x2 == 1   = False
+                   | x2 /= nm1 = loop' ws ((x2*x2) `mod` n) (r+1)
+                   | otherwise = loop ws
+-#endif
+ 
+ {-
+     n < z -> witness to test
+diff --git a/crypto-numbers.cabal b/crypto-numbers.cabal
+index 9610e34..6669d78 100644
+--- a/crypto-numbers.cabal
++++ b/crypto-numbers.cabal
+@@ -15,7 +15,7 @@ Extra-Source-Files:  Tests/*.hs
+ 
+ Flag integer-gmp
+   Description: Are we using integer-gmp?
+-  Default: True
++  Default: False
+ 
+ Library
+   Build-Depends:     base >= 4 && < 5
+-- 
+1.7.10.4
+
diff --git a/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch b/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch
index 2b23c6d24..962a64207 100644
--- a/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch
+++ b/standalone/android/haskell-patches/dns_use-android-net.dns1-command-instead-of-resolv.conf.patch
@@ -1,6 +1,6 @@
-From e5072d9b721cc25fa1017df97d71bf926a78d4e5 Mon Sep 17 00:00:00 2001
+From 087f1ae5e17f0e6d7c9f6b4092a5bb5bb6f5bf60 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Fri, 3 Jul 2015 02:24:19 +0000
+Date: Thu, 16 Oct 2014 02:59:11 +0000
 Subject: [PATCH] port
 
 ---
@@ -9,48 +9,48 @@ Subject: [PATCH] port
  2 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/Network/DNS/Resolver.hs b/Network/DNS/Resolver.hs
-index 31f6373..6487c7b 100644
+index 5721e03..c4400d1 100644
 --- a/Network/DNS/Resolver.hs
 +++ b/Network/DNS/Resolver.hs
-@@ -18,7 +18,7 @@ module Network.DNS.Resolver (
-   , fromDNSFormat
+@@ -19,7 +19,7 @@ module Network.DNS.Resolver (
    ) where
  
+ import Control.Applicative ((<$>), (<*>), pure)
 -import Control.Exception (bracket)
 +import Control.Exception (bracket, catch, IOException)
+ import qualified Data.ByteString.Char8 as BS
  import Data.Char (isSpace)
  import Data.List (isPrefixOf)
- import Data.Maybe (fromMaybe)
-@@ -32,6 +32,7 @@ import Network.Socket (AddrInfoFlag(..), AddrInfo(..), SockAddr(..), PortNumber(
+@@ -32,6 +32,7 @@ import Network.Socket (AddrInfoFlag(..), AddrInfo(..), defaultHints, getAddrInfo
  import Prelude hiding (lookup)
  import System.Random (getStdRandom, randomR)
  import System.Timeout (timeout)
 +import System.Process
  
- #if __GLASGOW_HASKELL__ < 709
- import Control.Applicative ((<$>), (<*>), pure)
-@@ -136,10 +137,12 @@ makeResolvSeed conf = ResolvSeed <$> addr
+ #if mingw32_HOST_OS == 1
+ import Network.Socket (send)
+@@ -130,10 +131,12 @@ makeResolvSeed conf = ResolvSeed <$> addr
+   where
      addr = case resolvInfo conf of
-         RCHostName numhost -> makeAddrInfo numhost Nothing
-         RCHostPort numhost mport -> makeAddrInfo numhost $ Just mport
--        RCFilePath file -> toAddr <$> readFile file >>= \i -> makeAddrInfo i Nothing
+         RCHostName numhost -> makeAddrInfo numhost
+-        RCFilePath file -> toAddr <$> readFile file >>= makeAddrInfo
 -    toAddr cs = let l:_ = filter ("nameserver" `isPrefixOf`) $ lines cs
 -                in extract l
 -    extract = reverse . dropWhile isSpace . reverse . dropWhile isSpace . drop 11
 +        RCFilePath file -> do
 +		-- Android has no /etc/resolv.conf; use getprop command.
 +		ls <- catch (lines <$> readProcess "getprop" ["net.dns1"] []) (const (return []) :: IOException -> IO [String])
-+		flip makeAddrInfo Nothing $ case ls of
++		makeAddrInfo $ case ls of
 +			[] -> "8.8.8.8" -- google public dns as a fallback only
 +			(l:_) -> l
  
- makeAddrInfo :: HostName -> Maybe PortNumber -> IO AddrInfo
- makeAddrInfo addr mport = do
+ makeAddrInfo :: HostName -> IO AddrInfo
+ makeAddrInfo addr = do
 diff --git a/dns.cabal b/dns.cabal
-index 0745754..8cf4b67 100644
+index ceaf5f4..cd15e61 100644
 --- a/dns.cabal
 +++ b/dns.cabal
-@@ -39,6 +39,7 @@ Library
+@@ -37,6 +37,7 @@ Library
                        , network >= 2.3
                        , random
                        , resourcet
@@ -59,5 +59,5 @@ index 0745754..8cf4b67 100644
      Build-Depends:      base >= 4 && < 5
                        , attoparsec
 -- 
-2.1.4
+2.1.1
 
diff --git a/standalone/android/haskell-patches/entropy_cross-build.patch b/standalone/android/haskell-patches/entropy_cross-build.patch
deleted file mode 100644
index 4c27ac479..000000000
--- a/standalone/android/haskell-patches/entropy_cross-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8e942c1f661b30e5477607b78528634e6d345ae8 Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Thu, 2 Jul 2015 21:16:15 +0000
-Subject: [PATCH] cross build
-
----
- entropy.cabal | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/entropy.cabal b/entropy.cabal
-index e4fb436..e26896c 100644
---- a/entropy.cabal
-+++ b/entropy.cabal
-@@ -14,10 +14,7 @@ category:       Data, Cryptography
- homepage:       https://github.com/TomMD/entropy
- bug-reports:    https://github.com/TomMD/entropy/issues
- stability:      stable
---- build-type:  Simple
---- ^^ Used for HaLVM
--build-type:        Custom
---- ^^ Test for RDRAND support using 'ghc'
-+build-type:  Simple
- cabal-version:  >=1.10
- tested-with:    GHC == 7.8.2
- -- data-files:
--- 
-2.1.4
diff --git a/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch b/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
new file mode 100644
index 000000000..ff9d8f245
--- /dev/null
+++ b/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
@@ -0,0 +1,50 @@
+From afdec6c9e66211a0ac8419fffe191b059d1fd00c Mon Sep 17 00:00:00 2001
+From: foo <foo@bar>
+Date: Sun, 22 Sep 2013 17:24:33 +0000
+Subject: [PATCH] fix build with new base
+
+---
+ Data/Text/IDN/IDNA.chs       |    1 +
+ Data/Text/IDN/Punycode.chs   |    1 +
+ Data/Text/IDN/StringPrep.chs |    1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/Data/Text/IDN/IDNA.chs b/Data/Text/IDN/IDNA.chs
+index ed29ee4..dbb4ba5 100644
+--- a/Data/Text/IDN/IDNA.chs
++++ b/Data/Text/IDN/IDNA.chs
+@@ -31,6 +31,7 @@ import Foreign
+ import Foreign.C
+ 
+ import Data.Text.IDN.Internal
++import System.IO.Unsafe
+ 
+ #include <idna.h>
+ #include <idn-free.h>
+diff --git a/Data/Text/IDN/Punycode.chs b/Data/Text/IDN/Punycode.chs
+index 24b5fa6..4e62555 100644
+--- a/Data/Text/IDN/Punycode.chs
++++ b/Data/Text/IDN/Punycode.chs
+@@ -32,6 +32,7 @@ import Data.List (unfoldr)
+ import qualified Data.ByteString as B
+ import qualified Data.Text as T
+ 
++import System.IO.Unsafe
+ import Foreign
+ import Foreign.C
+ 
+diff --git a/Data/Text/IDN/StringPrep.chs b/Data/Text/IDN/StringPrep.chs
+index 752dc9e..5e9fd84 100644
+--- a/Data/Text/IDN/StringPrep.chs
++++ b/Data/Text/IDN/StringPrep.chs
+@@ -39,6 +39,7 @@ import qualified Data.ByteString as B
+ import qualified Data.Text as T
+ import qualified Data.Text.Encoding as TE
+ 
++import System.IO.Unsafe
+ import Foreign
+ import Foreign.C
+ 
+-- 
+1.7.10.4
+
diff --git a/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch b/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch
index 13cfbd232..bb9caec77 100644
--- a/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch
+++ b/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch
@@ -1,31 +1,31 @@
-From b2b88224426fe6c7c72ebdec2946fd1ddbacbfaf Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Thu, 2 Jul 2015 20:42:50 +0000
+From 7beec2e707d59f9573aa2dc7c57bd2a62f16b480 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Wed, 15 May 2013 19:06:03 -0400
 Subject: [PATCH] build without IPv6 stuff
 
 ---
- Data/IP.hs      | 2 +-
- Data/IP/Addr.hs | 3 +++
+ Data/IP.hs      |    2 +-
+ Data/IP/Addr.hs |    3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/Data/IP.hs b/Data/IP.hs
-index 306a488..e3f252e 100644
+index cffef93..ea486c9 100644
 --- a/Data/IP.hs
 +++ b/Data/IP.hs
 @@ -6,7 +6,7 @@ module Data.IP (
    -- ** IP data
      IP (..)
    , IPv4, toIPv4, fromIPv4, fromHostAddress, toHostAddress
--  , IPv6, toIPv6, toIPv6b, fromIPv6, fromIPv6b, fromHostAddress6, toHostAddress6
-+  , IPv6, toIPv6, toIPv6b, fromIPv6, fromIPv6b -- , fromHostAddress6, toHostAddress6
+-  , IPv6, toIPv6, fromIPv6, fromHostAddress6, toHostAddress6
++  , IPv6, toIPv6, fromIPv6 -- , fromHostAddress6, toHostAddress6
    -- ** IP range data
    , IPRange (..)
    , AddrRange (addr, mask, mlen)
 diff --git a/Data/IP/Addr.hs b/Data/IP/Addr.hs
-index 8d4131e..868a572 100644
+index faaf0c7..5b556fb 100644
 --- a/Data/IP/Addr.hs
 +++ b/Data/IP/Addr.hs
-@@ -376,6 +376,7 @@ toHostAddress (IP4 addr4)
+@@ -312,6 +312,7 @@ toHostAddress (IP4 addr4)
    | byteOrder == LittleEndian = fixByteOrder addr4
    | otherwise                 = addr4
  
@@ -33,7 +33,7 @@ index 8d4131e..868a572 100644
  -- | The 'fromHostAddress6' function converts 'HostAddress6' to 'IPv6'.
  fromHostAddress6 :: HostAddress6 -> IPv6
  fromHostAddress6 = IP6
-@@ -384,6 +385,8 @@ fromHostAddress6 = IP6
+@@ -320,6 +321,8 @@ fromHostAddress6 = IP6
  toHostAddress6 :: IPv6 -> HostAddress6
  toHostAddress6 (IP6 addr6) = addr6
  
@@ -43,5 +43,5 @@ index 8d4131e..868a572 100644
  fixByteOrder s = d1 .|. d2 .|. d3 .|. d4
    where
 -- 
-2.1.4
+1.7.10.4
 
diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch b/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch
index e4ebc3ef4..5b07f233b 100644
--- a/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch
+++ b/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch
@@ -1,17 +1,17 @@
-From 508b4701c1610d9772564b97a74b5fa01dab48e2 Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Thu, 2 Jul 2015 20:12:59 +0000
+From 7861b133bb269b50fcf709291449cb0473818902 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Sun, 29 Dec 2013 21:29:23 +0000
 Subject: [PATCH] remove Network.BSD symbols not available in bionic
 
 ---
- Network/BSD.hsc | 100 --------------------------------------------------------
- 1 file changed, 100 deletions(-)
+ Network/BSD.hsc |   98 -------------------------------------------------------
+ 1 file changed, 98 deletions(-)
 
 diff --git a/Network/BSD.hsc b/Network/BSD.hsc
-index b5e9a26..f085f2a 100644
+index d6dae85..27910f4 100644
 --- a/Network/BSD.hsc
 +++ b/Network/BSD.hsc
-@@ -27,15 +27,6 @@ module Network.BSD
+@@ -30,15 +30,6 @@ module Network.BSD
      , getHostByAddr
      , hostAddress
  
@@ -27,7 +27,7 @@ index b5e9a26..f085f2a 100644
      -- * Service names
      , ServiceEntry(..)
      , ServiceName
-@@ -61,14 +52,6 @@ module Network.BSD
+@@ -64,14 +55,6 @@ module Network.BSD
      , getProtocolNumber
      , defaultProtocol
  
@@ -42,7 +42,7 @@ index b5e9a26..f085f2a 100644
      -- * Port numbers
      , PortNumber
  
-@@ -80,11 +63,7 @@ module Network.BSD
+@@ -83,11 +66,7 @@ module Network.BSD
  #if !defined(cygwin32_HOST_OS) && !defined(mingw32_HOST_OS) && !defined(_WIN32)
      , getNetworkByName
      , getNetworkByAddr
@@ -52,9 +52,9 @@ index b5e9a26..f085f2a 100644
 -    , getNetworkEntry
 -    , endNetworkEntry
  #endif
+     ) where
  
- #if defined(HAVE_IF_NAMETOINDEX)
-@@ -298,31 +277,6 @@ getProtocolNumber proto = do
+@@ -303,31 +282,6 @@ getProtocolNumber proto = do
   (ProtocolEntry _ _ num) <- getProtocolByName proto
   return num
  
@@ -62,18 +62,18 @@ index b5e9a26..f085f2a 100644
 -getProtocolEntry :: IO ProtocolEntry    -- Next Protocol Entry from DB
 -getProtocolEntry = withLock $ do
 - ent <- throwNoSuchThingIfNull "getProtocolEntry" "no such protocol entry"
--                $ c_getprotoent
+-                $ trySysCall c_getprotoent
 - peek ent
 -
 -foreign import ccall unsafe  "getprotoent" c_getprotoent :: IO (Ptr ProtocolEntry)
 -
 -setProtocolEntry :: Bool -> IO ()       -- Keep DB Open ?
--setProtocolEntry flg = withLock $ c_setprotoent (fromBool flg)
+-setProtocolEntry flg = withLock $ trySysCall $ c_setprotoent (fromBool flg)
 -
 -foreign import ccall unsafe "setprotoent" c_setprotoent :: CInt -> IO ()
 -
 -endProtocolEntry :: IO ()
--endProtocolEntry = withLock $ c_endprotoent
+-endProtocolEntry = withLock $ trySysCall $ c_endprotoent
 -
 -foreign import ccall unsafe "endprotoent" c_endprotoent :: IO ()
 -
@@ -86,7 +86,7 @@ index b5e9a26..f085f2a 100644
  -- ---------------------------------------------------------------------------
  -- Host lookups
  
-@@ -397,31 +351,6 @@ getHostByAddr family addr = do
+@@ -402,31 +356,6 @@ getHostByAddr family addr = do
  foreign import CALLCONV safe "gethostbyaddr"
     c_gethostbyaddr :: Ptr HostAddress -> CInt -> CInt -> IO (Ptr HostEntry)
  
@@ -94,13 +94,13 @@ index b5e9a26..f085f2a 100644
 -getHostEntry :: IO HostEntry
 -getHostEntry = withLock $ do
 - throwNoSuchThingIfNull         "getHostEntry" "unable to retrieve host entry"
--   $ c_gethostent
+-   $ trySysCall $ c_gethostent
 - >>= peek
 -
 -foreign import ccall unsafe "gethostent" c_gethostent :: IO (Ptr HostEntry)
 -
 -setHostEntry :: Bool -> IO ()
--setHostEntry flg = withLock $ c_sethostent (fromBool flg)
+-setHostEntry flg = withLock $ trySysCall $ c_sethostent (fromBool flg)
 -
 -foreign import ccall unsafe "sethostent" c_sethostent :: CInt -> IO ()
 -
@@ -118,14 +118,14 @@ index b5e9a26..f085f2a 100644
  -- ---------------------------------------------------------------------------
  -- Accessing network information
  
-@@ -483,35 +412,6 @@ getNetworkByAddr addr family = withLock $ do
+@@ -488,33 +417,6 @@ getNetworkByAddr addr family = withLock $ do
  foreign import ccall unsafe "getnetbyaddr"
     c_getnetbyaddr  :: NetworkAddr -> CInt -> IO (Ptr NetworkEntry)
  
 -getNetworkEntry :: IO NetworkEntry
 -getNetworkEntry = withLock $ do
 - throwNoSuchThingIfNull "getNetworkEntry" "no more network entries"
--          $ c_getnetent
+-          $ trySysCall $ c_getnetent
 - >>= peek
 -
 -foreign import ccall unsafe "getnetent" c_getnetent :: IO (Ptr NetworkEntry)
@@ -134,13 +134,13 @@ index b5e9a26..f085f2a 100644
 --- whether a connection is maintained open between various
 --- networkEntry calls
 -setNetworkEntry :: Bool -> IO ()
--setNetworkEntry flg = withLock $ c_setnetent (fromBool flg)
+-setNetworkEntry flg = withLock $ trySysCall $ c_setnetent (fromBool flg)
 -
 -foreign import ccall unsafe "setnetent" c_setnetent :: CInt -> IO ()
 -
 --- | Close the connection to the network name database.
 -endNetworkEntry :: IO ()
--endNetworkEntry = withLock $ c_endnetent
+-endNetworkEntry = withLock $ trySysCall $ c_endnetent
 -
 -foreign import ccall unsafe "endnetent" c_endnetent :: IO ()
 -
@@ -149,11 +149,9 @@ index b5e9a26..f085f2a 100644
 -getNetworkEntries stayOpen = do
 -  setNetworkEntry stayOpen
 -  getEntries (getNetworkEntry) (endNetworkEntry)
--#endif
--
- -- ---------------------------------------------------------------------------
- -- Interface names
+ #endif
  
+ -- Mutex for name service lockdown
 -- 
-2.1.4
+1.7.10.4
 
diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch
index 932bfe3da..084d355ba 100644
--- a/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch
+++ b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch
@@ -1,6 +1,6 @@
-From 21af25e922b00171c07f951a235ff7d7edbbd2be Mon Sep 17 00:00:00 2001
+From 478fc7ae42030c1345e75727e54e1f8f895d3e22 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Thu, 2 Jul 2015 20:14:40 +0000
+Date: Wed, 15 Oct 2014 15:16:21 +0000
 Subject: [PATCH] avoid accept4
 
 ---
@@ -8,19 +8,19 @@ Subject: [PATCH] avoid accept4
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Network/Socket.hsc b/Network/Socket.hsc
-index 6553bfc..802a7e9 100644
+index 2fe62ee..94db7a4 100644
 --- a/Network/Socket.hsc
 +++ b/Network/Socket.hsc
-@@ -489,7 +489,7 @@ accept sock@(MkSocket s family stype protocol status) = do
-                 return new_sock
+@@ -511,7 +511,7 @@ accept sock@(MkSocket s family stype protocol status) = do
  #else
       with (fromIntegral sz) $ \ ptr_len -> do
+      new_sock <-
 -# ifdef HAVE_ACCEPT4
 +#if 0
-      new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept"
+                  throwSocketErrorIfMinus1RetryMayBlock "accept"
                          (threadWaitRead (fromIntegral s))
                          (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK))
-@@ -1565,7 +1565,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
+@@ -1602,7 +1602,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
    c_connect :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt
  foreign import CALLCONV unsafe "accept"
    c_accept :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> IO CInt
@@ -30,5 +30,5 @@ index 6553bfc..802a7e9 100644
    c_accept4 :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> CInt -> IO CInt
  #endif
 -- 
-2.1.4
+2.1.1
 
diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0006-build-fixes.patch b/standalone/android/haskell-patches/network_2.4.1.0_0006-build-fixes.patch
deleted file mode 100644
index f7cf7c747..000000000
--- a/standalone/android/haskell-patches/network_2.4.1.0_0006-build-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cf110acc7f5863bb80ba835a009a7f59d3453239 Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Thu, 2 Jul 2015 20:19:14 +0000
-Subject: [PATCH] fix build
-
----
- Network/BSD.hsc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Network/BSD.hsc b/Network/BSD.hsc
-index e11ac71..039d0f1 100644
---- a/Network/BSD.hsc
-+++ b/Network/BSD.hsc
-@@ -396,7 +396,6 @@ instance Storable NetworkEntry where
-    poke _p = error "Storable.poke(BSD.NetEntry) not implemented"
- 
- 
--#if !defined(cygwin32_HOST_OS) && !defined(mingw32_HOST_OS) && !defined(_WIN32)
- getNetworkByName :: NetworkName -> IO NetworkEntry
- getNetworkByName name = withLock $ do
-  withCString name $ \ name_cstr -> do
--- 
-2.1.4
-
diff --git a/standalone/android/haskell-patches/optparse-applicative_remove-ANN.patch b/standalone/android/haskell-patches/optparse-applicative_remove-ANN.patch
deleted file mode 100644
index 1bb843524..000000000
--- a/standalone/android/haskell-patches/optparse-applicative_remove-ANN.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b128590966d4946219e45e2efd88acf7a354abc2 Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Tue, 14 Oct 2014 02:28:02 +0000
-Subject: [PATCH] remove ANN
-
----
- Options/Applicative.hs           |    2 --
- Options/Applicative/Help/Core.hs |    2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/Options/Applicative.hs b/Options/Applicative.hs
-index bd4129d..f412062 100644
---- a/Options/Applicative.hs
-+++ b/Options/Applicative.hs
-@@ -34,5 +34,3 @@ import Options.Applicative.Common
- import Options.Applicative.Builder
- import Options.Applicative.Builder.Completer
- import Options.Applicative.Extra
--
--{-# ANN module "HLint: ignore Use import/export shortcut" #-}
-diff --git a/Options/Applicative/Help/Core.hs b/Options/Applicative/Help/Core.hs
-index 0a79169..3f1ce3f 100644
---- a/Options/Applicative/Help/Core.hs
-+++ b/Options/Applicative/Help/Core.hs
-@@ -139,5 +139,3 @@ parserUsage pprefs p progn = hsep
-   [ string "Usage:"
-   , string progn
-   , align (extractChunk (briefDesc pprefs p)) ]
--
--{-# ANN footerHelp "HLint: ignore Eta reduce" #-}
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/profunctors_3.3-0001-fix-cross-build.patch b/standalone/android/haskell-patches/profunctors_3.3-0001-fix-cross-build.patch
deleted file mode 100644
index 45397f3e5..000000000
--- a/standalone/android/haskell-patches/profunctors_3.3-0001-fix-cross-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 392602f5ff14c0b5a801397d075ddcbcd890aa83 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Thu, 18 Apr 2013 17:50:59 -0400
-Subject: [PATCH] fix cross build
-
----
- src/Data/Profunctor/Unsafe.hs | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/Data/Profunctor/Unsafe.hs b/src/Data/Profunctor/Unsafe.hs
-index 025c7c4..0249274 100644
---- a/src/Data/Profunctor/Unsafe.hs
-+++ b/src/Data/Profunctor/Unsafe.hs
-@@ -40,9 +40,6 @@ import Data.Tagged
- import Prelude hiding (id,(.),sequence)
- import Unsafe.Coerce
- 
--{-# ANN module "Hlint: ignore Redundant lambda" #-}
--{-# ANN module "Hlint: ignore Collapse lambdas" #-}
--
- infixr 9 #.
- infixl 8 .#
- 
--- 
-1.8.2.rc3
-
diff --git a/standalone/android/haskell-patches/shakespeare-text_remove-TH.patch b/standalone/android/haskell-patches/shakespeare-text_remove-TH.patch
new file mode 100644
index 000000000..ece906f4b
--- /dev/null
+++ b/standalone/android/haskell-patches/shakespeare-text_remove-TH.patch
@@ -0,0 +1,153 @@
+From dca2a30ca06865bf66cd25cc14b06f5d28190231 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Thu, 16 Oct 2014 02:46:57 +0000
+Subject: [PATCH] remove TH
+
+---
+ Text/Shakespeare/Text.hs | 125 +++++------------------------------------------
+ 1 file changed, 11 insertions(+), 114 deletions(-)
+
+diff --git a/Text/Shakespeare/Text.hs b/Text/Shakespeare/Text.hs
+index 6865a5a..e25a8be 100644
+--- a/Text/Shakespeare/Text.hs
++++ b/Text/Shakespeare/Text.hs
+@@ -7,18 +7,18 @@ module Text.Shakespeare.Text
+     ( TextUrl
+     , ToText (..)
+     , renderTextUrl
+-    , stext
+-    , text
+-    , textFile
+-    , textFileDebug
+-    , textFileReload
+-    , st -- | strict text
+-    , lt -- | lazy text, same as stext :)
++    --, stext
++    --, text
++    --, textFile
++    --, textFileDebug
++    --, textFileReload
++    --, st -- | strict text
++    --, lt -- | lazy text, same as stext :)
+     -- * Yesod code generation
+-    , codegen
+-    , codegenSt
+-    , codegenFile
+-    , codegenFileReload
++    --, codegen
++    --, codegenSt
++    --, codegenFile
++    --, codegenFileReload
+     ) where
+ 
+ import Language.Haskell.TH.Quote (QuasiQuoter (..))
+@@ -45,106 +45,3 @@ instance ToText Int32 where toText = toText . show
+ instance ToText Int64 where toText = toText . show
+ instance ToText Int   where toText = toText . show
+ 
+-settings :: Q ShakespeareSettings
+-settings = do
+-  toTExp <- [|toText|]
+-  wrapExp <- [|id|]
+-  unWrapExp <- [|id|]
+-  return $ defaultShakespeareSettings { toBuilder = toTExp
+-  , wrap = wrapExp
+-  , unwrap = unWrapExp
+-  }
+-
+-
+-stext, lt, st, text :: QuasiQuoter
+-stext = 
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- settings
+-    render <- [|toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-lt = stext
+-
+-st = 
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- settings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-
+-text = QuasiQuoter { quoteExp = \s -> do
+-    rs <- settings
+-    quoteExp (shakespeare rs) $ filter (/='\r') s
+-    }
+-
+-
+-textFile :: FilePath -> Q Exp
+-textFile fp = do
+-    rs <- settings
+-    shakespeareFile rs fp
+-
+-
+-textFileDebug :: FilePath -> Q Exp
+-textFileDebug = textFileReload
+-{-# DEPRECATED textFileDebug "Please use textFileReload instead" #-}
+-
+-textFileReload :: FilePath -> Q Exp
+-textFileReload fp = do
+-    rs <- settings
+-    shakespeareFileReload rs fp
+-
+--- | codegen is designed for generating Yesod code, including templates
+--- So it uses different interpolation characters that won't clash with templates.
+-codegenSettings :: Q ShakespeareSettings
+-codegenSettings = do
+-  toTExp <- [|toText|]
+-  wrapExp <- [|id|]
+-  unWrapExp <- [|id|]
+-  return $ defaultShakespeareSettings { toBuilder = toTExp
+-  , wrap = wrapExp
+-  , unwrap = unWrapExp
+-  , varChar = '~'
+-  , urlChar = '*'
+-  , intChar = '&'
+-  , justVarInterpolation = True -- always!
+-  }
+-
+--- | codegen is designed for generating Yesod code, including templates
+--- So it uses different interpolation characters that won't clash with templates.
+--- You can use the normal text quasiquoters to generate code
+-codegen :: QuasiQuoter
+-codegen =
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- codegenSettings
+-    render <- [|toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-
+--- | Generates strict Text
+--- codegen is designed for generating Yesod code, including templates
+--- So it uses different interpolation characters that won't clash with templates.
+-codegenSt :: QuasiQuoter
+-codegenSt =
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- codegenSettings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-
+-codegenFileReload :: FilePath -> Q Exp
+-codegenFileReload fp = do
+-    rs <- codegenSettings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFileReload rs{ justVarInterpolation = True } fp
+-    return (render `AppE` rendered)
+-
+-codegenFile :: FilePath -> Q Exp
+-codegenFile fp = do
+-    rs <- codegenSettings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFile rs{ justVarInterpolation = True } fp
+-    return (render `AppE` rendered)
+-- 
+2.1.1
+
diff --git a/standalone/android/haskell-patches/skein_hardcode_little-endian.patch b/standalone/android/haskell-patches/skein_hardcode_little-endian.patch
deleted file mode 100644
index 7333742b0..000000000
--- a/standalone/android/haskell-patches/skein_hardcode_little-endian.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3a04b41ffce4e4e87b0fedd3a1e3434a3f06cc76 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 00:18:12 +0000
-Subject: [PATCH] hardcode little endian
-
-This is the same as building with a cabal flag.
-
----
- c_impl/optimized/skein_port.h |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/c_impl/optimized/skein_port.h b/c_impl/optimized/skein_port.h
-index a2d0fc2..6929bb0 100644
---- a/c_impl/optimized/skein_port.h
-+++ b/c_impl/optimized/skein_port.h
-@@ -45,6 +45,7 @@ typedef uint64_t        u64b_t;             /* 64-bit unsigned integer */
-  * platform-specific code instead (e.g., for big-endian CPUs).

-  *

-  */

-+#define SKEIN_NEED_SWAP  (0)

- #ifndef SKEIN_NEED_SWAP /* compile-time "override" for endianness? */

- 

- #include "brg_endian.h"                     /* get endianness selection */

--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
index 3f7d2aae7..16c4f92a2 100644
--- a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
+++ b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
@@ -1,6 +1,6 @@
-From da127aa3b2c6cbf679950eb593eb8c88384cc26b Mon Sep 17 00:00:00 2001
+From db9eb179885874af342bb2c3adef7185496ba1f1 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Thu, 2 Jul 2015 20:34:05 +0000
+Date: Wed, 15 Oct 2014 16:37:32 +0000
 Subject: [PATCH] hack for bionic
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH] hack for bionic
  2 files changed, 1 insertion(+), 13 deletions(-)
 
 diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc
-index 6253b27..fb5b3fa 100644
+index d30f39b..ec7ca4c 100644
 --- a/Data/UnixTime/Types.hsc
 +++ b/Data/UnixTime/Types.hsc
-@@ -12,8 +12,6 @@ import Data.Binary
+@@ -9,8 +9,6 @@ import Foreign.Storable
  
  #include <sys/time.h>
  
@@ -20,8 +20,8 @@ index 6253b27..fb5b3fa 100644
 -
  -- |
  -- Data structure for Unix time.
- --
-@@ -33,16 +31,6 @@ data UnixTime = UnixTime {
+ data UnixTime = UnixTime {
+@@ -20,16 +18,6 @@ data UnixTime = UnixTime {
    , utMicroSeconds :: {-# UNPACK #-} !Int32
    } deriving (Eq,Ord,Show)
  
@@ -35,14 +35,14 @@ index 6253b27..fb5b3fa 100644
 -            (#poke struct timeval, tv_sec)  ptr (utSeconds ut)
 -            (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut)
 -
- #if __GLASGOW_HASKELL__ >= 704
- instance Binary UnixTime where
-         put (UnixTime (CTime sec) msec) = do
+ -- |
+ -- Format of the strptime()/strftime() style.
+ type Format = ByteString
 diff --git a/cbits/conv.c b/cbits/conv.c
-index 669cfda..8fa5f9a 100644
+index ec31fef..b7bc0f9 100644
 --- a/cbits/conv.c
 +++ b/cbits/conv.c
-@@ -98,7 +98,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) {
+@@ -96,7 +96,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) {
  #else
      strptime(src, fmt, &dst);
  #endif
@@ -52,5 +52,5 @@ index 669cfda..8fa5f9a 100644
  
  size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) {
 -- 
-2.1.4
+2.1.1
 
diff --git a/standalone/android/haskell-patches/uuid_build-without-v1-uuid-which-needs-network-info.patch b/standalone/android/haskell-patches/uuid_build-without-v1-uuid-which-needs-network-info.patch
index 048a87fab..12cb2a922 100644
--- a/standalone/android/haskell-patches/uuid_build-without-v1-uuid-which-needs-network-info.patch
+++ b/standalone/android/haskell-patches/uuid_build-without-v1-uuid-which-needs-network-info.patch
@@ -1,15 +1,16 @@
-From 04a1230cf4d740d37ab427165eef4b4db2a3898f Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Fri, 3 Jul 2015 02:20:42 +0000
-Subject: [PATCH] build without v1 uuid which needs network-info
+From 87283f9b6f992a7f0e36c7b1bafc288bf2bf106a Mon Sep 17 00:00:00 2001
+From: androidbuilder <androidbuilder@example.com>
+Date: Mon, 11 Nov 2013 02:46:27 +0000
+Subject: [PATCH] build without v1 uuid which needs network-ino
 
 ---
- Data/UUID/Util.hs | 11 -----------
- uuid.cabal        |  2 --
- 2 files changed, 13 deletions(-)
+ Data/UUID/Util.hs |   11 -----------
+ Data/UUID/V1.hs   |    2 --
+ uuid.cabal        |    2 --
+ 3 files changed, 15 deletions(-)
 
 diff --git a/Data/UUID/Util.hs b/Data/UUID/Util.hs
-index 8817f51..0d43b01 100644
+index 581391a..399e508 100644
 --- a/Data/UUID/Util.hs
 +++ b/Data/UUID/Util.hs
 @@ -3,7 +3,6 @@ module Data.UUID.Util (
@@ -23,37 +24,49 @@ index 8817f51..0d43b01 100644
 @@ -13,7 +12,6 @@ import Data.Word
  import Data.Word.Util
  import Data.Bits
- import Data.UUID.Types.Internal
+ import Data.UUID.Internal
 -import Network.Info
  import Data.Int (Int64)
  
  version :: UUID -> Int
-@@ -42,12 +40,3 @@ extractTime uuid =
- 
+@@ -43,12 +41,3 @@ extractTime uuid =
  timeAndVersionToTime :: Word16 -> Word16
  timeAndVersionToTime tv = tv .&. 0x0FFF
--
+ 
 -extractMac :: UUID -> Maybe MAC
--extractMac uuid =
+-extractMac uuid = 
 -  if version uuid == 1
--  then Just $
+-  then Just $ 
 -       MAC (node_0 unpacked) (node_1 unpacked) (node_2 unpacked) (node_3 unpacked) (node_4 unpacked) (node_5 unpacked)
 -  else Nothing
 -  where
 -    unpacked = unpack uuid
+-
+diff --git a/Data/UUID/V1.hs b/Data/UUID/V1.hs
+index 067e729..ca4c235 100644
+--- a/Data/UUID/V1.hs
++++ b/Data/UUID/V1.hs
+@@ -37,8 +37,6 @@ import System.IO.Unsafe
+ 
+ import qualified System.Random as R
+ 
+-import Network.Info
+-
+ import Data.UUID.Builder
+ import Data.UUID.Internal
+ 
 diff --git a/uuid.cabal b/uuid.cabal
-index 2fa548b..9d86fd2 100644
+index 0a53059..57b1b86 100644
 --- a/uuid.cabal
 +++ b/uuid.cabal
-@@ -30,7 +30,6 @@ Library
-                 binary >= 0.4 && < 0.8,
-                 bytestring >= 0.9 && < 0.11,
+@@ -32,14 +32,12 @@ Library
                  cryptohash >= 0.7 && < 0.12,
+                 deepseq == 1.3.*,
+                 hashable (>= 1.1.1.0 && < 1.2.0) || (>= 1.2.1 && < 1.3),
 -                network-info == 0.2.*,
-                 random >= 1.0.1 && < 1.2,
-                 time >= 1.1 && < 1.6,
-                 uuid-types >= 1.0 && < 2
-@@ -38,7 +37,6 @@ Library
+                 random >= 1.0.1 && < 1.1,
+                 time >= 1.1 && < 1.5
+ 
   Exposed-Modules:
     Data.UUID
     Data.UUID.Util
@@ -62,5 +75,5 @@ index 2fa548b..9d86fd2 100644
     Data.UUID.V4
     Data.UUID.V5
 -- 
-2.1.4
+1.7.10.4
 
diff --git a/standalone/android/haskell-patches/vector_cross-build.patch b/standalone/android/haskell-patches/vector_cross-build.patch
deleted file mode 100644
index 2abc30599..000000000
--- a/standalone/android/haskell-patches/vector_cross-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6ffd4fcb7d27ec6df709d80a40a262406446a259 Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Wed, 15 Oct 2014 17:00:56 +0000
-Subject: [PATCH] cross build
-
----
- Data/Vector/Fusion/Stream/Monadic.hs |  1 -
- 2 files changed, 14 deletions(-)
-
-diff --git a/Data/Vector/Fusion/Stream/Monadic.hs b/Data/Vector/Fusion/Stream/Monadic.hs
-index 51fec75..b089b3d 100644
---- a/Data/Vector/Fusion/Stream/Monadic.hs
-+++ b/Data/Vector/Fusion/Stream/Monadic.hs
-@@ -101,7 +101,6 @@ import GHC.Exts ( SpecConstrAnnotation(..) )
- 
- data SPEC = SPEC | SPEC2
- #if __GLASGOW_HASKELL__ >= 700
--{-# ANN type SPEC ForceSpecConstr #-}
- #endif
- 
- emptyStream :: String
--- 
-2.1.1
-
diff --git a/standalone/android/haskell-patches/warp_avoid-ipv6-for-android.patch b/standalone/android/haskell-patches/warp_avoid-ipv6-for-android.patch
deleted file mode 100644
index 6144aa0fa..000000000
--- a/standalone/android/haskell-patches/warp_avoid-ipv6-for-android.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a33437e3150fb33d2fd22d29ff196be28a81c747 Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Thu, 2 Jul 2015 21:48:18 +0000
-Subject: [PATCH] avoid ipv6 for android
-
----
- Network/Wai/Handler/Warp/Run.hs | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/Network/Wai/Handler/Warp/Run.hs b/Network/Wai/Handler/Warp/Run.hs
-index 34ae455..ea7475c 100644
---- a/Network/Wai/Handler/Warp/Run.hs
-+++ b/Network/Wai/Handler/Warp/Run.hs
-@@ -14,7 +14,7 @@ import Control.Monad (when, unless, void)
- import Data.ByteString (ByteString)
- import qualified Data.ByteString as S
- import Data.Char (chr)
--import Data.IP (toHostAddress, toHostAddress6)
-+import Data.IP (toHostAddress)
- import Data.IORef (IORef, newIORef, readIORef, writeIORef)
- import Data.Streaming.Network (bindPortTCP)
- import Network (sClose, Socket)
-@@ -323,13 +323,6 @@ serveConnection conn ii origAddr transport settings app = do
-                         [a] -> Just (SockAddrInet (readInt clientPort)
-                                                        (toHostAddress a))
-                         _ -> Nothing
--                ["PROXY","TCP6",clientAddr,_,clientPort,_] ->
--                    case [x | (x, t) <- reads (decodeAscii clientAddr), null t] of
--                        [a] -> Just (SockAddrInet6 (readInt clientPort)
--                                                        0
--                                                        (toHostAddress6 a)
--                                                        0)
--                        _ -> Nothing
-                 ("PROXY":"UNKNOWN":_) ->
-                     Just origAddr
-                 _ ->
--- 
-2.1.4
-
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index a2e1008fb..4e7f4a24b 100755
--- a/standalone/android/install-haskell-packages
+++ b/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