diff options
| author | Andrey Mokhov <andrey.mokhov@gmail.com> | 2019-10-03 23:27:23 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-07 12:03:13 -0400 |
| commit | b78906118dd2919ffb5911200a5a15c8cd341414 (patch) | |
| tree | 418cd08256f8096973f18ad80771f1d683d28824 | |
| parent | 93c71ae6dbadafc27a061ea5f020f5c8e1c7132f (diff) | |
| download | haskell-b78906118dd2919ffb5911200a5a15c8cd341414.tar.gz | |
Hadrian: Stop using in-tree Cabal
| -rw-r--r-- | hadrian/cabal.project | 1 | ||||
| -rw-r--r-- | hadrian/ci.project | 1 | ||||
| -rw-r--r-- | hadrian/hadrian.cabal | 2 | ||||
| -rw-r--r-- | hadrian/stack.yaml | 5 |
4 files changed, 3 insertions, 6 deletions
diff --git a/hadrian/cabal.project b/hadrian/cabal.project index 0df6b15695..84534dbf7b 100644 --- a/hadrian/cabal.project +++ b/hadrian/cabal.project @@ -1,5 +1,4 @@ packages: ./ - ../libraries/Cabal/Cabal/ -- N.B. Compile with -O0 since this is not a performance-critical executable -- and the Cabal takes nearly twice as long to build with -O1. See #16817. diff --git a/hadrian/ci.project b/hadrian/ci.project index a3d14d6666..e68743a530 100644 --- a/hadrian/ci.project +++ b/hadrian/ci.project @@ -1,5 +1,4 @@ packages: ./ - ../libraries/Cabal/Cabal/ package hadrian ghc-options: -Werror diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index e5e5eae295..ce44a18095 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -123,7 +123,7 @@ executable hadrian other-extensions: MultiParamTypeClasses , TypeFamilies build-depends: base >= 4.8 && < 5 - , Cabal >= 3.0 && < 3.2 + , Cabal >= 3.0 && < 3.1 , containers >= 0.5 && < 0.7 , directory >= 1.3.1.0 && < 1.4 , extra >= 1.4.7 diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml index ae164c8a49..f0edd52c82 100644 --- a/hadrian/stack.yaml +++ b/hadrian/stack.yaml @@ -1,12 +1,11 @@ -resolver: lts-13.21 +resolver: lts-14.7 extra-deps: - happy-1.19.12 -- shake-0.18.3@sha256:12949a47f07915a4338291a0146158d18abdd04c0dfd813778231ed68b4758df,14806 +- Cabal-3.0.0.0@sha256:1ba37b8d80e89213b17db7b8b9ea0108da55ca65f8c0cbb7433881a284c5cf67 packages: - '.' -- '../libraries/Cabal/Cabal' nix: enable: false |