<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style="--code-editor-font: GitLab Mono, JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: "GitLab Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: "GitLab Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";'>
<div class="content">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/1707abcbad45b3849e756c177583768a8456a262">1707abcb</a></strong>
<div>
<span> by John Ericson </span> <i> at 2023-09-21T10:15:10-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Use Cabal 3.10 for Hadrian
We need the newer version for `CABAL_FLAG_*` env vars for #17191.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/23a1505776a2df2ad5823e9c6d96597c966702e8">23a15057</a></strong>
<div>
<span> by John Ericson </span> <i> at 2023-09-21T10:15:11-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>hadrian: `need` any `configure` script we will call
When the script is changed, we should reconfigure.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/c106e8b6956cf9bde7c9534e97c3e7a5b788225e">c106e8b6</a></strong>
<div>
<span> by John Ericson </span> <i> at 2023-09-21T10:15:11-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>hadrian: Make it easier to debug Cabal configure
Right now, output is squashed. This make per-package configure scripts
extremely hard to maintain, because we get vague "library is missing"
errors when the actually probably is usually completely unrelated except
for also involving the C/C++ toolchain.
(I can always pass `-VVV` to Hadrian locally, but these errors are
subtle and I often cannot reproduce them locally!)
`--disable-option-checking` was added back in
75c6e0684dda585c37b4ac254cd7a13537a59a91 but seems to be a bit overkill;
if other flags are passed that are not recognized behind the two from
Cabal mentioned in the former comment, we *do* want to know about it.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ed770cefb1d010aba145e495ac4d330a66d0b24d">ed770cef</a></strong>
<div>
<span> by John Ericson </span> <i> at 2023-09-21T10:15:11-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>hadrian: Increase verbosity of certain cabal commands
This is a hack to get around the cabal function we're calling
*decreasing* the verbosity it passes to another function, which is the
stuff we often actually care about. Sigh.
Keeping this a separate commit so if this makes things too verbose it is
easy to revert.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ff564b7d50cc246ff076dba03e92de89735eeac4">ff564b7d</a></strong>
<div>
<span> by John Ericson </span> <i> at 2023-09-21T10:15:11-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>rts: Move most external symbols logic to the configure script
This is much more terse because we are programmatically handling the
leading underscore.
`findPtr` however is still handled in the Cabal file because we need a
newer Cabal to pass flags to the configure script automatically.
Co-Authored-By: Ben Gamari <ben@well-typed.com>
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/be924911d8b7c1afb01103f999436bdc8faacb83">be924911</a></strong>
<div>
<span> by Bodigrim </span> <i> at 2023-09-21T10:15:13-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Bump Cabal submodule to allow text-2.1 and bytestring-0.12
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/50936e01a20f5ca727a3f2576417d49108faee3f">50936e01</a></strong>
<div>
<span> by Matthew Pickering </span> <i> at 2023-09-21T10:15:13-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>hadrian: Generate Distribution/Fields/Lexer.x before creating a source-dist
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/50322a0a11f2d8d20aeb980397d12004cf319ecd">50322a0a</a></strong>
<div>
<span> by Bodigrim </span> <i> at 2023-09-21T10:15:13-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Bump hadrian's index-state to upgrade alex at least to 3.2.7.3
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/4edbca1360c0562ba1650ccd517067ef80bd224f">4edbca13</a></strong>
<div>
<span> by Luite Stegeman </span> <i> at 2023-09-21T10:15:15-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>JS: correct file size and times
Programs produced by the JavaScript backend were returning
incorrect file sizes and modification times, causing cabal
related tests to fail.
This fixes the problem and adds an additional test that verifies
basic file information operations.
fixes #23980
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/3b3c56189edc5f3e52dff7986f59692b0198cd13">3b3c5618</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-09-21T10:15:15-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>gitlab-ci: Drop libiserv from upload_ghc_libs
libiserv has been merged into the ghci package.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ef2380ab9ef029aec951fe366510f16b6a920feb">ef2380ab</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-09-21T10:15:16-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>testsuite: Fix Windows line endings
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/1ee0b22c14770213146abe0744e89425f44b4c59">1ee0b22c</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-09-21T10:15:16-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>testsuite: Use makefile_test
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ee75e43f67d79ec2c8d6ebb4748496a0237c5a07">ee75e43f</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-09-21T10:15:16-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>system-cxx-std-lib: Add license and description</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/4202ba0b09d3402b1f408d704997494b641e4eb3">4202ba0b</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-09-21T10:15:16-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>gitlab/issue-templates: Rename bug.md -> default.md
So that it is visible by default.
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
30 changed files:
</h4>
<ul>
<li class="file-stats">
<a href="#12b30b2ace18550a397f6a826f78ffe2d6790d5e">
.gitlab/issue_templates/bug.md
→
.gitlab/issue_templates/default.md
</a>
</li>
<li class="file-stats">
<a href="#aedbdc3562245e84f486c486c7a86a146d3bada3">
.gitlab/rel_eng/upload_ghc_libs.py
</a>
</li>
<li class="file-stats">
<a href="#75c475e654f9d495479a42b47c9ce726c23de27c">
hadrian/bootstrap/plan-9_4_1.json
</a>
</li>
<li class="file-stats">
<a href="#d3bf80fa98edcd83d8e0088da1b7fe628bda2955">
hadrian/bootstrap/plan-9_4_2.json
</a>
</li>
<li class="file-stats">
<a href="#5d926ac8b82b17f1347e346ce165e16439c5c650">
hadrian/bootstrap/plan-9_4_3.json
</a>
</li>
<li class="file-stats">
<a href="#0c1ea0e1f00900e188994ec2cd6a9083c33a6759">
hadrian/bootstrap/plan-9_4_4.json
</a>
</li>
<li class="file-stats">
<a href="#9dc79978678f4d5e6f65eaa84660b406f9d64c93">
hadrian/bootstrap/plan-9_4_5.json
</a>
</li>
<li class="file-stats">
<a href="#1084f46e2f053977d1b5e9f351f545f0b25fd7f7">
hadrian/bootstrap/plan-9_6_1.json
</a>
</li>
<li class="file-stats">
<a href="#4b232c1e28742081c224114368585704fa02e286">
hadrian/bootstrap/plan-9_6_2.json
</a>
</li>
<li class="file-stats">
<a href="#49d796c010205fccc0b4346c82623a15d463e167">
hadrian/bootstrap/plan-bootstrap-9_4_1.json
</a>
</li>
<li class="file-stats">
<a href="#1a108337d30682fea9637915096a3b8c779d9bb9">
hadrian/bootstrap/plan-bootstrap-9_4_2.json
</a>
</li>
<li class="file-stats">
<a href="#84429ab69d62d9cee164fd5d5127af41a409da51">
hadrian/bootstrap/plan-bootstrap-9_4_3.json
</a>
</li>
<li class="file-stats">
<a href="#7710f4497d05f34cd4f1763acf1678172f843f9c">
hadrian/bootstrap/plan-bootstrap-9_4_4.json
</a>
</li>
<li class="file-stats">
<a href="#d475164edae263a45abb7b950ff4c455b1cee823">
hadrian/bootstrap/plan-bootstrap-9_4_5.json
</a>
</li>
<li class="file-stats">
<a href="#55134cfc051396955cf4a4e43a2f146026c4aca3">
hadrian/bootstrap/plan-bootstrap-9_6_1.json
</a>
</li>
<li class="file-stats">
<a href="#13bfc68833da350c20f4c484b7e4ec0e9c0744ef">
hadrian/bootstrap/plan-bootstrap-9_6_2.json
</a>
</li>
<li class="file-stats">
<a href="#5b653ef3b00262d0f1454de11e0714bd59d072e5">
hadrian/cabal.project
</a>
</li>
<li class="file-stats">
<a href="#2eeb40f0acd6cb433ebe65e34262040b618908a7">
hadrian/hadrian.cabal
</a>
</li>
<li class="file-stats">
<a href="#579888c35e9965d115a2349ac57e4ff79e87518f">
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
</a>
</li>
<li class="file-stats">
<a href="#5eb45e64b15e0e7761c18d7b610be974e59838c7">
hadrian/src/Hadrian/Oracles/Cabal/Rules.hs
</a>
</li>
<li class="file-stats">
<a href="#f4586df19410cf938856031e0d26a0589dfe63ca">
hadrian/src/Rules/SourceDist.hs
</a>
</li>
<li class="file-stats">
<a href="#88aba3facfb6ad447031cb0f794a80fa9edef072">
hadrian/src/Settings/Builders/Cabal.hs
</a>
</li>
<li class="file-stats">
<a href="#15573cb40fce6bde985c520c7e7647ab4c13453e">
hadrian/stack.yaml
</a>
</li>
<li class="file-stats">
<a href="#7359b6ed5fcb4ca01ad5fae3f680235363457c66">
hadrian/stack.yaml.lock
</a>
</li>
<li class="file-stats">
<a href="#2b3a5da6af2421fdb559def8637e7fac0436609f">
libraries/Cabal
</a>
</li>
<li class="file-stats">
<a href="#3bae3b74ae866493bd6b79df16cb638a5f2e0f87">
libraries/base/configure.ac
</a>
</li>
<li class="file-stats">
<a href="#51e9470a2e319b5698534bbbc0b634ee0c5097b2">
libraries/base/jsbits/base.js
</a>
</li>
<li class="file-stats">
<a href="#93de29ade4badaee20d81f5bfdb5ee4353a87886">
mk/system-cxx-std-lib-1.0.conf.in
</a>
</li>
<li class="file-stats">
<a href="#f90abec58e09f2075430200dc6bac22cd8311ac6">
rts/.gitignore
</a>
</li>
<li class="file-stats">
<a href="#66a382bc62fa574535a9b8a2a2d91dd5dee72512">
rts/configure.ac
</a>
</li>
</ul>
<h5 style="margin-top: 10px; margin-bottom: 10px; font-size: 0.875rem;">
The diff was not included because it is too large.
</h5>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/compare/cceeeba4bb22fec54ad7166bf66feebe52e12dc1...4202ba0b09d3402b1f408d704997494b641e4eb3">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.haskell.org">gitlab.haskell.org</a>. <a href="https://gitlab.haskell.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.haskell.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
</p>
</div>
</body>
</html>