summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-18 21:49:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-18 21:59:48 -0400
commit1a9435286cd54b16b09cffb53f719c461547bd27 (patch)
tree0a2fec7d5278004df78511266cb2a49454e582be /standalone
parentd379ee413a9c14f9d16c6b5ed4b30371881e9296 (diff)
remove patches that have been applied upstream
WTF?! My birthday is not until April 11th
Diffstat (limited to 'standalone')
-rw-r--r--standalone/android/haskell-patches/file-embed_export-TH-symbols.patch25
-rw-r--r--standalone/android/haskell-patches/hamlet_export-TH-splice-stuff.patch28
-rw-r--r--standalone/android/haskell-patches/shakespeare-js_TH-exports.patch25
-rwxr-xr-xstandalone/android/install-haskell-packages4
4 files changed, 1 insertions, 81 deletions
diff --git a/standalone/android/haskell-patches/file-embed_export-TH-symbols.patch b/standalone/android/haskell-patches/file-embed_export-TH-symbols.patch
deleted file mode 100644
index 865cbe3cc..000000000
--- a/standalone/android/haskell-patches/file-embed_export-TH-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fdbd29ce6e8ff11f721f9e74cac1f4ca14e6773d Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 07:06:33 +0000
-Subject: [PATCH] export TH symbols
-
----
- Data/FileEmbed.hs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Data/FileEmbed.hs b/Data/FileEmbed.hs
-index c17f082..6654f60 100644
---- a/Data/FileEmbed.hs
-+++ b/Data/FileEmbed.hs
-@@ -26,6 +26,8 @@ module Data.FileEmbed
- #endif
- , inject
- , injectFile
-+ -- used by TH (pointlessly)
-+ , stringToBs
- ) where
-
- import Language.Haskell.TH.Syntax
---
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/hamlet_export-TH-splice-stuff.patch b/standalone/android/haskell-patches/hamlet_export-TH-splice-stuff.patch
deleted file mode 100644
index a446fa18f..000000000
--- a/standalone/android/haskell-patches/hamlet_export-TH-splice-stuff.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9819f4b387679c889f1259f9fd969513aa2efcf2 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 03:51:06 +0000
-Subject: [PATCH] export TH splice stuff
-
----
- Text/Hamlet.hs | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs
-index 6568d6c..687dec4 100644
---- a/Text/Hamlet.hs
-+++ b/Text/Hamlet.hs
-@@ -40,6 +40,11 @@ module Text.Hamlet
- , ihamletRules
- , htmlRules
- , CloseStyle (..)
-+ -- referred to by TH splices
-+ , asHtmlUrl
-+ , maybeH
-+ , condH
-+ , attrsToHtml
- ) where
-
- import Text.Shakespeare.Base
---
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/shakespeare-js_TH-exports.patch b/standalone/android/haskell-patches/shakespeare-js_TH-exports.patch
deleted file mode 100644
index 3ddbadaf1..000000000
--- a/standalone/android/haskell-patches/shakespeare-js_TH-exports.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 40182bfb77ba16beab0da95b664d2c052d5fcad6 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 04:53:30 +0000
-Subject: [PATCH] TH exports
-
----
- Text/Julius.hs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Text/Julius.hs b/Text/Julius.hs
-index 3a9f83e..2b98f30 100644
---- a/Text/Julius.hs
-+++ b/Text/Julius.hs
-@@ -40,6 +40,8 @@ module Text.Julius
- , javascriptSettings
- -- ** internal
- , juliusUsedIdentifiers
-+ -- used by TH
-+ , asJavascriptUrl
- ) where
-
- import Language.Haskell.TH.Quote (QuasiQuoter (..))
---
-1.7.10.4
-
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index bbe10cebf..318b850ba 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -77,17 +77,15 @@ install_pkgs () {
patched socks
patched entropy
patched vector
+ patched stm-chans
patched persistent
patched profunctors
patched skein
patched lens
patched persistent-template
- patched file-embed
patched wai-app-static
patched shakespeare
- patched hamlet
patched shakespeare-css
- patched shakespeare-js
patched yesod-routes
patched yesod-core
patched yesod-persistent