--- ghc-9.2.5/testsuite/tests/numeric/should_run/T7014.primops.orig	2023-03-12 14:42:11.338540492 +0100
+++ ghc-9.2.5/testsuite/tests/numeric/should_run/T7014.primops	2023-03-12 14:42:13.735608896 +0100
@@ -1,9 +1,9 @@
 and#
 or#
 uncheckedShift.*#
++#
+-#
+*#
-\+#
-\-#
-\*#
 quotInt#
 remInt#
 plusFloat#
--- ghc-9.2.5/testsuite/tests/hsc2hs/Makefile.orig	2023-03-12 14:40:03.825939306 +0100
+++ ghc-9.2.5/testsuite/tests/hsc2hs/Makefile	2023-03-12 14:40:07.961054835 +0100
@@ -54,7 +54,7 @@
 ifeq "$(WINDOWS)" "YES"
 	grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs
 else
+	grep '{-# LINE 1 "T12504/path/to/$@\.hsc" #-}' T12504/path/to/$@.hs
-	grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
 endif
 
 .PHONY: T15758
--- ghc-9.2.5/testsuite/tests/simplCore/should_compile/Makefile.orig	2023-03-12 14:41:16.204974035 +0100
+++ ghc-9.2.5/testsuite/tests/simplCore/should_compile/Makefile	2023-03-12 14:41:17.832020067 +0100
@@ -253,7 +253,7 @@
 # g should have been collapsed into one defininition by CSE.
 .PHONY: T13340
 T13340:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '+#'
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '\+#'
 
 
 # We expect to see all dictionaries specialized away.
514a1e10ad16e1f9bf1b1e8508f8272'>tree</a><a href='/guix/commit/gnu/installer/newt/parameters.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>commit</a><a href='/guix/diff/gnu/installer/newt/parameters.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/newt/parameters.scm'>
<input type='hidden' name='id' value='e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>root</a>/<a href='/guix/log/gnu?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>gnu</a>/<a href='/guix/log/gnu/installer?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>installer</a>/<a href='/guix/log/gnu/installer/newt?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>newt</a>/<a href='/guix/log/gnu/installer/newt/parameters.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>parameters.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/newt/parameters.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-11-07 18:17:32 +0100'>2020-11-07</span></td><td><a href='/guix/commit/gnu/installer/newt/parameters.scm?id=c2396ceb6eb30ac87755eb8b39583403b35fbd12'>installer: parameters: Add a reboot button.</a><span class='msg-avail'>...<span class='msg-tooltip'>Suggested by: zimoun &lt;zimon.toutoune@gmail.com&gt;.

* gnu/installer/newt/parameters.scm (run-parameters-page): Add a reboot
button.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-04-08 10:24:02 +0200'>2020-04-08</span></td><td><a href='/guix/commit/gnu/installer/newt/parameters.scm?id=ee0ad7803c82383ac1bced073d8670bc407797e7'>installer: Add proxy support.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/proxy.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add it.
* po/guix/POTFILES.in: Add it.
* gnu/installer/newt/parameters.scm (run-proxy-page): New procedure,
(run-parameters-page): add the previous procedure to the parameters menu.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-04-08 10:24:02 +0200'>2020-04-08</span></td><td><a href='/guix/commit/gnu/installer/newt/parameters.scm?id=07a53bd512530d8f87e076263227216c467727bb'>installer: Turn help menu into parameters menu.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/local.mk (INSTALLER_MODULES): Rename help.scm into parameters.scm.
* po/guix/POTFILES.in: Ditto.
* gnu/installer/record.scm (&lt;installer&gt;): Rename help-menu into parameter-menu
and help-page into parameters-page.
* gnu/installer/newt/parameters.scm: Renamed from help.scm. Update information
messages.
* gnu/installer/newt.scm: Update accordingly.
* gnu/installer/newt/keymap.scm: Ditto.
</span></span></td><td>Mathieu Othacehe</td></tr>