--- 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.
9ff82592024'>tree</a><a href='/guix/commit/doc/he-config-bare-bones.scm?id=48efbde7a944acfe4fc944bf27bfa9ff82592024'>commit</a><a href='/guix/diff/doc/he-config-bare-bones.scm?id=48efbde7a944acfe4fc944bf27bfa9ff82592024'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/he-config-bare-bones.scm'>
<input type='hidden' name='id' value='48efbde7a944acfe4fc944bf27bfa9ff82592024'/><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=48efbde7a944acfe4fc944bf27bfa9ff82592024'>root</a>/<a href='/guix/log/doc?id=48efbde7a944acfe4fc944bf27bfa9ff82592024'>doc</a>/<a href='/guix/log/doc/he-config-bare-bones.scm?id=48efbde7a944acfe4fc944bf27bfa9ff82592024'>he-config-bare-bones.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/doc/he-config-bare-bones.scm?id=48efbde7a944acfe4fc944bf27bfa9ff82592024&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-10-09 19:24:18 +0300'>2021-10-09</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=0e8d2df0f1a4ab25c482e1c427c54e19903e62f3'>Move (gnu home-services) to (gnu home services).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home-services.scm (%guix-home-root-directory): Replace
gnu/home-services.scm with "gnu/home/services.scm".
Rename to gnu/home/services.scm.
* gnu/local.mk
(GNU_SYSTEM_MODULES): Rename gnu/home-services.scm to gnu/home/services.scm.
* doc/he-config-bare-bones.scm:
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm: Same.
* gnu/home/services/fontutils.scm: Same.
* gnu/home/services/mcron.scm: Same.
* gnu/home/services/shells.scm: Same.
* gnu/home/services/shepherd.scm: Same.
* gnu/home/services/symlink-manager.scm: Same.
* gnu/home/services/xdg.scm: Same.
* guix/scripts/home.scm: Same.
* guix/self.scm: Same.
</span></span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2021-10-08 15:36:18 +0300'>2021-10-08</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=ba8ddb348045f81f061a1c7f51c0f7c2b0024e71'>gnu: Move (gnu home-services) to (gnu home services).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home-services/configuration.scm: Move the content ...
* gnu/home/services/configuration.scm: ... here.
* doc/guix.texi:
Replace (gnu home-services mcron) with (gnu home services mcron).
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm:
Replace (gnu home-services fontutils) with (gnu services fontutils).
Replace (gnu home-services shells) with (gnu home services shells).
Replace (gnu home-services symlink-manager) with
(gnu home services symlink-manager).
Replace (gnu home-services xdg) with (gnu home services xdg).
* gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm.
* gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm.
Replace (gnu home-services shepherd) with (gnu home services shepherd).
* gnu/home-services.scm (%service-type-path):
Search home services in "gnu/services".
* gnu/home-services/shells.scm: Replace (gnu home-services configuration) with
(gnu home services configuration).
Rename to gnu/home/services/shells.scm.
Replace (gnu home-services utils) with (gnu home services utils).
* gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm.
* gnu/home-services/symlink-manager.scm:
Rename to gnu/home/services/symlink-manager.scm.
* gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm.
* gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm.
* guix/scripts/home/import.scm:
Replace (gnu home-services bash) with (gnu home services bash).
* gnu/home-services.scm: Update documentation string.
* doc/he-config-bare-bones.scm:
Apply new (gnu home-services ...) modules location.
* gnu/local.mk (GNU_SYSTEM_MODULES): Same.
</span></span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2021-09-09 20:26:51 +0300'>2021-09-09</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=aaffa43c1752e062934580f55616e0380963a1be'>doc: Add Guix Home documentation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi: Add Guix Home documentation.
* doc/he-config-bare-bones.scm: New file.

Signed-off-by: Oleg Pykhalov &lt;go.wigust@gmail.com&gt;
</span></span></td><td>Andrew Tropin</td></tr>