Skip to content

Commit c4366bb

Browse files
committed
Fix commercialhaskell#6618 Move Stack to GHC 9.6.6
1 parent e2f007c commit c4366bb

File tree

131 files changed

+215
-215
lines changed

Some content is hidden

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

131 files changed

+215
-215
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"build": {
44
"dockerfile": "GHC.Dockerfile",
55
"args": {
6-
"GHC_VERSION": "9.6.5",
7-
"HLS_VERSION": "2.9.0.0",
6+
"GHC_VERSION": "9.6.6",
7+
"HLS_VERSION": "2.9.0.1",
88
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
99
"SET_LANG": "C.UTF-8",
1010
"SET_TZ": ""

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ Stack aims to depend on well-known packages. The specific versions on which it
342342
depends at any time are specified by `package.yaml` and `stack.yaml`. It does
343343
not aim to be compatible with more than one version of the `Cabal` package at
344344
any time. At the time of writing (May 2024) the package versions are primarily
345-
ones in Stackage snapshot LTS Haskell 22.21 (for GHC 9.6.5), together with
346-
extra-deps to depend on the latest version of `pantry` and `tar`.
345+
ones in Stackage snapshot LTS Haskell 22.28 (for GHC 9.6.6), together with
346+
extra-deps to depend on the latest version of `hpack`, `pantry` and `tar`.
347347

348348
A Stack executable makes use of Cabal (the library) through a small 'Setup'
349349
executable that it compiles from Haskell source code. The executable compiles
@@ -663,7 +663,7 @@ for each file.
663663

664664
[Stan](https://hackage.haskell.org/package/stan) is a Haskell static analysis
665665
tool. As of `stan-0.1.0.1`, it supports GHC >= 9.6.3 and Stack is built with
666-
GHC 9.6.5. The tool is configured by the contents of the `.stan.toml` file.
666+
GHC 9.6.6. The tool is configured by the contents of the `.stan.toml` file.
667667

668668
This workflow will run if:
669669

cabal.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ constraints:
8080
, generic-deriving ==1.14.5
8181
, generically ==0.1.1
8282
, ghc-bignum ==1.3
83-
, ghc-boot ==9.6.5
84-
, ghc-boot-th ==9.6.5
83+
, ghc-boot ==9.6.6
84+
, ghc-boot-th ==9.6.6
8585
, ghc-prim ==0.10.0
8686
, githash ==0.1.7.0
8787
, hackage-security ==0.6.2.4

cabal.project

Lines changed: 2 additions & 2 deletions
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-22.21/cabal.config.
36+
-- https://www.stackage.org/lts-22.28/cabal.config.
3737
--
38-
with-compiler: ghc-9.6.5
38+
with-compiler: ghc-9.6.6
3939
import: cabal.config
4040
packages: .

doc/GUIDE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ packages:
258258
The value of the [`resolver`](yaml_configuration.md#resolver) key tells Stack
259259
*how* to build your package: which GHC version to use, versions of package
260260
dependencies, and so on. Our value here says to use
261-
[LTS Haskell 22.21](https://www.stackage.org/lts-22.21), which implies GHC 9.6.5
261+
[LTS Haskell 22.28](https://www.stackage.org/lts-22.28), which implies GHC 9.6.6
262262
(which is why `stack build` installs that version of GHC if it is not already
263263
available to Stack). There are a number of values you can use for `resolver`,
264264
which we'll cover later.
@@ -528,22 +528,22 @@ towards by default as well).
528528
Let's explore package sets a bit further. Instead of `lts-22.13`, let's change
529529
our `stack.yaml` file to use the
530530
[latest nightly](https://www.stackage.org/nightly). Right now, this is currently
531-
2024-03-20 - please see the snapshot from the link above to get the latest.
531+
2024-07-05 - please see the snapshot from the link above to get the latest.
532532

533533
Then, commanding `stack build` again will produce:
534534

535535
~~~text
536536
stack build
537-
# Downloaded nightly-2024-03-20 build plan.
537+
# Downloaded nightly-2024-07-05 build plan.
538538
# build output ...
539539
~~~
540540

541541
We can also change snapshots on the command line, which can be useful in a
542542
Continuous Integration (CI) setting, like on Travis. For example, command:
543543

544544
~~~text
545-
stack --snapshot lts-21.25 build
546-
# Downloaded lts-21.25 build plan.
545+
stack --snapshot lts-22.27 build
546+
# Downloaded lts-22.27 build plan.
547547
# build output ...
548548
~~~
549549

@@ -982,7 +982,7 @@ stack purge
982982
stack build :helloworld-test
983983
helloworld> configure (lib + test)
984984
Configuring helloworld-0.1.0.0...
985-
helloworld> build (lib + test) with ghc-9.6.5
985+
helloworld> build (lib + test) with ghc-9.6.6
986986
Preprocessing library for helloworld-0.1.0.0..
987987
Building library for helloworld-0.1.0.0..
988988
[1 of 2] Compiling Lib
@@ -1300,7 +1300,7 @@ yields output like:
13001300

13011301
~~~text
13021302
Run from outside a project, using implicit global project config
1303-
Using latest snapshot resolver: lts-22.21
1303+
Using latest snapshot resolver: lts-22.28
13041304
Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml
13051305
Note: You can change the snapshot via the resolver field there.
13061306
I installed the stm package via --package stm

doc/Stack_and_VS_Code.md

Lines changed: 3 additions & 3 deletions
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 snapshot 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 `snapshot: lts-22.21`
79-
(GHC 9.6.5), the command `ghcup install ghc 9.6.5` must have been used to
80-
install GHC 9.6.5. That may be a minor inconvenience for some people, as one the
78+
not already installed that version). For example, to use `snapshot: lts-22.28`
79+
(GHC 9.6.6), the command `ghcup install ghc 9.6.6` must have been used to
80+
install GHC 9.6.6. That may be a minor inconvenience for some people, as one the
8181
primary benefits of Stack over other tools for building Haskell code has been
8282
that Stack automatically ensures that the necessary version of GHC is available.
8383

doc/custom_snapshot.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ available in snapshots to ensure reproducibility.
1818
for snapshot specification.
1919

2020
~~~yaml
21-
snapshot: lts-22.21 # Inherits GHC version and package set
22-
compiler: ghc-9.6.4 # Overwrites GHC version in the snapshot, optional
21+
snapshot: lts-22.28 # Inherits GHC version and package set
22+
compiler: ghc-9.6.5 # Overwrites GHC version in the snapshot, optional
2323

2424
# Additional packages, follows extra-deps syntax
2525
packages:
@@ -62,35 +62,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible.
6262

6363
### Overriding the compiler
6464

65-
The following snapshot specification will be identical to `lts-22.21`, but
66-
instead use `ghc-9.6.4` instead of `ghc-9.6.5`:
65+
The following snapshot specification will be identical to `lts-22.28`, but
66+
instead use `ghc-9.6.5` instead of `ghc-9.6.6`:
6767

6868
~~~yaml
69-
snapshot: lts-22.21
70-
compiler: ghc-9.6.4
69+
snapshot: lts-22.28
70+
compiler: ghc-9.6.5
7171
~~~
7272

7373
### Dropping packages
7474

75-
The following snapshot specification will be identical to `lts-22.21`, but
75+
The following snapshot specification will be identical to `lts-22.28`, but
7676
without the `text` package in our snapshot. Removing this package will cause all
7777
the packages that depend on `text` to be unbuildable, but they will still be
7878
present in the snapshot.
7979

8080
~~~yaml
81-
snapshot: lts-22.21
81+
snapshot: lts-22.28
8282
drop-packages:
8383
- text
8484
~~~
8585

8686
### Hiding packages
8787

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

9292
~~~yaml
93-
snapshot: lts-22.21
93+
snapshot: lts-22.28
9494
hidden:
9595
- text
9696
~~~
@@ -100,11 +100,11 @@ hidden:
100100
In order to specify GHC options for a package, you use the same syntax as the
101101
[ghc-options](yaml_configuration.md#ghc-options) key for build configuration.
102102

103-
The following snapshot specification will be identical to `lts-22.21`, but
103+
The following snapshot specification will be identical to `lts-22.28`, but
104104
provides `-O1` as a ghc-option for `text`:
105105

106106
~~~yaml
107-
snapshot: lts-22.21
107+
snapshot: lts-22.28
108108
packages:
109109
- text-2.0.2
110110
ghc-options:
@@ -123,11 +123,11 @@ packages in the `packages` list, rather than all packages in the snapshot.
123123

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

129129
~~~yaml
130-
snapshot: lts-22.21
130+
snapshot: lts-22.28
131131
packages:
132132
- text-2.0.2
133133
flags:

doc/faq.md

Lines changed: 3 additions & 3 deletions
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 _snapshot_. This may be something like `lts-22.21`, which is from
12+
the _snapshot_. This may be something like `lts-22.28`, which is from
1313
[Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses
1414
the snapshot 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-
snapshot: lts-22.21
79+
snapshot: lts-22.28
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-
snapshot: lts-22.21
94+
snapshot: lts-22.28
9595
packages:
9696
- .
9797
extra-deps:

doc/haskell_and_c_code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ executables:
8383

8484
The project's `stack.yaml` file only needs to identify a snapshot:
8585
~~~yaml
86-
snapshot: lts-22.26 # GHC 9.6.5
86+
snapshot: lts-22.28 # GHC 9.6.6
8787
~~~
8888

8989
This example project can be built with Stack in the normal way (`stack build`),
@@ -220,7 +220,7 @@ The `include-dirs` key will cause the specified directory (again,
220220

221221
The project's `stack.yaml` file only needs to identify a snapshot:
222222
~~~yaml
223-
snapshot: lts-22.26 # GHC 9.6.5
223+
snapshot: lts-22.28 # GHC 9.6.6
224224
~~~
225225

226226
This example project can be built with Stack in the normal way (`stack build`),

doc/install_and_upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ GitHub repository.
417417
|GHC version|LLVM versions|
418418
|-----------|-------------|
419419
|9.8.2 |11 to 15 |
420-
|9.6.5 |11 to 15 |
420+
|9.6.6 |11 to 15 |
421421
|9.4.8 |10 to 14 |
422422
|9.2.8 |9 to 12 |
423423
|9.0.2 |9, 10 or 12 |

0 commit comments

Comments
 (0)