Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
-
1d56d49e
by Samuel Thibault at 2026-01-12T00:14:53-05:00
-
f43fec0f
by Andrew Lelechenko at 2026-01-12T00:14:53-05:00
-
0f55a0d7
by Sven Tennie at 2026-01-12T00:14:54-05:00
3 changed files:
Changes:
| ... | ... | @@ -256,3 +256,12 @@ ghc.nix/ |
| 256 | 256 | # clangd
|
| 257 | 257 | .clangd
|
| 258 | 258 | dist-newstyle/
|
| 259 | + |
|
| 260 | +# -----------------------------------------------------------------------------
|
|
| 261 | +# CI
|
|
| 262 | + |
|
| 263 | +# Windows CI
|
|
| 264 | +toolchain/
|
|
| 265 | +ghc-*/
|
|
| 266 | +inplace/
|
|
| 267 | +tmp/ |
| ... | ... | @@ -2,6 +2,7 @@ |
| 2 | 2 | -- Copyright: Edward Kmett, Oleg Grenrus
|
| 3 | 3 | -- License: BSD-3-Clause
|
| 4 | 4 | --
|
| 5 | +-- @since 4.18.0.0
|
|
| 5 | 6 | |
| 6 | 7 | {-# LANGUAGE NoImplicitPrelude #-}
|
| 7 | 8 | {-# LANGUAGE Safe #-}
|
| ... | ... | @@ -156,7 +156,7 @@ stringEncodeOS = \case |
| 156 | 156 | OSHaiku -> "haiku"
|
| 157 | 157 | OSQNXNTO -> "nto-qnx"
|
| 158 | 158 | OSAIX -> "aix"
|
| 159 | - OSHurd -> "hurd"
|
|
| 159 | + OSHurd -> "gnu"
|
|
| 160 | 160 | OSWasi -> "wasi"
|
| 161 | 161 | OSGhcjs -> "ghcjs"
|
| 162 | 162 |