[commit: hadrian] master: Fix Hadrian after Cabal changes (#498) (fd51234)
git at git.haskell.org
git at git.haskell.org
Sat Feb 24 15:11:18 UTC 2018
Repository : ssh://git@git.haskell.org/hadrian
On branch : master
Link : http://git.haskell.org/hadrian.git/commitdiff/fd51234fd35a5aa367be63f89bc27e96e2190978
>---------------------------------------------------------------
commit fd51234fd35a5aa367be63f89bc27e96e2190978
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Wed Feb 7 02:50:26 2018 +0000
Fix Hadrian after Cabal changes (#498)
* Fix Hadrian after Cabal changes
* Bump Cabal's lower bound
>---------------------------------------------------------------
fd51234fd35a5aa367be63f89bc27e96e2190978
hadrian.cabal | 2 +-
src/Hadrian/Haskell/Cabal/Parse.hs | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hadrian.cabal b/hadrian.cabal
index efc1251..0405601 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -118,7 +118,7 @@ executable hadrian
other-extensions: MultiParamTypeClasses
, TypeFamilies
build-depends: base >= 4.8 && < 5
- , Cabal >= 2.0.0.2 && < 2.2
+ , Cabal >= 2.1.0.0 && < 2.2
, containers == 0.5.*
, directory >= 1.2 && < 1.4
, extra >= 1.4.7
diff --git a/src/Hadrian/Haskell/Cabal/Parse.hs b/src/Hadrian/Haskell/Cabal/Parse.hs
index 578eeac..f097b62 100644
--- a/src/Hadrian/Haskell/Cabal/Parse.hs
+++ b/src/Hadrian/Haskell/Cabal/Parse.hs
@@ -13,12 +13,12 @@ module Hadrian.Haskell.Cabal.Parse (Cabal (..), parseCabal) where
import Data.List.Extra
import Development.Shake
import Development.Shake.Classes
-import qualified Distribution.Package as C
-import qualified Distribution.PackageDescription as C
-import qualified Distribution.PackageDescription.Parse as C
-import qualified Distribution.Text as C
-import qualified Distribution.Types.CondTree as C
-import qualified Distribution.Verbosity as C
+import qualified Distribution.Package as C
+import qualified Distribution.PackageDescription as C
+import qualified Distribution.PackageDescription.Parsec as C
+import qualified Distribution.Text as C
+import qualified Distribution.Types.CondTree as C
+import qualified Distribution.Verbosity as C
import Hadrian.Package
More information about the ghc-commits
mailing list