Skip to content

Commit 4724cd5

Browse files
committed
Update documentary references, and cabal.config/cabal.project
1 parent a7118a0 commit 4724cd5

16 files changed

+146
-142
lines changed

.github/workflows/integration-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
env:
1717
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818

19-
# As of 8 August 2023, ubuntu-latest, windows-latest and macos-latest come
19+
# As of 21 August 2023, ubuntu-latest, windows-latest and macos-latest come
2020
# with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2. windows-latest comes
2121
# with NSIS 3.08, for which the default value of the 'Unicode' installer
2222
# attribute is 'true'. However, that is not the 'large strings' build of NSIS
@@ -81,7 +81,7 @@ jobs:
8181
nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs
8282
# Download the Nix expressions for all subscribed channels...
8383
#
84-
# As at 2023-08-11, nixos-23.05 provides GHC 9.2.8.
84+
# As at 2023-08-21, nixos-23.05 provides GHC 9.2.8.
8585
nix-channel --update
8686
# The NIX_PATH environment variable sets a list of directories used to
8787
# look up the location of Nix expressions using paths enclosed in

.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- rc/**
1010
workflow_dispatch:
1111

12-
# As of 9 August 2023, ubuntu-latest, windows-latest and macos-latest come
12+
# As of 21 August 2023, ubuntu-latest, windows-latest and macos-latest come
1313
# with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2.
1414

1515
jobs:

CONTRIBUTING.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,10 @@ compatibility with a range of versions of GHC that a library package (such as
285285
Stack aims to depend on well-known packages. The specific versions on which it
286286
depends at any time are specified by `package.yaml` and `stack.yaml`. It does
287287
not aim to be compatible with more than one version of the `Cabal` package at
288-
any time. At the time of writing (May 2023) the package versions are primarily
289-
ones in Stackage snapshot LTS Haskell 20.26 (for GHC 9.2.8), together with
290-
extra-dep `Cabal-3.8.1.0`.
288+
any time. At the time of writing (August 2023) the package versions are
289+
primarily ones in Stackage snapshot LTS Haskell 21.8 (for GHC 9.4.5), together
290+
with extra-deps to depend on the latest versions of `ansi-terminal`, `crypton`
291+
(instead of `cryptonite`), `hpack`, `pantry` and `tar-conduit`.
291292

292293
A Stack executable makes use of Cabal (the library) through a small 'Setup'
293294
executable that it compiles from Haskell source code. The executable compiles

cabal.config

+74-71
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ constraints:
22
, Cabal ==3.8.1.0
33
, Cabal-syntax ==3.8.1.0
44
, Glob ==0.10.2
5-
, OneTuple ==0.3.1
6-
, QuickCheck ==2.14.2
5+
, OneTuple ==0.4.1.1
6+
, QuickCheck ==2.14.3
77
, StateVar ==1.2.2
88
, Win32 ==2.12.0.1
9-
, aeson ==2.0.3.0
9+
, aeson ==2.1.2.1
1010
, aeson-warning-parser ==0.1.0
1111
, annotated-wl-pprint ==0.7.0
1212
, ansi-terminal ==1.0
@@ -16,79 +16,85 @@ constraints:
1616
, asn1-encoding ==0.9.6
1717
, asn1-parse ==0.9.5
1818
, asn1-types ==0.3.4
19-
, assoc ==1.0.2
19+
, assoc ==1.1
2020
, async ==2.2.4
2121
, attoparsec ==0.14.4
22-
, attoparsec-iso8601 ==1.0.2.1
22+
, attoparsec-iso8601 ==1.1.0.0
2323
, auto-update ==0.1.6
24-
, base ==4.16.4.0
25-
, base-compat ==0.12.2
26-
, base-compat-batteries ==0.12.2
27-
, base-orphans ==0.8.8.2
24+
, base ==4.17.2.0
25+
, base-compat ==0.12.3
26+
, base-compat-batteries ==0.12.3
27+
, base-orphans ==0.9.0
2828
, base16-bytestring ==1.0.2.0
2929
, base64-bytestring ==1.2.1.0
30-
, basement ==0.0.15
30+
, basement ==0.0.16
3131
, bifunctors ==5.5.15
32-
, binary ==0.8.9.0
32+
, binary ==0.8.9.1
33+
, bitvec ==1.1.5.0
3334
, blaze-builder ==0.4.2.2
3435
, blaze-html ==0.9.1.2
3536
, blaze-markup ==0.8.2.8
3637
, byteorder ==1.0.4
37-
, bytestring ==0.11.4.0
38-
, casa-client ==0.0.1
38+
, bytestring ==0.11.5.1
39+
, casa-client ==0.0.2
3940
, casa-types ==0.0.2
4041
, case-insensitive ==1.2.1.0
4142
, cereal ==0.5.8.3
42-
, clock ==0.8.3
43+
, clock ==0.8.4
4344
, cmdargs ==0.10.22
4445
, colour ==2.3.6
4546
, comonad ==5.0.8
4647
, companion ==0.1.0
4748
, conduit ==1.3.5
4849
, conduit-combinators ==1.3.0
4950
, conduit-extra ==1.3.6
50-
, connection ==0.3.1
51-
, containers ==0.6.5.1
51+
, containers ==0.6.7
5252
, contravariant ==1.5.5
5353
, cookie ==0.4.6
5454
, cryptohash-sha256 ==0.11.102.1
55-
, cryptonite ==0.30
56-
, cryptonite-conduit ==0.2.2
57-
, data-array-byte ==0.1.0.1
55+
, crypton ==0.33
56+
, crypton-conduit ==0.2.3
57+
, crypton-connection ==0.3.1
58+
, crypton-x509 ==1.7.6
59+
, crypton-x509-store ==1.6.9
60+
, crypton-x509-system ==1.6.7
61+
, crypton-x509-validation ==1.6.12
5862
, data-default-class ==0.1.2.0
5963
, data-fix ==0.3.2
60-
, deepseq ==1.4.6.1
64+
, deepseq ==1.4.8.0
6165
, digest ==0.0.1.7
62-
, directory ==1.3.6.2
66+
, directory ==1.3.7.1
6367
, distributive ==0.6.2.1
6468
, dlist ==1.0
6569
, easy-file ==0.2.5
6670
, echo ==0.1.4
6771
, ed25519 ==0.0.5.0
68-
, exceptions ==0.10.4
69-
, extra ==1.7.13
70-
, fast-logger ==3.1.2
72+
, exceptions ==0.10.5
73+
, extra ==1.7.14
74+
, fast-logger ==3.2.2
7175
, file-embed ==0.0.15.0
72-
, filelock ==0.1.1.6
76+
, filelock ==0.1.1.7
7377
, filepath ==1.4.2.2
78+
, foldable1-classes-compat ==0.1
7479
, fsnotify ==0.4.1.0
75-
, generic-deriving ==1.14.4
76-
, ghc-bignum ==1.2
77-
, ghc-boot-th ==9.2.7
78-
, ghc-prim ==0.8.0
79-
, githash ==0.1.6.3
80+
, generic-deriving ==1.14.5
81+
, generically ==0.1.1
82+
, ghc-bignum ==1.3
83+
, ghc-boot-th ==9.4.6
84+
, ghc-prim ==0.9.1
85+
, githash ==0.1.7.0
8086
, hackage-security ==0.6.2.3
81-
, hashable ==1.4.2.0
87+
, hashable ==1.4.3.0
8288
, hi-file-parser ==0.1.4.0
8389
, hinotify ==0.4.1
8490
, hourglass ==0.2.12
85-
, hpack ==0.35.2
91+
, hpack ==0.35.4
8692
, hpc ==0.6.1.0
87-
, http-api-data ==0.4.3
93+
, http-api-data ==0.5
8894
, http-client ==0.7.13.1
89-
, http-client-tls ==0.3.6.1
90-
, http-conduit ==2.3.8
91-
, http-download ==0.2.0.0
95+
, http-client-tls ==0.3.6.2
96+
, http-conduit ==2.3.8.1
97+
, http-download ==0.2.1.0
9298
, http-types ==0.12.3
9399
, indexed-traversable ==0.1.2.1
94100
, indexed-traversable-instances ==0.1.1.2
@@ -100,15 +106,15 @@ constraints:
100106
, lift-type ==0.1.1.1
101107
, lifted-base ==0.2.3.12
102108
, lukko ==0.1.1.3
103-
, megaparsec ==9.2.2
104-
, memory ==0.17.0
105-
, microlens ==0.4.12.0
109+
, megaparsec ==9.3.1
110+
, memory ==0.18.0
111+
, microlens ==0.4.13.1
106112
, microlens-mtl ==0.2.0.3
107113
, microlens-th ==0.4.3.13
108-
, mime-types ==0.1.0.9
114+
, mime-types ==0.1.1.0
109115
, mintty ==0.1.4
110116
, monad-control ==1.0.3.1
111-
, monad-logger ==0.3.39
117+
, monad-logger ==0.3.40
112118
, monad-loops ==0.4.3
113119
, mono-traversable ==1.0.15.3
114120
, mtl ==2.2.2
@@ -122,80 +128,77 @@ constraints:
122128
, open-browser ==0.2.1.0
123129
, optparse-applicative ==0.18.1.0
124130
, optparse-simple ==0.1.1.4
125-
, pantry ==0.9.1
126-
, parsec ==3.1.15.0
131+
, pantry ==0.9.2
132+
, parsec ==3.1.16.1
127133
, parser-combinators ==1.3.0
128134
, path ==0.9.2
129-
, path-io ==1.7.0
135+
, path-io ==1.8.1
130136
, path-pieces ==0.2.1
131137
, pem ==0.2.4
132-
, persistent ==2.14.5.0
138+
, persistent ==2.14.5.1
133139
, persistent-sqlite ==2.13.1.1
134140
, persistent-template ==2.12.0.0
135141
, pretty ==1.1.3.6
136142
, prettyprinter ==1.7.1
137143
, prettyprinter-ansi-terminal ==1.1.3
138-
, primitive ==0.7.3.0
139-
, process ==1.6.16.0
144+
, primitive ==0.8.0.0
145+
, process ==1.6.17.0
140146
, project-template ==0.2.1.0
141147
, random ==1.2.1.1
142-
, resource-pool ==0.2.3.2
148+
, resource-pool ==0.4.0.0
143149
, resourcet ==1.2.6
144150
, retry ==0.9.3.1
145151
, rio ==0.1.22.0
146152
, rio-orphans ==0.1.2.0
147153
, rio-prettyprint ==0.1.4.0
148154
, rts ==1.0.2
149155
, safe ==0.3.19
150-
, safe-exceptions ==0.1.7.3
156+
, safe-exceptions ==0.1.7.4
151157
, scientific ==0.3.7.0
152-
, semialign ==1.2.0.1
158+
, semialign ==1.3
153159
, semigroupoids ==5.3.7
154160
, silently ==1.2.5.3
155161
, socks ==0.6.1
156162
, split ==0.2.3.5
157163
, splitmix ==0.1.0.4
158164
, stack ==2.12.0
159165
, static-bytes ==0.1.0
160-
, stm ==2.5.0.2
166+
, stm ==2.5.1.0
161167
, stm-chans ==3.0.0.9
162168
, streaming-commons ==0.2.2.6
163-
, strict ==0.4.0.1
164-
, tagged ==0.8.6.1
169+
, strict ==0.5
170+
, tagged ==0.8.7
165171
, tar ==0.5.1.1
166-
, tar-conduit ==0.3.2
167-
, template-haskell ==2.18.0.0
172+
, tar-conduit ==0.4.0
173+
, template-haskell ==2.19.0.0
168174
, temporary ==1.3
169-
, text ==1.2.5.0
175+
, text ==2.0.2
170176
, text-metrics ==0.3.2
171177
, text-short ==0.1.5
172178
, th-abstraction ==0.4.5.0
173179
, th-compat ==0.1.4
174-
, th-lift ==0.8.3
180+
, th-lift ==0.8.4
175181
, th-lift-instances ==0.1.20
176-
, these ==1.1.1.1
177-
, time ==1.11.1.1
182+
, these ==1.2
183+
, time ==1.12.2
178184
, time-compat ==1.9.6.1
179-
, tls ==1.5.8
185+
, tls ==1.7.0
180186
, transformers ==0.5.6.2
181187
, transformers-base ==0.4.6
182188
, transformers-compat ==0.7.2
183189
, typed-process ==0.2.11.0
184-
, unix ==2.7.2.2
185-
, unix-compat ==0.5.4
186-
, unix-time ==0.4.9
187-
, unliftio ==0.2.24.0
190+
, unix ==2.7.3
191+
, unix-compat ==0.7
192+
, unix-time ==0.4.10
193+
, unliftio ==0.2.25.0
188194
, unliftio-core ==0.2.1.0
189195
, unordered-containers ==0.2.19.1
190196
, uuid-types ==1.0.5
191197
, vault ==0.3.1.5
192-
, vector ==0.12.3.1
193-
, vector-algorithms ==0.8.0.4
198+
, vector ==0.13.0.0
199+
, vector-algorithms ==0.9.0.1
200+
, vector-stream ==0.1.0.0
194201
, witherable ==0.4.2
195-
, x509 ==1.7.7
196-
, x509-store ==1.6.9
197-
, x509-system ==1.6.7
198-
, x509-validation ==1.6.12
199-
, yaml ==0.11.11.0
202+
, yaml ==0.11.11.2
200203
, zip-archive ==0.4.3
201204
, zlib ==0.6.3.0

cabal.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
-- specified by the snapshot specifed in Stack's project-level YAML
3434
-- configuration file (`stack.yaml`). The relevant version of GHC can be
3535
-- confirmed by reviewing the snapshot on Stackage. For example, at:
36-
-- https://www.stackage.org/lts-20.26/cabal.config.
36+
-- https://www.stackage.org/lts-21.8/cabal.config.
3737
--
38-
with-compiler: ghc-9.2.8
38+
with-compiler: ghc-9.4.6
3939
import: cabal.config
4040
packages: .

doc/GUIDE.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ this:
248248

249249
~~~yaml
250250
resolver:
251-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
251+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/8.yaml
252252
packages:
253253
- .
254254
~~~
255255

256256
The value of the `resolver` key tells Stack *how* to build your package: which
257257
GHC version to use, versions of package dependencies, and so on. Our value here
258-
says to use [LTS Haskell 20.26](https://www.stackage.org/lts-20.26), which
259-
implies GHC 9.2.8 (which is why `stack build` installs that version of GHC if it
258+
says to use [LTS Haskell 21.8](https://www.stackage.org/lts-21.8), which
259+
implies GHC 9.4.6 (which is why `stack build` installs that version of GHC if it
260260
is not already available to Stack). There are a number of values you can use for
261261
`resolver`, which we'll cover later.
262262

@@ -503,7 +503,7 @@ also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite
503503
a bit of information about it at
504504
[https://www.stackage.org/lts](https://www.stackage.org/lts), including:
505505

506-
* The appropriate resolver value (`resolver: lts-20.26`, as is currently the
506+
* The appropriate resolver value (`resolver: lts-21.8`, as is currently the
507507
latest LTS)
508508
* The GHC version used
509509
* A full list of all packages available in this snapshot
@@ -522,32 +522,32 @@ towards by default as well).
522522

523523
## Resolvers and changing your compiler version
524524

525-
Let's explore package sets a bit further. Instead of `lts-20.26`, let's change
525+
Let's explore package sets a bit further. Instead of `lts-21.8`, let's change
526526
our `stack.yaml` file to use the
527527
[latest nightly](https://www.stackage.org/nightly). Right now, this is currently
528-
2023-05-26 - please see the resolver from the link above to get the latest.
528+
2023-08-21 - please see the resolver from the link above to get the latest.
529529

530530
Then, commanding `stack build` again will produce:
531531

532532
~~~text
533533
stack build
534-
# Downloaded nightly-2023-05-26 build plan.
534+
# Downloaded nightly-2023-08-21 build plan.
535535
# build output ...
536536
~~~
537537

538538
We can also change resolvers on the command line, which can be useful in a
539539
Continuous Integration (CI) setting, like on Travis. For example, command:
540540

541541
~~~text
542-
stack --resolver lts-18.28 build
543-
# Downloaded lts-18.28 build plan.
542+
stack --resolver lts-20.26 build
543+
# Downloaded lts-20.26 build plan.
544544
# build output ...
545545
~~~
546546

547547
When passed on the command line, you also get some additional "short-cut"
548548
versions of resolvers: `--resolver nightly` will use the newest Nightly resolver
549-
available, `--resolver lts` will use the newest LTS, and `--resolver lts-20`
550-
will use the newest LTS in the 20.x series. The reason these are only available
549+
available, `--resolver lts` will use the newest LTS, and `--resolver lts-21`
550+
will use the newest LTS in the 21.x series. The reason these are only available
551551
on the command line and not in your `stack.yaml` file is that using them:
552552

553553
1. Will slow down your build (since Stack then needs to download information on
@@ -1340,7 +1340,7 @@ yields output like:
13401340

13411341
~~~text
13421342
Run from outside a project, using implicit global project config
1343-
Using latest snapshot resolver: lts-20.26
1343+
Using latest snapshot resolver: lts-21.8
13441344
Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml
13451345
Note: You can change the snapshot via the resolver field there.
13461346
I installed the stm package via --package stm

0 commit comments

Comments
 (0)