summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2016-04-30 10:44:13 -0400
committerjoe <joe@jerkface.net>2016-04-30 10:44:13 -0400
commitb71913df7945838de8526f4019ecdcba6afe6d28 (patch)
tree96b36fb961405469f553b3b544a71386f49f649f
parente69a1a1f1991c2ce879aaba187002a7b5a5f6827 (diff)
jessie build fixes
-rw-r--r--kiki.cabal4
-rw-r--r--lib/CommandLine.hs8
2 files changed, 6 insertions, 6 deletions
diff --git a/kiki.cabal b/kiki.cabal
index 62b9fd3..3084908 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -13,11 +13,11 @@ build-type: Simple
13 13
14Flag cryptonite 14Flag cryptonite
15 Description: Use newer cryptonite-based x509 version 1.6 and higher 15 Description: Use newer cryptonite-based x509 version 1.6 and higher
16 Default: True 16 Default: False
17 17
18Flag hourglass 18Flag hourglass
19 Description: Use newer hourglass-based x509 version 1.5 and higher 19 Description: Use newer hourglass-based x509 version 1.5 and higher
20 Default: True 20 Default: False
21 21
22Flag needlocale 22Flag needlocale
23 Description: Link against old-locale package for older versions of the time package. 23 Description: Link against old-locale package for older versions of the time package.
diff --git a/lib/CommandLine.hs b/lib/CommandLine.hs
index 62f0315..55b77b3 100644
--- a/lib/CommandLine.hs
+++ b/lib/CommandLine.hs
@@ -48,7 +48,7 @@ type MergeData = [(Int,Ordering)]
48-- | Expr a 48-- | Expr a
49-- 49--
50data Expr a where 50data Expr a where
51 -- | Prim 51 -- Prim
52 -- 52 --
53 -- Takes a function from the option arguments and unamed arguments repsectively to 53 -- Takes a function from the option arguments and unamed arguments repsectively to
54 -- a value of type a, usually IO (), and gives you an expression tree. As one 54 -- a value of type a, usually IO (), and gives you an expression tree. As one
@@ -57,13 +57,13 @@ data Expr a where
57 -- where we are in the tree. 57 -- where we are in the tree.
58 -- 58 --
59 Prim :: ([[String]] -> [String] -> a) -> Interval (SuperOrd Int) -> Expr a 59 Prim :: ([[String]] -> [String] -> a) -> Interval (SuperOrd Int) -> Expr a
60 -- | Star 60 -- Star
61 -- Applicative '<*>' 61 -- Applicative '<*>'
62 Star :: MergeData -> Expr (b -> a) -> (Expr b) -> Expr a 62 Star :: MergeData -> Expr (b -> a) -> (Expr b) -> Expr a
63 -- | Or 63 -- Or
64 -- Alternative '<|>' 64 -- Alternative '<|>'
65 Or :: MergeData -> Expr a -> Expr a -> Expr a 65 Or :: MergeData -> Expr a -> Expr a -> Expr a
66 -- | Empty 66 -- Empty
67 -- Alternative empty 67 -- Alternative empty
68 Empty :: Expr a 68 Empty :: Expr a
69 69