From bddb1ece34331637454a8c2281e625ab829ef204 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim@guixotic.coop>
Date: Wed, 26 Aug 2026 13:26:40 +0900
Subject: maint: Replace remaining usages of isc-dhcp with dhcpcd.

isc-dhcp has been unmaintained since 2022.  This is a follow-up to commit
3e713ae41c73b352fad4830b23721ee07935c512.

* doc/guix.texi (Keyboard Layout and Networking and Partitioning): Adjust
example.
* etc/manifests/cross-compile.scm (%system-packages)
* etc/manifests/release-desktop.scm (%desktop-packages)
* etc/manifests/release-minimal.scm (%system-packages): Replace "isc-dhcp"
with "dhcpcd".
* gnu/system.scm (%base-packages-networking): Likewise.
* gnu/tests/install.scm (%simple-installation-script)
(%extlinux-gpt-installation-script)
(%simple-installation-script-for-/dev/vda)
(%separate-store-installation-script)
(%extra-encrypted-packages): Likewise.
---
 etc/manifests/cross-compile.scm   | 2 +-
 etc/manifests/release-desktop.scm | 2 +-
 etc/manifests/release-minimal.scm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.scm
index c74e62ab10b..9094ac40add 100644
--- a/etc/manifests/cross-compile.scm
+++ b/etc/manifests/cross-compile.scm
@@ -68,7 +68,7 @@ TARGET."
   ;; Key packages proposed by the Guix System installer.
   (map specification->package
        '("openssh" "tor" "ntp" "gpm"
-         "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups"
+         "connman" "network-manager" "wpa-supplicant" "dhcpcd" "cups"
          "linux-libre" "grub-hybrid")))
 
 (define (%system-gui-packages target)
diff --git a/etc/manifests/release-desktop.scm b/etc/manifests/release-desktop.scm
index 89175418bc2..09c03e6e217 100644
--- a/etc/manifests/release-desktop.scm
+++ b/etc/manifests/release-desktop.scm
@@ -117,7 +117,7 @@
          "usbutils"
          "util-linux-with-udev"
          "kmod"
-         "isc-dhcp"
+         "dhcpcd"
          "iproute2"
          "wget"
          "nss-certs"
diff --git a/etc/manifests/release-minimal.scm b/etc/manifests/release-minimal.scm
index 5a1f3dcdc80..d1c4fe3acca 100644
--- a/etc/manifests/release-minimal.scm
+++ b/etc/manifests/release-minimal.scm
@@ -48,7 +48,7 @@ TARGET."
   (append (map specification->package
                '("guix" "shepherd" "guile-static-initrd"
                  "openssh" "tor" "ntp" "gpm" "mingetty"
-                 "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups"
+                 "connman" "network-manager" "wpa-supplicant" "dhcpcd" "cups"
                  "linux-libre" "grub-hybrid"
                  ;; privileged programs
                  "shadow" "sudo" "fuse" "inetutils" "util-linux"))
-- 
cgit v1.2.3