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 Fix the OS string encoding for GNU/Hurd Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do. - - - - - f43fec0f by Andrew Lelechenko at 2026-01-12T00:14:53-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - 0f55a0d7 by Sven Tennie at 2026-01-12T00:14:54-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - 3 changed files: - .gitignore - libraries/base/src/Data/Bifoldable1.hs - libraries/ghc-platform/src/GHC/Platform/ArchOS.hs Changes: ===================================== .gitignore ===================================== @@ -256,3 +256,12 @@ ghc.nix/ # clangd .clangd dist-newstyle/ + +# ----------------------------------------------------------------------------- +# CI + +# Windows CI +toolchain/ +ghc-*/ +inplace/ +tmp/ ===================================== libraries/base/src/Data/Bifoldable1.hs ===================================== @@ -2,6 +2,7 @@ -- Copyright: Edward Kmett, Oleg Grenrus -- License: BSD-3-Clause -- +-- @since 4.18.0.0 {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE Safe #-} ===================================== libraries/ghc-platform/src/GHC/Platform/ArchOS.hs ===================================== @@ -156,7 +156,7 @@ stringEncodeOS = \case OSHaiku -> "haiku" OSQNXNTO -> "nto-qnx" OSAIX -> "aix" - OSHurd -> "hurd" + OSHurd -> "gnu" OSWasi -> "wasi" OSGhcjs -> "ghcjs" View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8e07437ab6bc90a07c5871504f967a1... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8e07437ab6bc90a07c5871504f967a1... You're receiving this email because of your account on gitlab.haskell.org.