summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-25 21:59:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-25 21:59:13 -0400
commit8ee0507ec69b1512a517496df37a257aa447abb1 (patch)
tree3ab9679180ce5fca8758fe14dd8c3fb33e6c302d /standalone
parent470ff93d5107d211395045c9832b6bcc41b97cee (diff)
network-protocol-xmpp patch no longer needed
Diffstat (limited to 'standalone')
-rw-r--r--standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch25
-rwxr-xr-xstandalone/android/install-haskell-packages1
2 files changed, 0 insertions, 26 deletions
diff --git a/standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch b/standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch
deleted file mode 100644
index 798781837..000000000
--- a/standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8f124aad6d04abba5729af21ba3b50944f165d4b Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Sat, 8 Feb 2014 17:20:41 +0000
-Subject: [PATCH] text dependency
-
----
- network-protocol-xmpp.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/network-protocol-xmpp.cabal b/network-protocol-xmpp.cabal
-index 2500075..d709a15 100644
---- a/network-protocol-xmpp.cabal
-+++ b/network-protocol-xmpp.cabal
-@@ -36,7 +36,7 @@ library
- , libxml-sax >= 0.7 && < 0.8
- , monads-tf >= 0.1 && < 0.2
- , network >= 2.2
-- , text >= 0.10 && < 0.12
-+ , text
- , transformers >= 0.2
- , xml-types >= 0.3 && < 0.4
-
---
-1.7.10.4
-
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index 72d620304..b91d34a49 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -119,7 +119,6 @@ install_pkgs () {
patched uuid
patched dns
patched gnutls
- patched network-protocol-xmpp
patched unbounded-delays
cd ..