@@ -0,0 +1,20 @@
--- a/vendor/fd-lock/Cargo.toml        2023-05-31 14:44:48.000000000 -0700
+++ b/vendor/fd-lock/Cargo.toml        2023-07-14 21:19:34.637702319 -0700
@@ -45,7 +45,7 @@

 [target."cfg(unix)".dependencies.rustix]
 version = "0.37.0"
-features = ["fs"]
+features = ["fs", "cc"]

 [target."cfg(windows)".dependencies.windows-sys]
 version = "0.45.0"
--- a/src/bootstrap/Cargo.lock 2023-07-11 20:32:40.000000000 -0700
+++ b/src/bootstrap/Cargo.lock 2023-07-14 22:41:53.269284713 -0700
@@ -618,6 +618,7 @@
 dependencies = [
  "bitflags",
+ "cc",
  "errno",
  "io-lifetimes",
  "libc",
ut type='hidden' name='id' value='689d2ac36c56c1573cd7418efe7676988f118024'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=689d2ac36c56c1573cd7418efe7676988f118024'>refs</a><a class='active' href='/guix/log/gnu/installer/final.scm'>log</a><a href='/guix/tree/gnu/installer/final.scm?id=689d2ac36c56c1573cd7418efe7676988f118024'>tree</a><a href='/guix/commit/gnu/installer/final.scm?id=689d2ac36c56c1573cd7418efe7676988f118024'>commit</a><a href='/guix/diff/gnu/installer/final.scm?id=689d2ac36c56c1573cd7418efe7676988f118024'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/final.scm'>
<input type='hidden' name='id' value='689d2ac36c56c1573cd7418efe7676988f118024'/><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=689d2ac36c56c1573cd7418efe7676988f118024'>root</a>/<a href='/guix/log/gnu?id=689d2ac36c56c1573cd7418efe7676988f118024'>gnu</a>/<a href='/guix/log/gnu/installer?id=689d2ac36c56c1573cd7418efe7676988f118024'>installer</a>/<a href='/guix/log/gnu/installer/final.scm?id=689d2ac36c56c1573cd7418efe7676988f118024'>final.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/final.scm?id=689d2ac36c56c1573cd7418efe7676988f118024&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-11 07:28:35 +0100'>2024-11-11</span></td><td><a href='/guix/commit/gnu/installer/final.scm?id=687a2ccabc6f57fcd25110f587df90ed0cab2f05'>installer: Add "Kernel" page to select the Hurd.</a><span class='msg-avail'>...<span class='msg-tooltip'>This adds a "Kernel" page to the installer with the option to (cross-) install
the Hurd, if applicable (only available on x86 machines for now).

* gnu/installer/newt.scm (kernel-page): New procedure.
(newt-installer)[kernel-page]: New field.
* gnu/installer/kernel.scm,
gnu/installer/newt/kernel.scm: New files.
* gnu/local.mk (INSTALLER_MODULES): Add them.
* gnu/installer.scm (installer-steps): Use them to select kernel if
applicable.
* gnu/installer/newt/partition.scm (run-label-page): Default to "msdos" when
instaling the Hurd.
(run-fs-type-page): Add ext2 for the hurd.
(run-partitioning-page-partition): Remove `entire-encrypted' option when
installing the Hurd.
* gnu/installer/services.scm (system-services-&gt;configuration): Cater for the
Hurd with %base-services/hurd, and with %base-packages/hurd that must always
be set.
(%system-services): Change to procedure.  When installing the the Hurd, do not
recommend `ntp-service-type' and USE `openssh-sans-x' package for
`openssh-service-type'.
(system-service-none): New variable.
* gnu/installer/newt/services.scm (run-network-management-page): Include it
when installing the Hurd.
(run-desktop-environments-cbt-page): When installing the Hurd, recommend to
not select any desktop enviroment.  Update users.
* gnu/installer/parted.scm (efi-installation?): Return #f when installing for
the Hurd.
(create-ext2-file-system): New procedure.
(user-fs-type-name, user-fs-type-&gt;mount-type, partition-filesystem-user-type,
format-user-partitions): Support `ext2'.
(&lt;user-partition&gt; partition-&gt;user-partition): Use `ext2' when installing the
Hurd.
(auto-partition!): Likewise.  No swap partition when installing the Hurd.
* gnu/installer/final.scm (install-system): Cater for cross installation of
the Hurd.
(bootloader-configuration): Use `grub-minimal-bootloader' when installing the
Hurd.
(user-partition-missing-modules): Cater for empty user-partitions.
(initrd-configuration, user-partitions-&gt;configuration): Cater for the Hurd.
* gnu/installer/steps.scm (format-configuration,
configuration-&gt;file): Cater for the Hurd.
* gnu/system/hurd.scm (%desktop-services/hurd): New variable.
* gnu/installer/tests.scm (choose-kernel): New procedure.
* gnu/tests/install.scm (gui-test-program): Use it.

Change-Id: Ifafb27b8a2f933944c77223a27ec151757237e36
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>