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
|
--- gitit-0.10.6.2-orig/Network/Gitit/Authentication.hs 2015-04-03 14:18:02.000000000 +1100
+++ gitit-0.10.6.2/Network/Gitit/Authentication.hs 2015-04-05 20:18:28.239989325 +1000
@@ -1,4 +1,4 @@
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE ScopedTypeVariables, FlexibleContexts #-}
{-
Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>,
Henry Laxen <nadine.and.henry@pobox.com>
--- gitit-0.10.6.2-orig/Network/Gitit/Feed.hs 2015-04-03 14:18:02.000000000 +1100
+++ gitit-0.10.6.2/Network/Gitit/Feed.hs 2015-04-05 20:19:13.496945226 +1000
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-
Copyright (C) 2009 Gwern Branwen <gwern0@gmail.com> and
John MacFarlane <jgm@berkeley.edu>
@@ -22,7 +23,11 @@
module Network.Gitit.Feed (FeedConfig(..), filestoreToXmlFeed) where
import Data.Time (UTCTime, formatTime, getCurrentTime, addUTCTime)
+#if MIN_VERSION_time(1,5,0)
+import Data.Time (defaultTimeLocale)
+#else
import System.Locale (defaultTimeLocale)
+#endif
import Data.Foldable as F (concatMap)
import Data.List (intercalate, sortBy, nub)
import Data.Maybe (fromMaybe)
--- gitit-0.10.6.2-orig/Network/Gitit/Types.hs 2015-04-03 14:18:02.000000000 +1100
+++ gitit-0.10.6.2/Network/Gitit/Types.hs 2015-04-05 20:17:34.038042036 +1000
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances #-}
+{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances, CPP #-}
{-
Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>,
Anton van Straaten <anton@appsolutions.com>
@@ -72,7 +72,11 @@
import Data.Text (Text)
import Data.List (intersect)
import Data.Time (parseTime)
+#if MIN_VERSION_time(1,5,0)
+import Data.Time (defaultTimeLocale)
+#else
import System.Locale (defaultTimeLocale)
+#endif
import Data.FileStore.Types
import Network.Gitit.Server
import Text.HTML.TagSoup.Entity (lookupEntity)
|
GitWeb
