Skip to content

Commit c67da8a

Browse files
committed
Re #6160 Move Stack on to GHC 9.2.8
1 parent 59e285e commit c67da8a

File tree

125 files changed

+204
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+204
-203
lines changed

.github/workflows/integration-tests.yml

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

19-
# As of 16 June 2023, ubuntu-latest, windows-latest and macos-latest come
20-
# with Stack 2.11.1 and GHC 9.6.2. windows-latest comes with NSIS 3.08, for
21-
# which the default value of the 'Unicode' installer attribute is 'true'.
22-
# However, that is not the 'large strings' build of NSIS and creates installers
23-
# that corrupt the PATH environment variable if the default string length of
24-
# 1024 characters is exceeded.
19+
# As of 8 August 2023, ubuntu-latest, windows-latest and macos-latest come
20+
# with Stack 2.11.1 (2.9.3 on macos-latest) and GHC 9.6.2. windows-latest comes
21+
# with NSIS 3.08, for which the default value of the 'Unicode' installer
22+
# attribute is 'true'. However, that is not the 'large strings' build of NSIS
23+
# and creates installers that corrupt the PATH environment variable if the
24+
# default string length of 1024 characters is exceeded.
2525

2626
jobs:
2727
integration-tests:
@@ -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-06-05, nixos-23.05 provides GHC 9.2.7.
84+
# As at 2023-08-11, 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

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

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

1515
jobs:
1616
pedantic:

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ 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
288288
any time. At the time of writing (May 2023) the package versions are primarily
289-
ones in Stackage snapshot LTS Haskell 20.23 (for GHC 9.2.7), together with
289+
ones in Stackage snapshot LTS Haskell 20.26 (for GHC 9.2.8), together with
290290
extra-dep `Cabal-3.8.1.0`.
291291

292292
A Stack executable makes use of Cabal (the library) through a small 'Setup'

cabal.config

+8-10
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ constraints:
77
, StateVar ==1.2.2
88
, Win32 ==2.12.0.1
99
, aeson ==2.0.3.0
10+
, aeson-warning-parser ==0.1.0
1011
, annotated-wl-pprint ==0.7.0
1112
, ansi-terminal ==1.0
1213
, ansi-terminal-types ==0.11.5
13-
, ansi-wl-pprint ==0.6.9
1414
, appar ==0.1.8
1515
, array ==0.5.4.0
1616
, asn1-encoding ==0.9.6
@@ -43,7 +43,8 @@ constraints:
4343
, cmdargs ==0.10.22
4444
, colour ==2.3.6
4545
, comonad ==5.0.8
46-
, conduit ==1.3.4.3
46+
, companion ==0.1.0
47+
, conduit ==1.3.5
4748
, conduit-combinators ==1.3.0
4849
, conduit-extra ==1.3.6
4950
, connection ==0.3.1
@@ -119,9 +120,9 @@ constraints:
119120
, old-locale ==1.0.0.7
120121
, old-time ==1.1.0.3
121122
, open-browser ==0.2.1.0
122-
, optparse-applicative ==0.17.0.0
123+
, optparse-applicative ==0.18.1.0
123124
, optparse-simple ==0.1.1.4
124-
, pantry ==0.8.2.2
125+
, pantry ==0.9.1
125126
, parsec ==3.1.15.0
126127
, parser-combinators ==1.3.0
127128
, path ==0.9.2
@@ -132,6 +133,8 @@ constraints:
132133
, persistent-sqlite ==2.13.1.1
133134
, persistent-template ==2.12.0.0
134135
, pretty ==1.1.3.6
136+
, prettyprinter ==1.7.1
137+
, prettyprinter-ansi-terminal ==1.1.3
135138
, primitive ==0.7.3.0
136139
, process ==1.6.16.0
137140
, project-template ==0.2.1.0
@@ -148,17 +151,16 @@ constraints:
148151
, scientific ==0.3.7.0
149152
, semialign ==1.2.0.1
150153
, semigroupoids ==5.3.7
151-
, semigroups ==0.20
152154
, silently ==1.2.5.3
153155
, socks ==0.6.1
154156
, split ==0.2.3.5
155157
, splitmix ==0.1.0.4
156158
, stack ==2.12.0
159+
, static-bytes ==0.1.0
157160
, stm ==2.5.0.2
158161
, stm-chans ==3.0.0.9
159162
, streaming-commons ==0.2.2.6
160163
, strict ==0.4.0.1
161-
, syb ==0.7.2.3
162164
, tagged ==0.8.6.1
163165
, tar ==0.5.1.1
164166
, tar-conduit ==0.3.2
@@ -169,10 +171,8 @@ constraints:
169171
, text-short ==0.1.5
170172
, th-abstraction ==0.4.5.0
171173
, th-compat ==0.1.4
172-
, th-expand-syns ==0.4.11.0
173174
, th-lift ==0.8.3
174175
, th-lift-instances ==0.1.20
175-
, th-reify-many ==0.1.10
176176
, these ==1.1.1.1
177177
, time ==1.11.1.1
178178
, time-compat ==1.9.6.1
@@ -181,8 +181,6 @@ constraints:
181181
, transformers-base ==0.4.6
182182
, transformers-compat ==0.7.2
183183
, typed-process ==0.2.11.0
184-
, unicode-data ==0.3.1
185-
, unicode-transforms ==0.4.0.1
186184
, unix ==2.7.2.2
187185
, unix-compat ==0.5.4
188186
, unix-time ==0.4.9

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.23/cabal.config.
36+
-- https://www.stackage.org/lts-20.26/cabal.config.
3737
--
38-
with-compiler: ghc-9.2.7
38+
with-compiler: ghc-9.2.8
3939
import: cabal.config
4040
packages: .

doc/GUIDE.md

+6-6
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/19.yaml
251+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.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.23](https://www.stackage.org/lts-20.23), which
259-
implies GHC 9.2.7 (which is why `stack build` installs that version of GHC if it
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
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.23`, as is currently the
506+
* The appropriate resolver value (`resolver: lts-20.26`, as is currently the
507507
latest LTS)
508508
* The GHC version used
509509
* A full list of all packages available in this snapshot
@@ -522,7 +522,7 @@ 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.23`, let's change
525+
Let's explore package sets a bit further. Instead of `lts-20.26`, let's change
526526
our `stack.yaml` file to use the
527527
[latest nightly](https://www.stackage.org/nightly). Right now, this is currently
528528
2023-05-26 - please see the resolver from the link above to get the latest.
@@ -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.23
1343+
Using latest snapshot resolver: lts-20.26
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

doc/Stack_and_VS_Code.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ enabled). For further information about these options, see the `install-ghc`
7575

7676
For this workaround to work, each time that a resolver is used that references a
7777
different version of GHC, then GHCup must be used to install it (if GHCup has
78-
not already installed that version). For example, to use `resolver: lts-20.23`
79-
(GHC 9.2.7), the command `ghcup install ghc 9.2.7` must have been used to
80-
install GHC 9.2.7. That may be a minor inconvenience for some people, as one the
78+
not already installed that version). For example, to use `resolver: lts-20.26`
79+
(GHC 9.2.8), the command `ghcup install ghc 9.2.8` must have been used to
80+
install GHC 9.2.8. That may be a minor inconvenience for some people, as one the
8181
primary benefits of Stack over other Haskell build tools has been that Stack
8282
automatically ensures that the necessary version of GHC is available.
8383

doc/custom_snapshot.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ available in snapshots to ensure reproducibility.
1717
snapshot specification.
1818

1919
~~~yaml
20-
resolver: lts-20.23 # Inherits GHC version and package set
21-
compiler: ghc-9.6.1 # Overwrites GHC version in the resolver, optional
20+
resolver: lts-20.26 # Inherits GHC version and package set
21+
compiler: ghc-9.6.2 # Overwrites GHC version in the resolver, optional
2222

2323
# Additional packages, follows extra-deps syntax
2424
packages:
@@ -61,35 +61,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible.
6161

6262
### Overriding the compiler
6363

64-
The following snapshot specification will be identical to `lts-20.23`, but instead
65-
use `ghc-9.2.6` instead of `ghc-9.2.7`:
64+
The following snapshot specification will be identical to `lts-20.26`, but
65+
instead use `ghc-9.2.7` instead of `ghc-9.2.8`:
6666

6767
~~~yaml
68-
resolver: lts-20.23
69-
compiler: ghc-9.2.6
68+
resolver: lts-20.26
69+
compiler: ghc-9.2.7
7070
~~~
7171

7272
### Dropping packages
7373

74-
The following snapshot specification will be identical to `lts-20.23`, but without
75-
the `text` package in our snapshot. Removing this package will cause all the
76-
packages that depend on `text` to be unbuildable, but they will still be present
77-
in the snapshot.
74+
The following snapshot specification will be identical to `lts-20.26`, but
75+
without the `text` package in our snapshot. Removing this package will cause all
76+
the packages that depend on `text` to be unbuildable, but they will still be
77+
present in the snapshot.
7878

7979
~~~yaml
80-
resolver: lts-20.23
80+
resolver: lts-20.26
8181
drop-packages:
8282
- text
8383
~~~
8484

8585
### Hiding packages
8686

87-
The following snapshot specification will be identical to `lts-20.23`, but the
87+
The following snapshot specification will be identical to `lts-20.26`, but the
8888
`text` package will be hidden when registering. This will affect, for example,
8989
the import parser in the script command.
9090

9191
~~~yaml
92-
resolver: lts-20.23
92+
resolver: lts-20.26
9393
hidden:
9494
- text
9595
~~~
@@ -99,11 +99,11 @@ hidden:
9999
In order to specify GHC options for a package, you use the same syntax as the
100100
[ghc-options](yaml_configuration.md#ghc-options) key for build configuration.
101101

102-
The following snapshot specification will be identical to `lts-20.23`, but
102+
The following snapshot specification will be identical to `lts-20.26`, but
103103
provides `-O1` as a ghc-option for `text`:
104104

105105
~~~yaml
106-
resolver: lts-20.23
106+
resolver: lts-20.26
107107
packages:
108108
- text-1.2.5.0
109109
ghc-options:
@@ -122,11 +122,11 @@ packages in the `packages` list, rather than all packages in the snapshot.
122122

123123
In order to specify Cabal flags for a package, you use the same syntax as the
124124
[flags](yaml_configuration.md#flags) key for build configuration. The
125-
following snapshot specification will be identical to `lts-20.23`, but
125+
following snapshot specification will be identical to `lts-20.26`, but
126126
it enables the `developer` Cabal flag:
127127

128128
~~~yaml
129-
resolver: lts-20.23
129+
resolver: lts-20.26
130130
packages:
131131
- text-1.2.5.0
132132
flags:

doc/faq.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ here is to be as helpful and concise as possible.
99
## What version of GHC is used when I run something like `stack ghci`?
1010

1111
The version of GHC, as well as which packages can be installed, are specified by
12-
the _resolver_. This may be something like `lts-20.23`, which is from
12+
the _resolver_. This may be something like `lts-20.26`, which is from
1313
[Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses
1414
the resolver in more detail.
1515

@@ -76,7 +76,7 @@ You can make tweaks to a snapshot by modifying the `extra-deps` configuration
7676
value in your `stack.yaml` file, e.g.:
7777

7878
~~~yaml
79-
resolver: lts-20.23
79+
resolver: lts-20.26
8080
packages:
8181
- .
8282
extra-deps:
@@ -91,7 +91,7 @@ Add it to the
9191
directory where your `stack.yaml` file lives, e.g.
9292

9393
~~~yaml
94-
resolver: lts-20.23
94+
resolver: lts-20.26
9595
packages:
9696
- .
9797
extra-deps:

doc/list_command.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ Package index cache populated
4141
Error: [S-4926]
4242
- Could not find package paltry on Hackage. Perhaps you meant: retry, path, pantry, pretty, pasty, xattr, alloy, para, pappy, alure
4343
44-
stack --resolver lts-20.23 list base unix Win32 acme-missiles pantry
44+
stack --resolver lts-20.26 list base unix Win32 acme-missiles pantry
4545
Error: [S-4926]
4646
- Package does not appear in snapshot: base
4747
- Package does not appear in snapshot: unix
4848
- Package does not appear in snapshot: acme-missiles
4949
50-
stack --resolver lts-20.23 list Win32 pantry
50+
stack --resolver lts-20.26 list Win32 pantry
5151
Win32-2.12.0.1
5252
pantry-0.5.7
5353
54-
stack --resolver lts-20.23 list
54+
stack --resolver lts-20.26 list
5555
AC-Angle-1.0
5656
ALUT-2.4.0.3
5757
...

doc/script_command.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ configuration files (global and project-level). A snapshot must be specified on
1818
the command line (with the `--resolver` option). For example:
1919

2020
~~~text
21-
stack script --resolver lts-20.23 MyScript.hs
21+
stack script --resolver lts-20.26 MyScript.hs
2222
~~~
2323

2424
The `stack script` command behaves as if the `--install-ghc` flag had been
@@ -100,7 +100,7 @@ main = do
100100
can be compiled and run, with arguments, with:
101101

102102
~~~text
103-
stack --resolver lts-20.23 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
103+
stack --resolver lts-20.26 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
104104
~~~
105105

106106
All the compilation outputs (like `Main.hi`, `Main.o`, and the executable

0 commit comments

Comments
 (0)