Skip to content

Commit 2eb150e

Browse files
authored
Remove stack.yaml (#939)
* The `stack.yaml` was quite stale. It also was not obviously very useful in the context of a GHC boot package. Remove it, as well as the instructions for building and testing with `stack`. * Expand the information on testing/benchmarking with `cabal`. Closes #938
1 parent 5cdbecc commit 2eb150e

File tree

4 files changed

+22
-40
lines changed

4 files changed

+22
-40
lines changed

CONTRIBUTING.md

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,16 @@ All such changes should be discussed on the [email protected] mailing list.
99

1010
## Building, testing, and benchmarking
1111

12-
Building, testing, and benchmarking the containers package can be done using either `cabal` or `stack`.
12+
Building, testing, and benchmarking the containers package is done using `cabal`.
1313

14-
To avoid recompiling the tests' other dependencies when making changes, you can remove `containers` from the `packages` stanza of the `cabal.project` file.
14+
To avoid recompiling the tests' other dependencies when making changes, you can
15+
remove `containers` from the `packages` stanza of the `cabal.project` file.
16+
Note: this will not work in the unlikely event that you are fixing a bug that
17+
affects the test or benchmark framework itself. The `Data.Set` (for example)
18+
used in the tests and benchmarks is compiled separately from the one exposed by
19+
the `containers` package.
1520

16-
### With cabal
21+
### Procedure
1722

1823
Minimum cabal version: 2.4
1924

@@ -23,25 +28,6 @@ cabal test containers-test
2328
cabal bench containers-test
2429
```
2530

26-
27-
### With [Stack](https://docs.haskellstack.org/en/stable/README/)
28-
29-
Minimum stack version: 1.6.1
30-
31-
```
32-
stack build
33-
stack test
34-
stack bench
35-
```
36-
37-
38-
## Troubleshooting
39-
40-
- If you're using Stack, make sure you have version >= 1.6.1
41-
([stack#3624](https://github.com/commercialhaskell/stack/issues/3624),
42-
[stack#3345](https://github.com/commercialhaskell/stack/issues/3345)).
43-
- You may need to edit `stack.yaml` to use the Stackage snapshot you want.
44-
4531
## Sending Pull Requests
4632

4733
When you send a pull request, please:
@@ -67,10 +53,11 @@ When you send a pull request, please:
6753

6854
## Docs
6955

70-
The internal docs are generated using Haddock which can be invoked with `cabal
71-
haddock` or `stack haddock`.
56+
The API documentation is generated using Haddock which is invoked with
57+
`cabal haddock`.
7258

73-
The external docs are served by ReadTheDocs at
59+
The "user's manual" is served by ReadTheDocs at
7460
https://haskell-containers.readthedocs.io and live in the `docs/` directory. To
75-
build the docs locally run `pip install sphinx sphinx-autobuild sphinx_rtd_theme` to install the
76-
dependencies, `git submodule update --init`, and then `cd docs/ && make html`.
61+
build it locally run `pip install sphinx sphinx-autobuild sphinx_rtd_theme` to
62+
install the dependencies, `git submodule update --init`, and then
63+
`cd docs/ && make html`.

containers/changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog for [`containers` package](http://github.com/haskell/containers)
22

3+
## ???
4+
5+
* Remove the `stack.yaml` file. It was extremely stale, and its utility was a
6+
bit dubious in a GHC boot package. Closes #938.
7+
38
## 0.6.7
49

510
### Additions

containers/docs/intro.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ For some of the examples you'll need ``containers >= 0.5.9`` which ships with
7171
If you have an older version, don't worry about it, the majority of the code
7272
works with older versions of the package. If you want, you can get a recent
7373
version by `from haskell.org <https://www.haskell.org/downloads>`_, or with
74-
`Stack <https://www.haskellstack.org>`_ using ``stack --resolver lts-10.2
75-
ghci``.
74+
`Stack <https://www.haskellstack.org>`_ using something like
75+
``stack --resolver lts-20.14 ghci`` (see `Stackage <https://stackage.org>`_
76+
for the latest long-term support (LTS) or nightly resolver version).
7677

7778

7879
Importing modules

stack.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)