[commit: ghc] wip/nfs-locking: Change the stack configuration to use the local Cabal lib (1281be4)

[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/1281be42949bb986c62e0464032145b060649fe4/ghc

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

commit 1281be42949bb986c62e0464032145b060649fe4
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Fri Jul 22 11:30:50 2016 +0200

    Change the stack configuration to use the local Cabal lib
    
    Hadrian should be built with a local Cabal from within the
    GHC codebase. This makes the stack pick it up, instead of
    using the released version of Cabal.
    
    Signed-off-by: Michal Terepeta <michal.terepeta at gmail.com>


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

1281be42949bb986c62e0464032145b060649fe4
 hadrian.cabal | 2 +-
 stack.yaml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadrian.cabal b/hadrian.cabal
index 3429424..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.22.* || == 1.24.*
+                       , Cabal                == 1.22.* || == 1.24.* || == 1.25.*
                        , containers           == 0.5.*
                        , directory            == 1.2.*
                        , extra                >= 1.4.7
diff --git a/stack.yaml b/stack.yaml
index f6deca8..9eb4cfb 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -6,6 +6,7 @@ resolver: lts-5.17
 # Local packages, usually specified by relative directory name
 packages:
 - '.'
+- '../libraries/Cabal/Cabal'
 
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
 extra-deps: