Merge pull request #113 from bergmark/cabal-process-update

Cabal process update

cabal-dev.cabal

@@ -17,7 +17,7 @@ Description:         cabal-dev is a tool for managing development builds of
                      databases.
                      .
                      If your build depends on patched or unreleased libraries,
-                     you can add them to your sandboxed build environment by 
+                     you can add them to your sandboxed build environment by
                      installing them to the sandbox directly:so
                      .
                      > cd /path/to/dependency
@@ -104,12 +104,12 @@ Executable cabal-dev
       bytestring >= 0.9 && < 0.11,
       directory >= 1.0 && < 1.3,
       filepath >= 1.1 && < 1.4,
-      Cabal >= 1.10.0.0 && < 1.17,
+      Cabal >= 1.10.0.0 && < 1.22,
       HTTP >= 4000.0.9 && < 4000.3,
       mtl >= 1.1 && < 2.2,
       network >= 2.2 && < 2.5,
       pretty >= 1.0 && < 1.2,
-      process >= 1.0 && < 1.2,
+      process >= 1.0 && < 1.3,
       tar >= 0.4 && < 0.5,
       zlib >= 0.5 && < 0.6,
       transformers >= 0.2 && < 0.4,
@@ -150,8 +150,8 @@ Executable ghc-pkg-6_8-compat
   Main-is: GhcPkgCompat.hs
   Build-Depends:
     base < 5,
-    Cabal >=1.2 && < 1.17,
-    process >= 1.0 && < 1.2
+    Cabal >=1.2 && < 1.22,
+    process >= 1.0 && < 1.3
 
   GHC-Options: -Wall
   HS-Source-Dirs: src

src/Distribution/Dev/InvokeCabal.hs

@@ -168,8 +168,13 @@ needsGHC68Compat = cabalVersion < Version [1, 9] []
 
 ghcPkgCompatProgram :: Program
 ghcPkgCompatProgram  = p { programFindLocation =
+#if MIN_VERSION_Cabal(1,18,0)
+                           \v x -> do
+                             res <- programFindLocation p v x
+#else
                            \v -> do
                              res <- programFindLocation p v
+#endif
                              case res of
                                Nothing -> return Nothing
                                Just loc -> Just `fmap` ensureAbsolute loc