[commit: ghc] wip/nfs-locking: Revert raising of the cabal version in the build-dependency (564b125)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/564b125e3d6df089ca849392be4d97c682e4ae64/ghc

>---------------------------------------------------------------

commit 564b125e3d6df089ca849392be4d97c682e4ae64
Author: Kai Harries <kai.harries at gmail.com>
Date:   Sun Jul 24 12:24:16 2016 +0200

    Revert raising of the cabal version in the build-dependency
    
    Travis was failing because it uses `cabal install --only-dependencies`
    in the .travis.yml


>---------------------------------------------------------------

564b125e3d6df089ca849392be4d97c682e4ae64
 hadrian.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadrian.cabal b/hadrian.cabal
index c07cef1..63bd164 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -120,7 +120,7 @@ executable hadrian
                        , ScopedTypeVariables
     build-depends:       base >= 4.8 && < 5
                        , ansi-terminal        == 0.6.*
-                       , Cabal                >= 1.25
+                       , Cabal                == 1.22.* || == 1.24.* || == 1.25.*
                        , containers           == 0.5.*
                        , directory            == 1.2.*
                        , extra                >= 1.4.7