264aeed · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Use splitPath

264aeedJasper Van der Jeugt14 years ago

hakyll.cabal+45−44

compare with master

unifiedsplit

@@ -1,5 +1,5 @@

1Name: hakyll

2−Version: 3.2.8.0

2+Version: 3.2.8.1

4Synopsis: A static website compiler library

5Description:

@@ -63,28 +63,28 @@ Library

63 Hs-Source-Dirs: src

65 Build-Depends:

66− base >= 4 && < 5,

66+ base >= 4 && < 5,

67− binary >= 0.5 && < 0.6,

67+ binary >= 0.5 && < 0.6,

68− blaze-html >= 0.5 && < 0.6,

68+ blaze-html >= 0.5 && < 0.6,

69 blaze-markup >= 0.5.1 && < 0.6,

70− bytestring >= 0.9 && < 0.10,

70+ bytestring >= 0.9 && < 0.10,

71− citeproc-hs >= 0.3.2 && < 0.4,

71+ citeproc-hs >= 0.3.2 && < 0.4,

72− containers >= 0.3 && < 0.5,

72+ containers >= 0.3 && < 0.5,

73− cryptohash >= 0.7 && < 0.8,

73+ cryptohash >= 0.7 && < 0.8,

74− directory >= 1.0 && < 1.2,

74+ directory >= 1.0 && < 1.2,

75− filepath >= 1.0 && < 1.4,

75+ filepath >= 1.0 && < 1.4,

76− hamlet >= 1.0 && < 1.1,

76+ hamlet >= 1.0 && < 1.1,

77− mtl >= 1 && < 2.2,

77+ mtl >= 1 && < 2.2,

78− old-locale >= 1.0 && < 1.1,

78+ old-locale >= 1.0 && < 1.1,

79− old-time >= 1.0 && < 1.2,

79+ old-time >= 1.0 && < 1.2,

80− pandoc >= 1.9.3 && < 1.10,

80+ pandoc >= 1.9.3 && < 1.10,

81− parsec >= 3.0 && < 3.2,

81+ parsec >= 3.0 && < 3.2,

82− process >= 1.0 && < 1.2,

82+ process >= 1.0 && < 1.2,

83− regex-base >= 0.93 && < 0.94,

83+ regex-base >= 0.93 && < 0.94,

84− regex-tdfa >= 1.1 && < 1.2,

84+ regex-tdfa >= 1.1 && < 1.2,

85− tagsoup >= 0.12.6 && < 0.13,

85+ tagsoup >= 0.12.6 && < 0.13,

86− text >= 0.11 && < 1.12,

86+ text >= 0.11 && < 1.12,

87− time >= 1.1 && < 1.5

87+ time >= 1.1 && < 1.5

89 Exposed-Modules:

90 Hakyll

@@ -170,28 +170,29 @@ Test-suite hakyll-tests

170 test-framework-hunit >= 0.2 && < 0.3,

171 test-framework-quickcheck2 >= 0.2 && < 0.3,

172 -- Copy pasted from hakyll dependencies:

173− base >= 4 && < 5,

173+ base >= 4 && < 5,

174− binary >= 0.5 && < 0.6,

174+ binary >= 0.5 && < 0.6,

175− blaze-html >= 0.4 && < 0.6,

175+ blaze-html >= 0.5 && < 0.6,

176+ blaze-markup >= 0.5.1 && < 0.6,

176− bytestring >= 0.9 && < 0.10,

177+ bytestring >= 0.9 && < 0.10,

177− citeproc-hs >= 0.3.2 && < 0.4,

178+ citeproc-hs >= 0.3.2 && < 0.4,

178− containers >= 0.3 && < 0.5,

179+ containers >= 0.3 && < 0.5,

179− cryptohash >= 0.7 && < 0.8,

180+ cryptohash >= 0.7 && < 0.8,

180− directory >= 1.0 && < 1.2,

181+ directory >= 1.0 && < 1.2,

181− filepath >= 1.0 && < 1.4,

182+ filepath >= 1.0 && < 1.4,

182− hamlet >= 0.10.3 && < 1.1,

183+ hamlet >= 1.0 && < 1.1,

183− mtl >= 1 && < 2.2,

184+ mtl >= 1 && < 2.2,

184− old-locale >= 1.0 && < 1.1,

185+ old-locale >= 1.0 && < 1.1,

185− old-time >= 1.0 && < 1.2,

186+ old-time >= 1.0 && < 1.2,

186− pandoc >= 1.9.3 && < 1.10,

187+ pandoc >= 1.9.3 && < 1.10,

187− parsec >= 3.0 && < 3.2,

188+ parsec >= 3.0 && < 3.2,

188− process >= 1.0 && < 1.2,

189+ process >= 1.0 && < 1.2,

189− regex-base >= 0.93 && < 0.94,

190+ regex-base >= 0.93 && < 0.94,

190− regex-tdfa >= 1.1 && < 1.2,

191+ regex-tdfa >= 1.1 && < 1.2,

191− tagsoup >= 0.12.6 && < 0.13,

192+ tagsoup >= 0.12.6 && < 0.13,

192− text >= 0.11 && < 0.12,

193+ text >= 0.11 && < 1.12,

193− time >= 1.1 && < 1.5,

194+ time >= 1.1 && < 1.5,

194− unix >= 2.4 && < 2.6

195+ unix >= 2.4 && < 2.6

195

196

196 Other-modules:

197 Other-modules:

197 Hakyll.Web.Util.Html.Tests

198 Hakyll.Web.Util.Html.Tests

src/Hakyll/Core/Identifier.hs+2−4

@@ -38,11 +38,11 @@ module Hakyll.Core.Identifier

38 , setGroup

39 ) where

41−import Control.Arrow (second)

42import Control.Applicative ((<$>), (<*>))

41import Control.Applicative ((<$>), (<*>))

43import Control.Monad (mplus)

42import Control.Monad (mplus)

44import Data.Monoid (Monoid, mempty, mappend)

43import Data.Monoid (Monoid, mempty, mappend)

45import Data.List (intercalate)

44import Data.List (intercalate)

45+import System.FilePath (dropTrailingPathSeparator, splitPath)

47import Data.Binary (Binary, get, put)

48import GHC.Exts (IsString, fromString)

@@ -83,9 +83,7 @@ parseIdentifier :: String -> Identifier a

83parseIdentifier = Identifier Nothing

84 . intercalate "/" . filter (not . null) . split'

85 where

86− split' [] = [[]]

86+ split' = map dropTrailingPathSeparator . splitPath

87− split' str = let (pre, post) = second (drop 1) $ break (== '/') str

88− in pre : split' post

90-- | Convert an identifier to a relative 'FilePath'

88-- | Convert an identifier to a relative 'FilePath'

91--

89--