[commit: ghc] wip/T15449, wip/T16188, wip/llvm-configure-opts: Upgrade to the latest stack resolver (249b0ba)

git at git.haskell.org git at git.haskell.org
Sun Feb 10 21:31:21 UTC 2019


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

On branches: wip/T15449,wip/T16188,wip/llvm-configure-opts
Link       : http://ghc.haskell.org/trac/ghc/changeset/249b0babb08409311a56da0ef890445676927fb7/ghc

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

commit 249b0babb08409311a56da0ef890445676927fb7
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Thu Feb 7 14:50:47 2019 +0000

    Upgrade to the latest stack resolver


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

249b0babb08409311a56da0ef890445676927fb7
 hadrian/stack.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml
index d379133..7f06944 100644
--- a/hadrian/stack.yaml
+++ b/hadrian/stack.yaml
@@ -1,13 +1,12 @@
 # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-12.10
+resolver: lts-13.6
 
 # Local packages, usually specified by relative directory name
 packages:
 - '.'
 - '../libraries/Cabal/Cabal'
-- '../libraries/text'
 
 # This is necessary to build until happy's version bounds are updated to work
 # with the new Cabal version.  Stack's error message explains the issue:
@@ -19,6 +18,10 @@ packages:
 # TODO: Remove this once it's no longer necessary
 allow-newer: true
 
+# shake-0.17.4 and below depend on heaps, which depends on a specific Cabal
+extra-deps:
+- shake-0.17.5
+
 nix:
    enable: false
    packages:



More information about the ghc-commits mailing list