[commit: ghc] master: Minor clean up of Hadrian dependencies (6c5f5c9)

git at git.haskell.org git at git.haskell.org
Tue Oct 23 20:12:11 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6c5f5c9bd9a274cd24b909784b71d0e63cfb31c5/ghc

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

commit 6c5f5c9bd9a274cd24b909784b71d0e63cfb31c5
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Nov 19 15:25:26 2017 +0000

    Minor clean up of Hadrian dependencies


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

6c5f5c9bd9a274cd24b909784b71d0e63cfb31c5
 README.md     |  4 ++--
 cabal.project |  2 +-
 hadrian.cabal | 11 +++++------
 stack.yaml    |  8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 916edc2..d188a4a 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ Notes:
 on Cabal sandboxes (`build.cabal.*`), Stack (`build.stack.*`) or the global package database
 (`build.global-db.*`). Also see [instructions for building GHC on Windows using Stack][windows-build].
 
-* Hadrian is written in Haskell and depends on the following packages:
-`ansi-terminal extra mtl quickcheck shake`.
+* Hadrian is written in Haskell and depends on `shake` (plus a few packages that `shake` depends on),
+`ansi-terminal`, `mtl`, `quickcheck`, and GHC core libraries.
 
 * If you have never built GHC before, start with the [preparation guide][ghc-preparation].
 
diff --git a/cabal.project b/cabal.project
index 79ab575..0d2b509 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,5 +1,5 @@
 packages: ./
           ../libraries/Cabal/Cabal/
-          ../libraries/text/
           ../libraries/hpc/
           ../libraries/parsec/
+          ../libraries/text/
diff --git a/hadrian.cabal b/hadrian.cabal
index 389f553..53b0de2 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -116,17 +116,16 @@ executable hadrian
                        , TupleSections
     other-extensions:    MultiParamTypeClasses
                        , TypeFamilies
-    build-depends:       base >= 4.8 && < 5
+    build-depends:       base                 >= 4.8     && < 5
                        , ansi-terminal        == 0.6.*
                        , Cabal                >= 2.0.0.2 && < 2.2
                        , containers           == 0.5.*
-                       , directory            >= 1.2 && < 1.4
+                       , directory            >= 1.2     && < 1.4
                        , extra                >= 1.4.7
-                       , mtl                  == 2.2.*
-                       , QuickCheck           >= 2.6 && < 2.10
+                       , QuickCheck           >= 2.6     && < 2.10
                        , shake                == 0.16.*
-                       , transformers         >= 0.4 && < 0.6
-                       , unordered-containers == 0.2.*
+                       , transformers         >= 0.4     && < 0.6
+                       , unordered-containers >= 0.2.1   && < 0.3
     build-tools:         alex  >= 3.1
                        , happy >= 1.19.4
     ghc-options:       -Wall
diff --git a/stack.yaml b/stack.yaml
index a1b7413..4acc4ed 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,10 +7,10 @@ resolver: lts-9.0
 packages:
 - '.'
 - '../libraries/Cabal/Cabal'
-- '../libraries/filepath/'
-- '../libraries/text/'
-- '../libraries/hpc/'
-- '../libraries/parsec/'
+- '../libraries/filepath'
+- '../libraries/hpc'
+- '../libraries/parsec'
+- '../libraries/text'
 
 extra-deps:
 - shake-0.16



More information about the ghc-commits mailing list