Merge pull request #6844 from vdukhovni/ghc-master-support

phadej · web-flow · commit 5ce6b08b332f · 2020-06-08T19:26:11.000+03:00
Cabal-install GHC master compat
diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
@@ -721,7 +721,7 @@ resolveDependencies platform comp pkgConfigDB solver params =
                      pkgConfigDB preferences constraints targets
   where
 
-    finalparams @ (DepResolverParams
+    finalparams@(DepResolverParams
       targets constraints
       prefs defpref
       installedPkgIndex
diff --git a/cabal-install/Distribution/Client/Sandbox.hs b/cabal-install/Distribution/Client/Sandbox.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE RankNTypes #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Distribution.Client.Sandbox
