Skip to content

Commit 8b38c2f

Browse files
committed
Merge remote-tracking branch 'origin/stable'
2 parents 74d98fd + 1fa2289 commit 8b38c2f

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

doc/GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ but adds the `+RTS -xc` runtime option.
17511751
17521752
Building with debugging symbols in the [DWARF information](https://ghc.haskell.org/trac/ghc/wiki/DWARF) is supported by `stack`. This can be done by passing the flag `--ghc-options="-g"` and also to override the default behaviour of stripping executables of debugging symbols by passing either one of the following flags: `--no-strip`, `--no-library-stripping` or `--no-executable-stripping`.
17531753
1754-
In Windows GDB can be isntalled to debug an executable with `stack exec -- pacman -S gdb`. Windows visual studio compiler's debugging format PDB is not supported at the moment. This might be possible by [separating](https://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target) debugging symbols and [converting](https://github.com/rainers/cv2pdb) their format. Or as an option when [using the LLVM backend](http://blog.llvm.org/2017/08/llvm-on-windows-now-supports-pdb-debug.html).
1754+
In Windows GDB can be installed to debug an executable with `stack exec -- pacman -S gdb`. Windows visual studio compiler's debugging format PDB is not supported at the moment. This might be possible by [separating](https://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target) debugging symbols and [converting](https://github.com/rainers/cv2pdb) their format. Or as an option when [using the LLVM backend](http://blog.llvm.org/2017/08/llvm-on-windows-now-supports-pdb-debug.html).
17551755
17561756
## More resources
17571757

doc/nix_integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ behind the scenes).
119119
`stack setup` will start a nix-shell, so it will gather all the required
120120
packages, but given nix handles GHC installation, instead of stack, this will
121121
happen when running `stack build` if no setup has been performed
122-
before. Therefore it is not longer necessary to run `stack setup` unless you
122+
before. Therefore it is no longer necessary to run `stack setup` unless you
123123
want to cache a GHC installation before running the build.
124124

125125
If `enable:` is omitted or set to `false`, you can still build in a nix-shell by

etc/scripts/mirror-ghc-bindists-to-github.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# https://downloads.haskell.org/~ghc/X.Y.Z/.
2121
#
2222

23-
GHCVER=9.0.1
23+
GHCVER=9.0.2
2424

2525
if [[ -z "$GITHUB_AUTH_TOKEN" ]]; then
2626
echo "$0: GITHUB_AUTH_TOKEN environment variable is required" >&2
@@ -90,21 +90,20 @@ mirror () {
9090

9191
mirror i386-deb9-linux "" xz xz linux32
9292
mirror x86_64-deb9-linux "" xz xz linux64
93-
#mirror x86_64-centos67-linux "" xz xz linux64-gmp4
9493
mirror x86_64-fedora27-linux "" xz xz linux64-tinfo6
9594
mirror x86_64-apple-darwin "" bz2 bz2 macosx
96-
#mirror i386-unknown-mingw32 "" xz xz windows32
95+
mirror aarch64-apple-darwin "" bz2 bz2 macosx-aarch64
9796
mirror x86_64-unknown-mingw32 "" xz xz windows64
98-
mirror armv7-deb9-linux "" xz xz linux-armv7
99-
mirror aarch64-deb9-linux "" xz xz linux-aarch64
97+
# mirror armv7-deb10-linux "" xz xz linux-armv7
98+
mirror aarch64-deb10-linux "" xz xz linux-aarch64
10099

101100
mirror_ https://github.com/redneb/ghc-alt-libc/releases/download/ghc-$GHCVER-musl i386-unknown-linux-musl "" xz xz linux32-musl
102101
mirror_ https://github.com/redneb/ghc-alt-libc/releases/download/ghc-$GHCVER-musl x86_64-unknown-linux-musl "" xz xz linux64-musl
103102

104-
mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/11 i386-portbld-freebsd "" xz xz freebsd32
105-
mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists i386-portbld-freebsd "ino64" xz xz freebsd32-ino64
106-
mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/11 x86_64-portbld-freebsd "" xz xz freebsd64
107-
mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists x86_64-portbld-freebsd "ino64" xz xz freebsd64-ino64
103+
# mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/11 i386-portbld-freebsd "" xz xz freebsd32
104+
# mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists i386-portbld-freebsd "ino64" xz xz freebsd32-ino64
105+
# mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/11 x86_64-portbld-freebsd "" xz xz freebsd64
106+
# mirror_ http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists x86_64-portbld-freebsd "ino64" xz xz freebsd64-ino64
108107

109108
set +x
110109
echo

0 commit comments

Comments
 (0)