summaryrefslogtreecommitdiff
path: root/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
blob: 90719b1b46b1fc785adb24e4413b35c0cf576f79 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
From 8d28a63e9a67cde6149bb2cbcf6172ddd997cfff Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
Date: Tue, 20 May 2014 17:53:41 +0000
Subject: [PATCH] deal with TH

Export modules referenced by it.

Should not need these icons in git-annex, so not worth using the Evil
Splicer.
---
 Network/Wai/Application/Static.hs | 4 ----
 WaiAppStatic/Storage/Embedded.hs  | 8 ++++----
 wai-app-static.cabal              | 2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Network/Wai/Application/Static.hs b/Network/Wai/Application/Static.hs
index f2fa743..1a82b30 100644
--- a/Network/Wai/Application/Static.hs
+++ b/Network/Wai/Application/Static.hs
@@ -33,8 +33,6 @@ import Control.Monad.IO.Class (liftIO)
 
 import Blaze.ByteString.Builder (toByteString)
 
-import Data.FileEmbed (embedFile)
-
 import Data.Text (Text)
 import qualified Data.Text as T
 
@@ -198,8 +196,6 @@ staticAppPieces _ _ req
         H.status405
         [("Content-Type", "text/plain")]
         "Only GET is supported"
-staticAppPieces _ [".hidden", "folder.png"] _  = return $ W.responseLBS H.status200 [("Content-Type", "image/png")] $ L.fromChunks [$(embedFile "images/folder.png")]
-staticAppPieces _ [".hidden", "haskell.png"] _ = return $ W.responseLBS H.status200 [("Content-Type", "image/png")] $ L.fromChunks [$(embedFile "images/haskell.png")]
 staticAppPieces ss rawPieces req = liftIO $ do
     case toPieces rawPieces of
         Just pieces -> checkPieces ss pieces req >>= response
diff --git a/WaiAppStatic/Storage/Embedded.hs b/WaiAppStatic/Storage/Embedded.hs
index daa6e50..9873d4e 100644
--- a/WaiAppStatic/Storage/Embedded.hs
+++ b/WaiAppStatic/Storage/Embedded.hs
@@ -3,10 +3,10 @@ module WaiAppStatic.Storage.Embedded(
       embeddedSettings
 
     -- * Template Haskell
-    , Etag
-    , EmbeddableEntry(..)
-    , mkSettings
+    --, Etag
+    --, EmbeddableEntry(..)
+    --, mkSettings
     ) where
 
 import WaiAppStatic.Storage.Embedded.Runtime
-import WaiAppStatic.Storage.Embedded.TH
+--import WaiAppStatic.Storage.Embedded.TH
diff --git a/wai-app-static.cabal b/wai-app-static.cabal
index 925d350..d0086e8 100644
--- a/wai-app-static.cabal
+++ b/wai-app-static.cabal
@@ -33,7 +33,6 @@ library
                    , containers                >= 0.2
                    , time                      >= 1.1.4
                    , old-locale                >= 1.0.0.2
-                   , file-embed                >= 0.0.3.1
                    , text                      >= 0.7
                    , blaze-builder             >= 0.2.1.4
                    , base64-bytestring         >= 0.1
@@ -62,7 +61,6 @@ library
                      WaiAppStatic.CmdLine
     other-modules:   Util
                      WaiAppStatic.Storage.Embedded.Runtime
-                     WaiAppStatic.Storage.Embedded.TH
     ghc-options:     -Wall
     extensions:     CPP
 
-- 
2.0.0.rc2