Fix build failures

Hspec.hs

@@ -74,7 +74,7 @@ eval string = do
 
   getTemporaryDirectory >>= setCurrentDirectory
   let state = defaultKernelState { getLintStatus = LintOff }
-  interpret libdir False $ Eval.evaluate state string publish noWidgetHandling
+  interpret libdir False $ const $ Eval.evaluate state string publish noWidgetHandling
   out <- readIORef outputAccum
   pagerOut <- readIORef pagerAccum
   return (reverse out, unlines . map extractPlain . reverse $ pagerOut)
@@ -193,9 +193,12 @@ inDirectory dirs files action = shelly $ withTmpDir $ \dirPath ->
                  return out
 
 withHsDirectory :: (Shelly.FilePath -> Interpreter a)  -> IO a
-withHsDirectory = inDirectory ["" </> "dir", "dir" </> "dir1"]
-                    [""</> "file1.hs", "dir" </> "file2.hs",  
-                     "" </> "file1.lhs", "dir" </> "file2.lhs"]
+withHsDirectory = inDirectory [p "" </> p "dir", p "dir" </> p "dir1"]
+                    [p ""</> p "file1.hs", p "dir" </> p "file2.hs",
+                     p "" </> p "file1.lhs", p "dir" </> p "file2.lhs"]
+  where
+    p :: FilePath -> FilePath
+    p = id
 
 main :: IO ()
 main = hspec $ do

ipython-kernel/ipython-kernel.cabal

 name:                ipython-kernel
-version:             0.6.1.2
+version:             0.6.1.3
 synopsis:            A library for creating kernels for IPython frontends
 
 description:         ipython-kernel is a library for communicating with frontends for the interactive IPython framework. It is used extensively in IHaskell, the interactive Haskell environment.

main/Main.hs

@@ -117,7 +117,9 @@ runKernel kernelOpts profileSrc = do
   (exitCode, stackStdout, _) <- readProcessWithExitCode "stack" [] ""
   let stack = exitCode == ExitSuccess && "The Haskell Tool Stack" `isInfixOf` stackStdout
 
+#if MIN_VERSION_base(4,7,0)
   -- If we're in a stack directory, use `stack` to set the environment
+  -- We can't do this with base <= 4.6 because setEnv doesn't exist.
   when stack $ do
     stackEnv <- lines <$> readProcess "stack" ["exec", "env"] ""
     forM_ stackEnv $ \line ->
@@ -125,6 +127,7 @@ runKernel kernelOpts profileSrc = do
       in case tailMay val of
            Nothing -> return ()
            Just val' -> setEnv var val'
+#endif
 
   -- Serve on all sockets and ports defined in the profile.
   interface <- serveProfile profile debug