Author: Antero Mejr <antero@mailbox.org>
Upstream status: I didn't report upstream because they don't have an issue tracker and
PRs require signing the Google CLA. If someone willing to sign the CLA
wants to submit the patch, please go ahead.

diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
index 021cf5c8..5948e140 100644
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
@@ -88,6 +88,7 @@ class DirEntry {

   const std::string& name() const { return name_; }
   DirEntryKinds kind() const { return kind_; }
+  bool operator<(const DirEntry& d) { return name_ < d.name(); }
 
  private:
   std::string name_;
@@ -115,6 +116,7 @@ bool ListDirectory(const string& path, vector<DirEntry>* entries) {
     errno = 0;
     entry = readdir(dir);
     if (entry == NULL) {
+      std::sort(entries->begin(), entries->end());
       return errno == 0;
     }
     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
efs/?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>refs</a><a class='active' href='/guix/log/tests/system.scm'>log</a><a href='/guix/tree/tests/system.scm?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>tree</a><a href='/guix/commit/tests/system.scm?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>commit</a><a href='/guix/diff/tests/system.scm?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/system.scm'>
<input type='hidden' name='id' value='f2200fe732999ac60248ac4a8f39dd13fe0ce20f'/><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=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>root</a>/<a href='/guix/log/tests?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>tests</a>/<a href='/guix/log/tests/system.scm?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f'>system.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/tests/system.scm?id=f2200fe732999ac60248ac4a8f39dd13fe0ce20f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-10-22 01:46:55 +0200'>2022-10-22</span></td><td><a href='/guix/commit/tests/system.scm?id=a3619079f95213c4f983e69210ed12b38fd31022'>Remove now unnecessary uses of (guix grafts).</a><span class='msg-avail'>...<span class='msg-tooltip'>These modules would use (guix grafts) just to access '%graft?' and
related bindings, which are now in (guix store).

* gnu/ci.scm,
guix/gexp.scm,
guix/lint.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/deploy.scm,
guix/scripts/environment.scm,
guix/scripts/home.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/pull.scm,
guix/scripts/size.scm,
guix/scripts/system.scm,
guix/scripts/weather.scm,
tests/builders.scm,
tests/channels.scm,
tests/cpan.scm,
tests/derivations.scm,
tests/gexp.scm,
tests/graph.scm,
tests/guix-daemon.sh,
tests/monads.scm,
tests/pack.scm,
tests/packages.scm,
tests/profiles.scm,
tests/system.scm: Remove #:use-module (guix grafts).
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-15 00:25:20 +0200'>2022-06-15</span></td><td><a href='/guix/commit/tests/system.scm?id=7046e777212233b89df68379c270b448c45195ce'>system: &lt;operating-system&gt; compiler truly honors the 'system' argument.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/55951&gt;.

* gnu/system.scm (operating-system-compiler): Parameterize
'%current-system' and '%current-target-system' before calling
'operating-system-derivation'.
* tests/system.scm ("lower-object, %current-system sensitivity"): New
test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/tests/system.scm?id=da4e40948326387d5bcda58783914d5f9ce8b095'>Migrate to the new 'targets' field of bootloader-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>The old 'target' field is deprecated; adjust the sources to use the new
'targets' one instead.

* doc/guix-cookbook.texi&lt;target&gt;: Replace by 'targets'.
* gnu/bootloader/grub.scm: Likewise.
* gnu/installer/parted.scm: Likewise.
* gnu/machine/digital-ocean.scm: Likewise.
* gnu/system/examples/asus-c201.tmpl: Likewise
* gnu/system/examples/bare-bones.tmpl: Likewise
* gnu/system/examples/bare-hurd.tmpl: Likewise
* gnu/system/examples/beaglebone-black.tmpl: Likewise
* gnu/system/examples/desktop.tmpl: Likewise
* gnu/system/examples/docker-image.tmpl: Likewise
* gnu/system/examples/lightweight-desktop.tmpl: Likewise
* gnu/system/examples/vm-image.tmpl: Likewise
* gnu/system/examples/yggdrasil.tmpl: Likewise
* gnu/system/hurd.scm: Likewise
* gnu/system/images/hurd.scm: Likewise
* gnu/system/images/novena.scm: Likewise
* gnu/system/images/pine64.scm: Likewise
* gnu/system/images/pinebook-pro.scm: Likewise
* gnu/system/images/rock64.scm: Likewise
* gnu/system/install.scm: Likewise
* gnu/system/vm.scm: Likewise
* gnu/tests.scm: Likewise
* gnu/tests/ganeti.scm: Likewise
* gnu/tests/install.scm: Likewise
* gnu/tests/nfs.scm: Likewise
* gnu/tests/telephony.scm: Likewise
* tests/boot-parameters.scm: Likewise
* tests/system.scm: Likewise
</span></span></td><td>Maxim Cournoyer</td></tr>