Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Commit fcf9a04

Browse files
int-indexKleidukos
authored andcommitted
Update cabal.project and README build instructions
1 parent 664122f commit fcf9a04

File tree

2 files changed

+13
-20
lines changed

2 files changed

+13
-20
lines changed

README.md

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ Note: before building `haddock`, you need to build the subprojects
4141
`haddock-library` and `haddock-api`, in this order!
4242
The `cabal v2-build` takes care of this automatically.
4343

44-
#### Using [`cabal v2-build`][cabal v2]
44+
#### Using `cabal`
45+
46+
Requires cabal `>= 3.4` and GHC `== 9.0`:
4547

4648
```bash
47-
cabal v2-build -w ghc-8.10.1
48-
cabal v2-test -w ghc-8.10.1 all
49+
cabal build all --enable-tests
50+
cabal test all
4951
```
5052

5153
#### Using `stack`
@@ -57,22 +59,6 @@ export HADDOCK_PATH="$(stack exec which haddock)"
5759
stack test
5860
```
5961

60-
#### Using Cabal sandboxes (deprecated)
61-
62-
```bash
63-
cabal sandbox init
64-
cabal sandbox add-source haddock-library
65-
cabal sandbox add-source haddock-api
66-
cabal sandbox add-source haddock-test
67-
# adjust -j to the number of cores you want to use
68-
cabal install -j4 --dependencies-only --enable-tests
69-
cabal configure --enable-tests
70-
cabal build -j4
71-
# run the test suite
72-
export HADDOCK_PATH="dist/build/haddock/haddock"
73-
cabal test
74-
```
75-
7662
### Git Branches
7763

7864
If you're a GHC developer and want to update Haddock to work with your changes,

cabal.project

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@ packages: ./
33
./haddock-library
44
./haddock-test
55

6+
with-compiler: ghc-9.0
7+
8+
allow-newer:
9+
ghc-paths:Cabal,
10+
*:base,
11+
*:ghc-prim
12+
613
-- Pinning the index-state helps to make reasonably CI deterministic
7-
index-state: 2020-12-08T20:13:44Z
14+
index-state: 2021-01-24T12:09:34Z

0 commit comments

Comments
 (0)