Skip to content

Commit 425cffa

Browse files
committed
Merge branch 'stable'
2 parents 31f9e84 + 96b14e9 commit 425cffa

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

ChangeLog.md

+5
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,11 @@ Behavior changes:
383383
* On Windows, `stack upgrade` does not offer `sudo` command alternatives if
384384
attempting to write to the original file name of the running Stack exectuable
385385
results in a 'Permission' error.
386+
* On Linux, Stack's `setup` command now distinguishes GHC build
387+
`tinfo6-libc6-pre232` from existing `tinfo6`. The former refers to systems
388+
where the version of `libc6` (the GNU C Library) is not compatible with
389+
version 2.32. `tinfo6-libc6-pre232` is now a possible value for the
390+
`ghc-build` configuration option.
386391

387392
Other enhancements:
388393

doc/setup_command.md

+16-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ By default:
1313

1414
* the version of GHC is the one required by the project. Specify the version of
1515
GHC as an argument to attempt to install a different version of GHC. For
16-
example `stack setup 9.4.4` will attempt to install GHC 9.4.4; and
16+
example `stack setup 9.6.6` will attempt to install GHC 9.6.6; and
1717

1818
* an attempt to install is made only if the version of GHC is not already
1919
available to Stack. Pass the flag `--reinstall` (disabled by default) to
@@ -43,15 +43,19 @@ command are inconsistent and take no action.
4343
required on Linux, Stack will refer to the presence or absence of certain
4444
libraries or the versions of those libraries.
4545

46-
For example, Stack 2.15.1 considers:
46+
For example, Stack 2.15.7 considers:
4747

4848
* If `libc.musl-x86_64.so.1` is present. This file is provided by the
4949
[musl libc](https://musl.libc.org/).
5050

51+
[:octicons-tag-24: 2.13.1](https://github.com/commercialhaskell/stack/releases/tag/v2.13.1)
52+
5153
* The version of `libc6` (if musl libc is not applicable), the
5254
[GNU C Library](https://www.gnu.org/software/libc/) (glibc), that is
5355
present. The GNU C Library is designed to be backwards compatible.
5456

57+
[:octicons-tag-24: 2.11.1](https://github.com/commercialhaskell/stack/releases/tag/v2.11.1)
58+
5559
* If `libgmp.so.3` or `libgmp.so.10` is present. These files are provided
5660
by different versions of the
5761
[GNU Multiple Precision Arithmetic Library](https://gmplib.org/).
@@ -63,7 +67,7 @@ command are inconsistent and take no action.
6367
provided by different versions of a shared low-level terminfo library
6468
for terminal handling.
6569

66-
Stack 2.15.1 uses `ghc-build`:
70+
Stack 2.15.7 uses `ghc-build`:
6771

6872
* `musl` to indicate `libc.musl-x86_64.so.1` is present and Stack should use
6973
the GHC binary distribution for Alpine Linux.
@@ -77,9 +81,14 @@ command are inconsistent and take no action.
7781
By default, Stack associates:
7882

7983
* the `tinfo6` build with the 'Fedora 33' binary distribution of GHC 9.4.1
80-
to 9.4.4. Those binary distributions require versions of `libc6` that are
81-
compatible with `libc6` 2.32; and
84+
to 9.4.3 and 9.6.1 and later. Those binary distributions require versions
85+
of `libc6` that are compatible with `libc6` 2.32;
8286

8387
* the `tinfo6-libc6-pre232` build with the 'Debian 10' binary distribution
84-
of GHC 9.4.1 to 9.4.4. Those binary distributions require versions of
85-
`libc6` that are compatible with `libc6` 2.28.
88+
of GHC 9.4.1 to 9.4.3 and the 'Rocky 8' binary distribution of GHC 9.6.1
89+
and later. Those binary distributions require versions of `libc6` that are
90+
compatible with `libc6` 2.28; and
91+
92+
* the `tinfo6` and `tinfo6-libc6-pre232` builds with the 'Fedora 27' binary
93+
distribution of GHC 9.4.4 to 9.4.8. Those binary distributions require
94+
versions of `libc6` that are compatible with `libc6` 2.26.

0 commit comments

Comments
 (0)