Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: f3c18890 by Samuel Thibault at 2026-01-10T15:48:22+01:00 hurd: Fix getExecutablePath build 3939a8bf93e27 ("GNU/Hurd: Add getExecutablePath support") added using /proc/self/exe for GNU/Hurd but missed adding the required imports for the corresponding code. - - - - - 4b02820e by Samuel Thibault at 2026-01-11T20:04:23-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. - - - - - 5a797c1b by Andrew Lelechenko at 2026-01-11T20:04:23-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - 8e07437a by Sven Tennie at 2026-01-11T20:04:24-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. - - - - - 4 changed files: - .gitignore - libraries/base/src/Data/Bifoldable1.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - 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-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc ===================================== @@ -51,7 +51,7 @@ import GHC.Internal.Foreign.Ptr import GHC.Internal.Foreign.Storable import GHC.Internal.System.IO.Error (isDoesNotExistError) import GHC.Internal.System.Posix.Internals -#elif defined(linux_HOST_OS) +#elif defined(linux_HOST_OS) || defined(gnu_HOST_OS) import GHC.Internal.Data.Functor import GHC.Internal.Data.List (isSuffixOf) import GHC.Internal.Foreign.C.Types ===================================== 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/41e3903a0ec8f29e94334865d8e140a... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/41e3903a0ec8f29e94334865d8e140a... You're receiving this email because of your account on gitlab.haskell.org.