git.iko.soy/hakyll
on master help sign in
Merge branch 'stable'
962e8abJasper Van der Jeugt
hakyll.cabal+16−6
compare with master
unifiedsplit
@@ -52,7 +52,11 @@ Source-Repository head
52
52
53Flag previewServer
53Flag previewServer
54 Description: Include the preview server
54 Description: Include the preview server
55− default: True
55+ Default: True
56+
57+Flag unixFilter
58+ Description: Include the UnixFilter module
59+ Default: True
56
60
57Library
61Library
58 Ghc-Options: -Wall
62 Ghc-Options: -Wall
@@ -80,8 +84,7 @@ Library
80 regex-tdfa >= 1.1 && < 1.2,
84 regex-tdfa >= 1.1 && < 1.2,
81 tagsoup >= 0.12.6 && < 0.13,
85 tagsoup >= 0.12.6 && < 0.13,
82 text >= 0.11 && < 1.12,
86 text >= 0.11 && < 1.12,
83− time >= 1.1 && < 1.5,
87+ time >= 1.1 && < 1.5
84− unix >= 2.4 && < 2.6
85
88
86 Exposed-Modules:
89 Exposed-Modules:
87 Hakyll
90 Hakyll
@@ -102,7 +105,6 @@ Library
102 Hakyll.Core.Rules
105 Hakyll.Core.Rules
103 Hakyll.Core.Run
106 Hakyll.Core.Run
104 Hakyll.Core.Store
107 Hakyll.Core.Store
105− Hakyll.Core.UnixFilter
106 Hakyll.Core.Util.Arrow
108 Hakyll.Core.Util.Arrow
107 Hakyll.Core.Util.File
109 Hakyll.Core.Util.File
108 Hakyll.Core.Util.String
110 Hakyll.Core.Util.String
@@ -141,12 +143,20 @@ Library
141 Build-depends:
143 Build-depends:
142 snap-core >= 0.6 && < 0.9,
144 snap-core >= 0.6 && < 0.9,
143 snap-server >= 0.6 && < 0.9
145 snap-server >= 0.6 && < 0.9
144− Cpp-Options:
146+ Cpp-options:
145 -DPREVIEW_SERVER
147 -DPREVIEW_SERVER
146− Other-Modules:
148+ Other-modules:
147 Hakyll.Web.Preview.Poll
149 Hakyll.Web.Preview.Poll
148 Hakyll.Web.Preview.Server
150 Hakyll.Web.Preview.Server
149
151
152+ If flag(unixFilter)
153+ Build-depends:
154+ unix >= 2.4 && < 2.6
155+ Cpp-options:
156+ -DUNIX_FILTER
157+ Other-modules:
158+ Hakyll.Core.UnixFilter
159+
150Test-suite hakyll-tests
160Test-suite hakyll-tests
151 Type: exitcode-stdio-1.0
161 Type: exitcode-stdio-1.0
152 Hs-source-dirs: src tests
162 Hs-source-dirs: src tests
src/Hakyll.hs+5
@@ -1,5 +1,6 @@
1-- | Top-level module exporting all modules that are interesting for the user
1-- | Top-level module exporting all modules that are interesting for the user
2--
2--
3+{-# LANGUAGE CPP #-}
3module Hakyll
4module Hakyll
4 ( module Hakyll.Core.Compiler
5 ( module Hakyll.Core.Compiler
5 , module Hakyll.Core.Configuration
6 , module Hakyll.Core.Configuration
@@ -9,7 +10,9 @@ module Hakyll
9 , module Hakyll.Core.Resource.Provider
10 , module Hakyll.Core.Resource.Provider
10 , module Hakyll.Core.Routes
11 , module Hakyll.Core.Routes
11 , module Hakyll.Core.Rules
12 , module Hakyll.Core.Rules
13+#ifdef UNIX_FILTER
12 , module Hakyll.Core.UnixFilter
14 , module Hakyll.Core.UnixFilter
15+#endif
13 , module Hakyll.Core.Util.Arrow
16 , module Hakyll.Core.Util.Arrow
14 , module Hakyll.Core.Util.File
17 , module Hakyll.Core.Util.File
15 , module Hakyll.Core.Util.String
18 , module Hakyll.Core.Util.String
@@ -43,7 +46,9 @@ import Hakyll.Core.Resource
43import Hakyll.Core.Resource.Provider
46import Hakyll.Core.Resource.Provider
44import Hakyll.Core.Routes
47import Hakyll.Core.Routes
45import Hakyll.Core.Rules
48import Hakyll.Core.Rules
49+#ifdef UNIX_FILTER
46import Hakyll.Core.UnixFilter
50import Hakyll.Core.UnixFilter
51+#endif
47import Hakyll.Core.Util.Arrow
52import Hakyll.Core.Util.Arrow
48import Hakyll.Core.Util.File
53import Hakyll.Core.Util.File
49import Hakyll.Core.Util.String
54import Hakyll.Core.Util.String