diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2021-01-24 18:33:33 +0300 |
|---|---|---|
| committer | Hécate Moonlight <hecate+github@glitchbra.in> | 2021-02-05 14:53:00 +0100 |
| commit | fcf9a04224fed910d01cf6f4d9c2d1bdc7c085af (patch) | |
| tree | a167e8a62769fbf5c6f6bc3d15131499046bf8c9 | |
| parent | 664122f108c25fa2e96c9ea6d012d11d8faa2229 (diff) | |
Update cabal.project and README build instructions
| -rw-r--r-- | README.md | 24 | ||||
| -rw-r--r-- | cabal.project | 9 |
2 files changed, 13 insertions, 20 deletions
@@ -41,11 +41,13 @@ Note: before building `haddock`, you need to build the subprojects `haddock-library` and `haddock-api`, in this order! The `cabal v2-build` takes care of this automatically. -#### Using [`cabal v2-build`][cabal v2] +#### Using `cabal` + +Requires cabal `>= 3.4` and GHC `== 9.0`: ```bash -cabal v2-build -w ghc-8.10.1 -cabal v2-test -w ghc-8.10.1 all +cabal build all --enable-tests +cabal test all ``` #### Using `stack` @@ -57,22 +59,6 @@ export HADDOCK_PATH="$(stack exec which haddock)" stack test ``` -#### Using Cabal sandboxes (deprecated) - -```bash -cabal sandbox init -cabal sandbox add-source haddock-library -cabal sandbox add-source haddock-api -cabal sandbox add-source haddock-test -# adjust -j to the number of cores you want to use -cabal install -j4 --dependencies-only --enable-tests -cabal configure --enable-tests -cabal build -j4 -# run the test suite -export HADDOCK_PATH="dist/build/haddock/haddock" -cabal test -``` - ### Git Branches If you're a GHC developer and want to update Haddock to work with your changes, diff --git a/cabal.project b/cabal.project index 7330a775..2525070a 100644 --- a/cabal.project +++ b/cabal.project @@ -3,5 +3,12 @@ packages: ./ ./haddock-library ./haddock-test +with-compiler: ghc-9.0 + +allow-newer: + ghc-paths:Cabal, + *:base, + *:ghc-prim + -- Pinning the index-state helps to make reasonably CI deterministic -index-state: 2020-12-08T20:13:44Z +index-state: 2021-01-24T12:09:34Z |