--- 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.
><a href='/guix/commit/po/packages/POTFILES.in?id=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'>commit</a><a href='/guix/diff/po/packages/POTFILES.in?id=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/packages/POTFILES.in'>
<input type='hidden' name='id' value='e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'/><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=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'>root</a>/<a href='/guix/log/po?id=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'>po</a>/<a href='/guix/log/po/packages?id=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'>packages</a>/<a href='/guix/log/po/packages/POTFILES.in?id=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464'>POTFILES.in</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/po/packages/POTFILES.in?id=e2f20d9309b4358c609b8d45b1ec2bd8fe3e6464&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-02-03 18:58:09 +0100'>2023-02-03</span></td><td><a href='/guix/commit/po/packages/POTFILES.in?id=b5a3e745f9f30899655aa15144c248e0292e8b1c'>gnu: Remove key-mon.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>The file is empty.

* gnu/packages/key-mon.scm: Remove file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Remove it.
* po/packages/POTFILES.in: Remove it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-11-20 16:01:08 +0100'>2022-11-20</span></td><td><a href='/guix/commit/po/packages/POTFILES.in?id=da6c6763fa72585a1df3021781f8d33c3b64dcc8'>scripts: Use translations for guix.pot for service descriptions.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, service descriptions appeared in both guix.pot and
packages.pot, but only translations of packages.pot were used.
Now, translations are only done with guix.pot.

This is better, because translators are more likely to translate
guix.pot, and is also easier, because files in gnu/{home/,}services
need to be in po/guix/POTFILES.in anyway and po/guix/Makevars
already acts on the 'description' keyword because of lint checkers.

* guix/scripts/home.scm (service-type-description-string):
Use translations from guix.pot.
* guix/scripts/system/search.scm (service-type-description-string)
(service-type-&gt;recutils): Likewise.
* po/packages/POTFILES.in: Move files in gnu/services to ...
* po/guix/POTFILES.in: ... here.
</span></span></td><td>pelzflorian (Florian Pelz)</td></tr>
<tr><td><span title='2021-02-12 15:11:36 +0800'>2021-02-12</span></td><td><a href='/guix/commit/po/packages/POTFILES.in?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>services: Add transmission-daemon service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/file-sharing.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* po/packages/POTFILES.in: Add it.
* tests/services/file-sharing.scm: New file.
* Makefile.am (SCM_TESTS): Add it.
* doc/guix.texi (File-Sharing Services): New section.

Signed-off-by: 宋文武 &lt;iyzsong@member.fsf.org&gt;
</span></span></td><td>Simon South</td></tr>