diff --git a/README.md b/README.md index 916edc21a163b5fa95540379dde312949d13f204..d188a4a0541db366673ae646a91fc30c7b91e232 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 79ab57585ffe55dc74154f31d5df4c882082dd7f..0d2b509daa4331df5998d0ac345e7001583d99ec 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 389f5530c153ee5066c81da618a08ad23601a6f4..53b0de22b2011dc2931937b7209dcef2e186c058 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 a1b74134741db5d4566d2b921297507b99239295..4acc4ed56ff1d56bee87b140f6fbcf994a88138f 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