[commit: hadrian] master: Fix Hadrian after Cabal changes (eda173b)
git at git.haskell.org
git at git.haskell.org
Wed Apr 25 23:20:08 UTC 2018
Repository : ssh://git@git.haskell.org/hadrian
On branch : master
Link : http://git.haskell.org/hadrian.git/commitdiff/eda173b7c0be97a4bd5f81fcf83788ddc874e900
>---------------------------------------------------------------
commit eda173b7c0be97a4bd5f81fcf83788ddc874e900
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Mon Mar 5 02:43:47 2018 +0000
Fix Hadrian after Cabal changes
>---------------------------------------------------------------
eda173b7c0be97a4bd5f81fcf83788ddc874e900
hadrian.cabal | 2 +-
stack.yaml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hadrian.cabal b/hadrian.cabal
index 84aecef..c81340f 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -123,7 +123,7 @@ executable hadrian
other-extensions: MultiParamTypeClasses
, TypeFamilies
build-depends: base >= 4.8 && < 5
- , Cabal >= 2.1.0.0 && < 2.3
+ , Cabal >= 2.2.0.0 && < 2.3
, containers == 0.5.*
, directory >= 1.2 && < 1.4
, extra >= 1.4.7
diff --git a/stack.yaml b/stack.yaml
index da03763..663389f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,12 +1,13 @@
# 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-9.0
+resolver: lts-10.8
# Local packages, usually specified by relative directory name
packages:
- '.'
- '../libraries/Cabal/Cabal'
+- '../libraries/text'
extra-deps:
- shake-0.16
More information about the ghc-commits
mailing list