Fix lts-2 bug

psibi · Mar 19, 2017 · f4a4fe3 · f4a4fe3
1 parent 845b626
commit f4a4fe3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/Main.hs b/app/Main.hs
@@ -1,3 +1,5 @@
+{-#LANGUAGE CPP#-}
+
 module Main where
 
 import Tldr
@@ -81,7 +83,15 @@ getPagePath page = do
   homeDir <- getHomeDirectory
   let pageDir = homeDir </> tldrDirName </> "tldr" </> "pages"
       x@(f1:f2:f3:[]) = map (\x -> pageDir </> x </> page <.> "md") checkDirs
+#if MIN_VERSION_base(4,7,0)
+  f1' <- pageExists f1
+  f2' <- pageExists f2
+  f3' <- pageExists f3
+  return $ f1' <|> f2' <|> f3'
+#else
   pageExists f1 <|> pageExists f2 <|> pageExists f3
+#endif
+
 
 main :: IO ()
 main = do

diff --git a/stack.yaml b/stack.yaml
@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-8.5
+resolver: lts-2.22
 
 
 
@@ -44,6 +44,8 @@ packages:
 extra-deps: 
 - shell-conduit-4.6.1
 - cmark-0.5.5
+- process-1.6.0.0
+- optparse-applicative-0.13.2.0
 
 # Override default flag values for local packages and extra-deps
 flags: {}

diff --git a/tldr.cabal b/tldr.cabal
@@ -33,7 +33,6 @@ executable tldr
                      , directory
                      , filepath
                      , shell-conduit >= 4.6.0
-                     , process >= 1.2.1.0
                      , semigroups
   default-language:    Haskell2010